diff --git a/modules/godex/modules/bullet_physics/SCsub b/modules/bullet_physics/SCsub
similarity index 100%
rename from modules/godex/modules/bullet_physics/SCsub
rename to modules/bullet_physics/SCsub
diff --git a/modules/godex/modules/bullet_physics/bt_def_type.h b/modules/bullet_physics/bt_def_type.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/bt_def_type.h
rename to modules/bullet_physics/bt_def_type.h
diff --git a/modules/godex/modules/bullet_physics/bullet_collision_dispatcher.cpp b/modules/bullet_physics/bullet_collision_dispatcher.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_collision_dispatcher.cpp
rename to modules/bullet_physics/bullet_collision_dispatcher.cpp
diff --git a/modules/godex/modules/bullet_physics/bullet_collision_dispatcher.h b/modules/bullet_physics/bullet_collision_dispatcher.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_collision_dispatcher.h
rename to modules/bullet_physics/bullet_collision_dispatcher.h
diff --git a/modules/godex/modules/bullet_physics/bullet_result_callbacks.cpp b/modules/bullet_physics/bullet_result_callbacks.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_result_callbacks.cpp
rename to modules/bullet_physics/bullet_result_callbacks.cpp
diff --git a/modules/godex/modules/bullet_physics/bullet_result_callbacks.h b/modules/bullet_physics/bullet_result_callbacks.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_result_callbacks.h
rename to modules/bullet_physics/bullet_result_callbacks.h
diff --git a/modules/godex/modules/bullet_physics/bullet_types_converter.cpp b/modules/bullet_physics/bullet_types_converter.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_types_converter.cpp
rename to modules/bullet_physics/bullet_types_converter.cpp
diff --git a/modules/godex/modules/bullet_physics/bullet_types_converter.h b/modules/bullet_physics/bullet_types_converter.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/bullet_types_converter.h
rename to modules/bullet_physics/bullet_types_converter.h
diff --git a/modules/godex/modules/bullet_physics/collision_object_bullet.h b/modules/bullet_physics/collision_object_bullet.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/collision_object_bullet.h
rename to modules/bullet_physics/collision_object_bullet.h
diff --git a/modules/godex/modules/bullet_physics/collision_queries.cpp b/modules/bullet_physics/collision_queries.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/collision_queries.cpp
rename to modules/bullet_physics/collision_queries.cpp
diff --git a/modules/godex/modules/bullet_physics/collision_queries.h b/modules/bullet_physics/collision_queries.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/collision_queries.h
rename to modules/bullet_physics/collision_queries.h
diff --git a/modules/godex/modules/bullet_physics/components_area.cpp b/modules/bullet_physics/components_area.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_area.cpp
rename to modules/bullet_physics/components_area.cpp
diff --git a/modules/godex/modules/bullet_physics/components_area.h b/modules/bullet_physics/components_area.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_area.h
rename to modules/bullet_physics/components_area.h
diff --git a/modules/godex/modules/bullet_physics/components_generic.cpp b/modules/bullet_physics/components_generic.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_generic.cpp
rename to modules/bullet_physics/components_generic.cpp
diff --git a/modules/godex/modules/bullet_physics/components_generic.h b/modules/bullet_physics/components_generic.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_generic.h
rename to modules/bullet_physics/components_generic.h
diff --git a/modules/godex/modules/bullet_physics/components_gizmos.cpp b/modules/bullet_physics/components_gizmos.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_gizmos.cpp
rename to modules/bullet_physics/components_gizmos.cpp
diff --git a/modules/godex/modules/bullet_physics/components_gizmos.h b/modules/bullet_physics/components_gizmos.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_gizmos.h
rename to modules/bullet_physics/components_gizmos.h
diff --git a/modules/godex/modules/bullet_physics/components_pawn.cpp b/modules/bullet_physics/components_pawn.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_pawn.cpp
rename to modules/bullet_physics/components_pawn.cpp
diff --git a/modules/godex/modules/bullet_physics/components_pawn.h b/modules/bullet_physics/components_pawn.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_pawn.h
rename to modules/bullet_physics/components_pawn.h
diff --git a/modules/godex/modules/bullet_physics/components_rigid_body.cpp b/modules/bullet_physics/components_rigid_body.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_rigid_body.cpp
rename to modules/bullet_physics/components_rigid_body.cpp
diff --git a/modules/godex/modules/bullet_physics/components_rigid_body.h b/modules/bullet_physics/components_rigid_body.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/components_rigid_body.h
rename to modules/bullet_physics/components_rigid_body.h
diff --git a/modules/godex/modules/bullet_physics/config.py b/modules/bullet_physics/config.py
similarity index 100%
rename from modules/godex/modules/bullet_physics/config.py
rename to modules/bullet_physics/config.py
diff --git a/modules/godex/modules/bullet_physics/databag_space.cpp b/modules/bullet_physics/databag_space.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/databag_space.cpp
rename to modules/bullet_physics/databag_space.cpp
diff --git a/modules/godex/modules/bullet_physics/databag_space.h b/modules/bullet_physics/databag_space.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/databag_space.h
rename to modules/bullet_physics/databag_space.h
diff --git a/modules/godex/modules/bullet_physics/debug_utilities.cpp b/modules/bullet_physics/debug_utilities.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/debug_utilities.cpp
rename to modules/bullet_physics/debug_utilities.cpp
diff --git a/modules/godex/modules/bullet_physics/debug_utilities.h b/modules/bullet_physics/debug_utilities.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/debug_utilities.h
rename to modules/bullet_physics/debug_utilities.h
diff --git a/modules/godex/modules/bullet_physics/events_generic.cpp b/modules/bullet_physics/events_generic.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/events_generic.cpp
rename to modules/bullet_physics/events_generic.cpp
diff --git a/modules/godex/modules/bullet_physics/events_generic.h b/modules/bullet_physics/events_generic.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/events_generic.h
rename to modules/bullet_physics/events_generic.h
diff --git a/modules/godex/modules/bullet_physics/overlap_check.cpp b/modules/bullet_physics/overlap_check.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/overlap_check.cpp
rename to modules/bullet_physics/overlap_check.cpp
diff --git a/modules/godex/modules/bullet_physics/overlap_check.h b/modules/bullet_physics/overlap_check.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/overlap_check.h
rename to modules/bullet_physics/overlap_check.h
diff --git a/modules/godex/modules/bullet_physics/register_types.cpp b/modules/bullet_physics/register_types.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/register_types.cpp
rename to modules/bullet_physics/register_types.cpp
diff --git a/modules/godex/modules/bullet_physics/register_types.h b/modules/bullet_physics/register_types.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/register_types.h
rename to modules/bullet_physics/register_types.h
diff --git a/modules/godex/modules/bullet_physics/shape_base.cpp b/modules/bullet_physics/shape_base.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_base.cpp
rename to modules/bullet_physics/shape_base.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_base.h b/modules/bullet_physics/shape_base.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_base.h
rename to modules/bullet_physics/shape_base.h
diff --git a/modules/godex/modules/bullet_physics/shape_box.cpp b/modules/bullet_physics/shape_box.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_box.cpp
rename to modules/bullet_physics/shape_box.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_box.h b/modules/bullet_physics/shape_box.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_box.h
rename to modules/bullet_physics/shape_box.h
diff --git a/modules/godex/modules/bullet_physics/shape_capsule.cpp b/modules/bullet_physics/shape_capsule.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_capsule.cpp
rename to modules/bullet_physics/shape_capsule.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_capsule.h b/modules/bullet_physics/shape_capsule.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_capsule.h
rename to modules/bullet_physics/shape_capsule.h
diff --git a/modules/godex/modules/bullet_physics/shape_cone.cpp b/modules/bullet_physics/shape_cone.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_cone.cpp
rename to modules/bullet_physics/shape_cone.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_cone.h b/modules/bullet_physics/shape_cone.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_cone.h
rename to modules/bullet_physics/shape_cone.h
diff --git a/modules/godex/modules/bullet_physics/shape_convex.cpp b/modules/bullet_physics/shape_convex.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_convex.cpp
rename to modules/bullet_physics/shape_convex.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_convex.h b/modules/bullet_physics/shape_convex.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_convex.h
rename to modules/bullet_physics/shape_convex.h
diff --git a/modules/godex/modules/bullet_physics/shape_cylinder.cpp b/modules/bullet_physics/shape_cylinder.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_cylinder.cpp
rename to modules/bullet_physics/shape_cylinder.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_cylinder.h b/modules/bullet_physics/shape_cylinder.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_cylinder.h
rename to modules/bullet_physics/shape_cylinder.h
diff --git a/modules/godex/modules/bullet_physics/shape_sphere.cpp b/modules/bullet_physics/shape_sphere.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_sphere.cpp
rename to modules/bullet_physics/shape_sphere.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_sphere.h b/modules/bullet_physics/shape_sphere.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_sphere.h
rename to modules/bullet_physics/shape_sphere.h
diff --git a/modules/godex/modules/bullet_physics/shape_trimesh.cpp b/modules/bullet_physics/shape_trimesh.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_trimesh.cpp
rename to modules/bullet_physics/shape_trimesh.cpp
diff --git a/modules/godex/modules/bullet_physics/shape_trimesh.h b/modules/bullet_physics/shape_trimesh.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/shape_trimesh.h
rename to modules/bullet_physics/shape_trimesh.h
diff --git a/modules/godex/modules/bullet_physics/systems_base.cpp b/modules/bullet_physics/systems_base.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/systems_base.cpp
rename to modules/bullet_physics/systems_base.cpp
diff --git a/modules/godex/modules/bullet_physics/systems_base.h b/modules/bullet_physics/systems_base.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/systems_base.h
rename to modules/bullet_physics/systems_base.h
diff --git a/modules/godex/modules/bullet_physics/systems_walk.cpp b/modules/bullet_physics/systems_walk.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/systems_walk.cpp
rename to modules/bullet_physics/systems_walk.cpp
diff --git a/modules/godex/modules/bullet_physics/systems_walk.h b/modules/bullet_physics/systems_walk.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/systems_walk.h
rename to modules/bullet_physics/systems_walk.h
diff --git a/modules/godex/modules/bullet_physics/utilities.cpp b/modules/bullet_physics/utilities.cpp
similarity index 100%
rename from modules/godex/modules/bullet_physics/utilities.cpp
rename to modules/bullet_physics/utilities.cpp
diff --git a/modules/godex/modules/bullet_physics/utilities.h b/modules/bullet_physics/utilities.h
similarity index 100%
rename from modules/godex/modules/bullet_physics/utilities.h
rename to modules/bullet_physics/utilities.h
diff --git a/modules/godex/modules/godot/README.md b/modules/ecs_core/README.md
similarity index 100%
rename from modules/godex/modules/godot/README.md
rename to modules/ecs_core/README.md
diff --git a/modules/ecs_core/SCsub b/modules/ecs_core/SCsub
new file mode 100644
index 000000000000..87e10496996a
--- /dev/null
+++ b/modules/ecs_core/SCsub
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_modules")
+
+env_module = env_modules.Clone()
+
+env_module.add_source_files(env.modules_sources, "*.cpp")
+env_module.add_source_files(env.modules_sources, "components/*.cpp")
+env_module.add_source_files(env.modules_sources, "components/physics/*.cpp")
+env_module.add_source_files(env.modules_sources, "editor_plugins/*.cpp")
+env_module.add_source_files(env.modules_sources, "nodes/*.cpp")
+env_module.add_source_files(env.modules_sources, "databags/*.cpp")
+env_module.add_source_files(env.modules_sources, "systems/*.cpp")
diff --git a/modules/godex/modules/godot/components/disabled.cpp b/modules/ecs_core/components/disabled.cpp
similarity index 100%
rename from modules/godex/modules/godot/components/disabled.cpp
rename to modules/ecs_core/components/disabled.cpp
diff --git a/modules/godex/modules/godot/components/disabled.h b/modules/ecs_core/components/disabled.h
similarity index 100%
rename from modules/godex/modules/godot/components/disabled.h
rename to modules/ecs_core/components/disabled.h
diff --git a/modules/godex/modules/godot/components/interpolated_transform_component.cpp b/modules/ecs_core/components/interpolated_transform_component.cpp
similarity index 100%
rename from modules/godex/modules/godot/components/interpolated_transform_component.cpp
rename to modules/ecs_core/components/interpolated_transform_component.cpp
diff --git a/modules/godex/modules/godot/components/interpolated_transform_component.h b/modules/ecs_core/components/interpolated_transform_component.h
similarity index 100%
rename from modules/godex/modules/godot/components/interpolated_transform_component.h
rename to modules/ecs_core/components/interpolated_transform_component.h
diff --git a/modules/godex/modules/godot/components/mesh_component.cpp b/modules/ecs_core/components/mesh_component.cpp
similarity index 100%
rename from modules/godex/modules/godot/components/mesh_component.cpp
rename to modules/ecs_core/components/mesh_component.cpp
diff --git a/modules/godex/modules/godot/components/mesh_component.h b/modules/ecs_core/components/mesh_component.h
similarity index 100%
rename from modules/godex/modules/godot/components/mesh_component.h
rename to modules/ecs_core/components/mesh_component.h
diff --git a/modules/godex/modules/godot/components/physics/shape_3d_component.cpp b/modules/ecs_core/components/physics/shape_3d_component.cpp
similarity index 100%
rename from modules/godex/modules/godot/components/physics/shape_3d_component.cpp
rename to modules/ecs_core/components/physics/shape_3d_component.cpp
diff --git a/modules/godex/modules/godot/components/physics/shape_3d_component.h b/modules/ecs_core/components/physics/shape_3d_component.h
similarity index 100%
rename from modules/godex/modules/godot/components/physics/shape_3d_component.h
rename to modules/ecs_core/components/physics/shape_3d_component.h
diff --git a/modules/godex/modules/godot/components/transform_component.cpp b/modules/ecs_core/components/transform_component.cpp
similarity index 100%
rename from modules/godex/modules/godot/components/transform_component.cpp
rename to modules/ecs_core/components/transform_component.cpp
diff --git a/modules/godex/modules/godot/components/transform_component.h b/modules/ecs_core/components/transform_component.h
similarity index 100%
rename from modules/godex/modules/godot/components/transform_component.h
rename to modules/ecs_core/components/transform_component.h
diff --git a/modules/godex/modules/godot/config.py b/modules/ecs_core/config.py
similarity index 58%
rename from modules/godex/modules/godot/config.py
rename to modules/ecs_core/config.py
index bf37f3d2c35a..087f261b0b39 100644
--- a/modules/godex/modules/godot/config.py
+++ b/modules/ecs_core/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    env.module_add_dependencies("godot", ["godex"])
+    env.module_add_dependencies("ecs_core", ["godex"])
     return True
 
 
