diff --git a/tools/blenvy/tests/test_components.py b/tools/blenvy/tests/test_components.py
index ac3295e..3c48b79 100644
--- a/tools/blenvy/tests/test_components.py
+++ b/tools/blenvy/tests/test_components.py
@@ -1,11 +1,11 @@
 import bpy
 import pprint
 
-from ..propGroups.conversions_to_prop_group import property_group_value_from_custom_property_value
-from ..propGroups.conversions_from_prop_group import property_group_value_to_custom_property_value
+from ..bevy_components.propGroups.conversions_to_prop_group import property_group_value_from_custom_property_value
+from ..bevy_components.propGroups.conversions_from_prop_group import property_group_value_to_custom_property_value
 from .component_values_shuffler import component_values_shuffler
 from .expected_component_values import (expected_custom_property_values, expected_custom_property_values_randomized)
-from ..components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, upsert_bevy_component
+from ..bevy_components.components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, upsert_bevy_component
 
 from .setup_data import setup_data
 
diff --git a/tools/blenvy/tests/test_conversions.py b/tools/blenvy/tests/test_conversions.py
index 4125ce0..a145b7c 100644
--- a/tools/blenvy/tests/test_conversions.py
+++ b/tools/blenvy/tests/test_conversions.py
@@ -1,4 +1,4 @@
-from ..propGroups.conversions_to_prop_group import parse_struct_string, parse_tuplestruct_string
+from ..bevy_components.propGroups.conversions_to_prop_group import parse_struct_string, parse_tuplestruct_string
 
 
 def test_parse_tuplestruct_string():
diff --git a/tools/blenvy/tests/test_rename_components.py b/tools/blenvy/tests/test_rename_components.py
index 96023ef..b1bcdfd 100644
--- a/tools/blenvy/tests/test_rename_components.py
+++ b/tools/blenvy/tests/test_rename_components.py
@@ -4,7 +4,7 @@ import bpy
 import pprint
 import pytest
 
-from ..components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, is_bevy_component_in_object, upsert_bevy_component
+from ..bevy_components.components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, is_bevy_component_in_object, upsert_bevy_component
 
 from .setup_data import setup_data
 
diff --git a/tools/blenvy/tests/test_shuffler.py b/tools/blenvy/tests/test_shuffler.py
index b80e94f..e52ac3c 100644
--- a/tools/blenvy/tests/test_shuffler.py
+++ b/tools/blenvy/tests/test_shuffler.py
@@ -1,6 +1,6 @@
 import bpy
 from .component_values_shuffler import component_values_shuffler
-from ..components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, upsert_bevy_component
+from ..bevy_components.components.metadata import get_bevy_component_value_by_long_name, get_bevy_components, upsert_bevy_component
 from .setup_data import setup_data
 
 def test_shuffler(setup_data):