diff --git a/modules/godex/modules/godot/databags/databag_timer.cpp b/modules/ecs_core/databags/databag_timer.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/databag_timer.cpp
rename to modules/ecs_core/databags/databag_timer.cpp
diff --git a/modules/godex/modules/godot/databags/databag_timer.h b/modules/ecs_core/databags/databag_timer.h
similarity index 100%
rename from modules/godex/modules/godot/databags/databag_timer.h
rename to modules/ecs_core/databags/databag_timer.h
diff --git a/modules/godex/modules/godot/databags/godot_engine_databags.cpp b/modules/ecs_core/databags/godot_engine_databags.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/godot_engine_databags.cpp
rename to modules/ecs_core/databags/godot_engine_databags.cpp
diff --git a/modules/godex/modules/godot/databags/godot_engine_databags.h b/modules/ecs_core/databags/godot_engine_databags.h
similarity index 100%
rename from modules/godex/modules/godot/databags/godot_engine_databags.h
rename to modules/ecs_core/databags/godot_engine_databags.h
diff --git a/modules/godex/modules/godot/databags/input_databag.cpp b/modules/ecs_core/databags/input_databag.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/input_databag.cpp
rename to modules/ecs_core/databags/input_databag.cpp
diff --git a/modules/godex/modules/godot/databags/input_databag.h b/modules/ecs_core/databags/input_databag.h
similarity index 100%
rename from modules/godex/modules/godot/databags/input_databag.h
rename to modules/ecs_core/databags/input_databag.h
diff --git a/modules/godex/modules/godot/databags/physics_datagabs.cpp b/modules/ecs_core/databags/physics_datagabs.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/physics_datagabs.cpp
rename to modules/ecs_core/databags/physics_datagabs.cpp
diff --git a/modules/godex/modules/godot/databags/physics_datagabs.h b/modules/ecs_core/databags/physics_datagabs.h
similarity index 100%
rename from modules/godex/modules/godot/databags/physics_datagabs.h
rename to modules/ecs_core/databags/physics_datagabs.h
diff --git a/modules/godex/modules/godot/databags/scene_tree_databag.cpp b/modules/ecs_core/databags/scene_tree_databag.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/scene_tree_databag.cpp
rename to modules/ecs_core/databags/scene_tree_databag.cpp
diff --git a/modules/godex/modules/godot/databags/scene_tree_databag.h b/modules/ecs_core/databags/scene_tree_databag.h
similarity index 100%
rename from modules/godex/modules/godot/databags/scene_tree_databag.h
rename to modules/ecs_core/databags/scene_tree_databag.h
diff --git a/modules/godex/modules/godot/databags/visual_servers_databags.cpp b/modules/ecs_core/databags/visual_servers_databags.cpp
similarity index 100%
rename from modules/godex/modules/godot/databags/visual_servers_databags.cpp
rename to modules/ecs_core/databags/visual_servers_databags.cpp
diff --git a/modules/godex/modules/godot/databags/visual_servers_databags.h b/modules/ecs_core/databags/visual_servers_databags.h
similarity index 100%
rename from modules/godex/modules/godot/databags/visual_servers_databags.h
rename to modules/ecs_core/databags/visual_servers_databags.h
diff --git a/modules/godex/modules/godot/editor_plugins/components_gizmo_3d.cpp b/modules/ecs_core/editor_plugins/components_gizmo_3d.cpp
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_gizmo_3d.cpp
rename to modules/ecs_core/editor_plugins/components_gizmo_3d.cpp
diff --git a/modules/godex/modules/godot/editor_plugins/components_gizmo_3d.h b/modules/ecs_core/editor_plugins/components_gizmo_3d.h
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_gizmo_3d.h
rename to modules/ecs_core/editor_plugins/components_gizmo_3d.h
diff --git a/modules/godex/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp b/modules/ecs_core/editor_plugins/components_mesh_gizmo_3d.cpp
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_mesh_gizmo_3d.cpp
rename to modules/ecs_core/editor_plugins/components_mesh_gizmo_3d.cpp
diff --git a/modules/godex/modules/godot/editor_plugins/components_mesh_gizmo_3d.h b/modules/ecs_core/editor_plugins/components_mesh_gizmo_3d.h
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_mesh_gizmo_3d.h
rename to modules/ecs_core/editor_plugins/components_mesh_gizmo_3d.h
diff --git a/modules/godex/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp b/modules/ecs_core/editor_plugins/components_transform_gizmo_3d.cpp
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_transform_gizmo_3d.cpp
rename to modules/ecs_core/editor_plugins/components_transform_gizmo_3d.cpp
diff --git a/modules/godex/modules/godot/editor_plugins/components_transform_gizmo_3d.h b/modules/ecs_core/editor_plugins/components_transform_gizmo_3d.h
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/components_transform_gizmo_3d.h
rename to modules/ecs_core/editor_plugins/components_transform_gizmo_3d.h
diff --git a/modules/godex/modules/godot/editor_plugins/editor_world_ecs.cpp b/modules/ecs_core/editor_plugins/editor_world_ecs.cpp
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/editor_world_ecs.cpp
rename to modules/ecs_core/editor_plugins/editor_world_ecs.cpp
diff --git a/modules/godex/modules/godot/editor_plugins/editor_world_ecs.h b/modules/ecs_core/editor_plugins/editor_world_ecs.h
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/editor_world_ecs.h
rename to modules/ecs_core/editor_plugins/editor_world_ecs.h
diff --git a/modules/godex/modules/godot/editor_plugins/entity_editor_plugin.cpp b/modules/ecs_core/editor_plugins/entity_editor_plugin.cpp
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/entity_editor_plugin.cpp
rename to modules/ecs_core/editor_plugins/entity_editor_plugin.cpp
diff --git a/modules/godex/modules/godot/editor_plugins/entity_editor_plugin.h b/modules/ecs_core/editor_plugins/entity_editor_plugin.h
similarity index 100%
rename from modules/godex/modules/godot/editor_plugins/entity_editor_plugin.h
rename to modules/ecs_core/editor_plugins/entity_editor_plugin.h
diff --git a/modules/godex/modules/godot/nodes/ecs_utilities.cpp b/modules/ecs_core/nodes/ecs_utilities.cpp
similarity index 100%
rename from modules/godex/modules/godot/nodes/ecs_utilities.cpp
rename to modules/ecs_core/nodes/ecs_utilities.cpp
diff --git a/modules/godex/modules/godot/nodes/ecs_utilities.h b/modules/ecs_core/nodes/ecs_utilities.h
similarity index 100%
rename from modules/godex/modules/godot/nodes/ecs_utilities.h
rename to modules/ecs_core/nodes/ecs_utilities.h
diff --git a/modules/godex/modules/godot/nodes/ecs_world.cpp b/modules/ecs_core/nodes/ecs_world.cpp
similarity index 100%
rename from modules/godex/modules/godot/nodes/ecs_world.cpp
rename to modules/ecs_core/nodes/ecs_world.cpp
diff --git a/modules/godex/modules/godot/nodes/ecs_world.h b/modules/ecs_core/nodes/ecs_world.h
similarity index 100%
rename from modules/godex/modules/godot/nodes/ecs_world.h
rename to modules/ecs_core/nodes/ecs_world.h
diff --git a/modules/godex/modules/godot/nodes/entity.cpp b/modules/ecs_core/nodes/entity.cpp
similarity index 100%
rename from modules/godex/modules/godot/nodes/entity.cpp
rename to modules/ecs_core/nodes/entity.cpp
diff --git a/modules/godex/modules/godot/nodes/entity.h b/modules/ecs_core/nodes/entity.h
similarity index 100%
rename from modules/godex/modules/godot/nodes/entity.h
rename to modules/ecs_core/nodes/entity.h
diff --git a/modules/godex/modules/godot/nodes/script_ecs.cpp b/modules/ecs_core/nodes/script_ecs.cpp
similarity index 100%
rename from modules/godex/modules/godot/nodes/script_ecs.cpp
rename to modules/ecs_core/nodes/script_ecs.cpp
diff --git a/modules/godex/modules/godot/nodes/script_ecs.h b/modules/ecs_core/nodes/script_ecs.h
similarity index 100%
rename from modules/godex/modules/godot/nodes/script_ecs.h
rename to modules/ecs_core/nodes/script_ecs.h
diff --git a/modules/godex/modules/godot/nodes/shared_component_resource.cpp b/modules/ecs_core/nodes/shared_component_resource.cpp
similarity index 100%
rename from modules/godex/modules/godot/nodes/shared_component_resource.cpp
rename to modules/ecs_core/nodes/shared_component_resource.cpp
diff --git a/modules/godex/modules/godot/nodes/shared_component_resource.h b/modules/ecs_core/nodes/shared_component_resource.h
similarity index 100%
rename from modules/godex/modules/godot/nodes/shared_component_resource.h
rename to modules/ecs_core/nodes/shared_component_resource.h
diff --git a/modules/godex/modules/godot/register_types.cpp b/modules/ecs_core/register_types.cpp
similarity index 97%
rename from modules/godex/modules/godot/register_types.cpp
rename to modules/ecs_core/register_types.cpp
index 08f5d0c4e8a0..5caf814b17f4 100644
--- a/modules/godex/modules/godot/register_types.cpp
+++ b/modules/ecs_core/register_types.cpp
@@ -36,7 +36,7 @@ static void _editor_init() {
 	EditorNode::get_singleton()->add_editor_plugin(worldecs_plugin);
 }
 
-void initialize_godot_module(ModuleInitializationLevel p_level) {
+void initialize_ecs_core_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Nodes
 		ClassDB::register_class<ScriptEcs>();
@@ -154,7 +154,7 @@ void initialize_godot_module(ModuleInitializationLevel p_level) {
 	}
 }
 
-void uninitialize_godot_module(ModuleInitializationLevel p_level) {
+void uninitialize_ecs_core_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
 		memdelete(ScriptEcs::get_singleton());
 	}
diff --git a/modules/ecs_core/register_types.h b/modules/ecs_core/register_types.h
new file mode 100644
index 000000000000..0860798e85fb
--- /dev/null
+++ b/modules/ecs_core/register_types.h
@@ -0,0 +1,10 @@
+
+#ifndef GODOT_REGISTER_TYPES_H
+#define GODOT_REGISTER_TYPES_H
+
+#include "modules/register_module_types.h"
+
+void initialize_ecs_core_module(ModuleInitializationLevel p_level);
+void uninitialize_ecs_core_module(ModuleInitializationLevel p_level);
+
+#endif // GODOT_REGISTER_TYPES_H
\ No newline at end of file
diff --git a/modules/godex/modules/godot/systems/mesh_updater_system.cpp b/modules/ecs_core/systems/mesh_updater_system.cpp
similarity index 100%
rename from modules/godex/modules/godot/systems/mesh_updater_system.cpp
rename to modules/ecs_core/systems/mesh_updater_system.cpp
diff --git a/modules/godex/modules/godot/systems/mesh_updater_system.h b/modules/ecs_core/systems/mesh_updater_system.h
similarity index 100%
rename from modules/godex/modules/godot/systems/mesh_updater_system.h
rename to modules/ecs_core/systems/mesh_updater_system.h
diff --git a/modules/godex/modules/godot/systems/physics_process_system.cpp b/modules/ecs_core/systems/physics_process_system.cpp
similarity index 100%
rename from modules/godex/modules/godot/systems/physics_process_system.cpp
rename to modules/ecs_core/systems/physics_process_system.cpp
diff --git a/modules/godex/modules/godot/systems/physics_process_system.h b/modules/ecs_core/systems/physics_process_system.h
similarity index 100%
rename from modules/godex/modules/godot/systems/physics_process_system.h
rename to modules/ecs_core/systems/physics_process_system.h
diff --git a/modules/godex/modules/godot/systems/timer_updater_system.cpp b/modules/ecs_core/systems/timer_updater_system.cpp
similarity index 100%
rename from modules/godex/modules/godot/systems/timer_updater_system.cpp
rename to modules/ecs_core/systems/timer_updater_system.cpp
diff --git a/modules/godex/modules/godot/systems/timer_updater_system.h b/modules/ecs_core/systems/timer_updater_system.h
similarity index 100%
rename from modules/godex/modules/godot/systems/timer_updater_system.h
rename to modules/ecs_core/systems/timer_updater_system.h
diff --git a/modules/godex/modules/godot/SCsub b/modules/godex/modules/godot/SCsub
deleted file mode 100644
index 40165c6f2513..000000000000
--- a/modules/godex/modules/godot/SCsub
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-Import("env")
-Import("env_modules")
-
-env_godot_module = env_modules.Clone()
-
-env_godot_module.add_source_files(env.modules_sources, "*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "components/*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "components/physics/*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "editor_plugins/*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "nodes/*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "databags/*.cpp")
-env_godot_module.add_source_files(env.modules_sources, "systems/*.cpp")
diff --git a/modules/godex/modules/godot/register_types.h b/modules/godex/modules/godot/register_types.h
deleted file mode 100644
index e2760e30322e..000000000000
--- a/modules/godex/modules/godot/register_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "modules/register_module_types.h"
-
-void initialize_godot_module(ModuleInitializationLevel p_level);
-void uninitialize_godot_module(ModuleInitializationLevel p_level);