diff --git a/code/foundation/CMakeLists.txt b/code/foundation/CMakeLists.txt
index 36a82f4..8bda5a4 100644
--- a/code/foundation/CMakeLists.txt
+++ b/code/foundation/CMakeLists.txt
@@ -8,14 +8,15 @@ add_library(eco2d-foundation STATIC
     src/platform/signal_handling.c
     src/platform/profiler.c
 
-    src/ents/items.c
-    src/ents/entity.c
-    src/ents/device.c
+	  src/models/components.c
+    src/models/items.c
+    src/models/entity.c
+    src/models/device.c
 
-    src/ents/prefabs/player.c
-    src/ents/prefabs/vehicle.c
-    src/ents/prefabs/storage.c
-    src/ents/prefabs/furnace.c
+    src/models/prefabs/player.c
+    src/models/prefabs/vehicle.c
+    src/models/prefabs/storage.c
+    src/models/prefabs/furnace.c
 
     src/pkt/packet.c
 
@@ -36,8 +37,7 @@ add_library(eco2d-foundation STATIC
 
     src/gen/assets.c
 
-    src/ecs/systems.c
-	  src/ecs/components.c
+    src/systems/systems.c
 
     ${PKT_SRCS}
 )
diff --git a/code/foundation/src/core/game.c b/code/foundation/src/core/game.c
index 7fa5c4b..4c187b3 100644
--- a/code/foundation/src/core/game.c
+++ b/code/foundation/src/core/game.c
@@ -5,17 +5,17 @@
 #include "pkt/packet.h"
 #include "platform/signal_handling.h"
 #include "net/network.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 #include "world/world_view.h"
 #include "world/entity_view.h"
 #include "core/camera.h"
 #include "platform/profiler.h"
 
 #include "flecs/flecs_os_api_stdcpp.h"
-#include "flecs/flecs.h"
+#include "flecs.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 
 #include "packets/pkt_00_init.h"
 #include "packets/pkt_01_welcome.h"
diff --git a/code/foundation/src/debug/debug_replay.c b/code/foundation/src/debug/debug_replay.c
index 6754237..6cd19d8 100644
--- a/code/foundation/src/debug/debug_replay.c
+++ b/code/foundation/src/debug/debug_replay.c
@@ -1,6 +1,6 @@
 #include "debug/debug_replay.h"
 #include "core/camera.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 
 #include "cwpack/cwpack.h"
 
diff --git a/code/foundation/src/debug/debug_ui.c b/code/foundation/src/debug/debug_ui.c
index e2d17e8..55855ef 100644
--- a/code/foundation/src/debug/debug_ui.c
+++ b/code/foundation/src/debug/debug_ui.c
@@ -1,13 +1,13 @@
 #include "debug/debug_ui.h"
 #include "debug/debug_draw.h"
 #include "raylib.h"
-#include "ents/prefabs/vehicle.h"
+#include "models/prefabs/vehicle.h"
 #include "core/camera.h"
 #include "world/world.h"
 #include "core/game.h"
 #include "sfd.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 typedef enum {
     DITEM_RAW,
diff --git a/code/foundation/src/debug/debug_ui_actions.c b/code/foundation/src/debug/debug_ui_actions.c
index 964d6e8..ab05f8b 100644
--- a/code/foundation/src/debug/debug_ui_actions.c
+++ b/code/foundation/src/debug/debug_ui_actions.c
@@ -1,6 +1,6 @@
 #include "debug/debug_ui.h"
 #include "world/blocks.h"
-#include "ents/items.h"
+#include "models/items.h"
 #include "net/network.h"
 
 void
diff --git a/code/foundation/src/gen/asset_setup.h b/code/foundation/src/gen/asset_setup.h
index 23d8c25..ecbcdf2 100644
--- a/code/foundation/src/gen/asset_setup.h
+++ b/code/foundation/src/gen/asset_setup.h
@@ -22,5 +22,5 @@
 #include "items_list.c"
 
 // NOTE(zaklaus): Register a spawnable entity
-#include "ents/entity_spawnlist.c"
+#include "models/entity_spawnlist.c"
 
diff --git a/code/foundation/src/gui/build_mode.c b/code/foundation/src/gui/build_mode.c
index 935cbc3..f3db38a 100644
--- a/code/foundation/src/gui/build_mode.c
+++ b/code/foundation/src/gui/build_mode.c
@@ -1,5 +1,5 @@
 #include "core/camera.h"
-#include "ents/item_placement.h"
+#include "models/item_placement.h"
 
 static bool build_submit_placements = false;
 static bool build_is_in_draw_mode = false;
diff --git a/code/foundation/src/ecs/components.c b/code/foundation/src/models/components.c
similarity index 98%
rename from code/foundation/src/ecs/components.c
rename to code/foundation/src/models/components.c
index a08a04d..f179009 100644
--- a/code/foundation/src/ecs/components.c
+++ b/code/foundation/src/models/components.c
@@ -1,4 +1,4 @@
-#include "ecs/components.h"
+#include "models/components.h"
 
 ECS_COMPONENT_DECLARE(Vector2D);
 ECS_COMPONENT_DECLARE(Position);
@@ -24,7 +24,7 @@ ECS_COMPONENT_DECLARE(StreamInfo);
 
 void ComponentsImport(ecs_world_t *ecs) {
     ECS_MODULE(ecs, Components);
-    
+
     ECS_COMPONENT_DEFINE(ecs, Vector2D);
     ECS_COMPONENT_DEFINE(ecs, Position);
     ECS_COMPONENT_DEFINE(ecs, Velocity);
diff --git a/code/foundation/src/ecs/components.h b/code/foundation/src/models/components.h
similarity index 99%
rename from code/foundation/src/ecs/components.h
rename to code/foundation/src/models/components.h
index dd11c67..f04e9fb 100644
--- a/code/foundation/src/ecs/components.h
+++ b/code/foundation/src/models/components.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "flecs/flecs.h"
+#include "flecs.h"
 #include "gen/assets.h"
 
 #define ecs_get_mut_ex(world, entity, T) \
diff --git a/code/foundation/src/ents/device.c b/code/foundation/src/models/device.c
similarity index 78%
rename from code/foundation/src/ents/device.c
rename to code/foundation/src/models/device.c
index 7660875..48c1851 100644
--- a/code/foundation/src/ents/device.c
+++ b/code/foundation/src/models/device.c
@@ -1,9 +1,9 @@
-#include "ents/device.h"
-#include "ents/entity.h"
+#include "models/device.h"
+#include "models/entity.h"
 #include "world/entity_view.h"
 #include "world/world.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 uint64_t device_spawn(asset_id id) {
     ecs_entity_t e = entity_spawn(EKIND_DEVICE);
diff --git a/code/foundation/src/ents/device.h b/code/foundation/src/models/device.h
similarity index 100%
rename from code/foundation/src/ents/device.h
rename to code/foundation/src/models/device.h
diff --git a/code/foundation/src/ents/entity.c b/code/foundation/src/models/entity.c
similarity index 96%
rename from code/foundation/src/ents/entity.c
rename to code/foundation/src/models/entity.c
index 5bb140c..fbb4146 100644
--- a/code/foundation/src/ents/entity.c
+++ b/code/foundation/src/models/entity.c
@@ -1,11 +1,11 @@
-#include "ents/entity.h"
+#include "models/entity.h"
 #include "world/entity_view.h"
-#include "flecs/flecs.h"
+#include "flecs.h"
 #include "librg.h"
 #include "world/world.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 #include "zpl.h"
 
 // NOTE(zaklaus): bring in entity spawnlist
diff --git a/code/foundation/src/ents/entity.h b/code/foundation/src/models/entity.h
similarity index 100%
rename from code/foundation/src/ents/entity.h
rename to code/foundation/src/models/entity.h
diff --git a/code/foundation/src/ents/entity_spawnlist.c b/code/foundation/src/models/entity_spawnlist.c
similarity index 81%
rename from code/foundation/src/ents/entity_spawnlist.c
rename to code/foundation/src/models/entity_spawnlist.c
index fb31050..fcf2147 100644
--- a/code/foundation/src/ents/entity_spawnlist.c
+++ b/code/foundation/src/models/entity_spawnlist.c
@@ -1,6 +1,6 @@
 // NOTE(zaklaus): access to spawners
-#include "ents/prefabs/storage.h"
-#include "ents/prefabs/furnace.h"
+#include "models/prefabs/storage.h"
+#include "models/prefabs/furnace.h"
 
 static struct {
     asset_id id;
diff --git a/code/foundation/src/ents/item_placement.h b/code/foundation/src/models/item_placement.h
similarity index 100%
rename from code/foundation/src/ents/item_placement.h
rename to code/foundation/src/models/item_placement.h
diff --git a/code/foundation/src/ents/items.c b/code/foundation/src/models/items.c
similarity index 98%
rename from code/foundation/src/ents/items.c
rename to code/foundation/src/models/items.c
index 81a76eb..ad80d90 100644
--- a/code/foundation/src/ents/items.c
+++ b/code/foundation/src/models/items.c
@@ -1,10 +1,10 @@
-#include "ents/items.h"
-#include "ents/entity.h"
+#include "models/items.h"
+#include "models/entity.h"
 #include "world/entity_view.h"
 #include "world/world.h"
 #include "world/blocks.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 #include "zpl.h"
 
diff --git a/code/foundation/src/ents/items.h b/code/foundation/src/models/items.h
similarity index 98%
rename from code/foundation/src/ents/items.h
rename to code/foundation/src/models/items.h
index 147b4eb..836bba9 100644
--- a/code/foundation/src/ents/items.h
+++ b/code/foundation/src/models/items.h
@@ -3,7 +3,7 @@
 #include "gen/assets.h"
 #include "world/blocks.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 typedef enum {
     // NOTE(zaklaus): hardcoded fields for placement ops
diff --git a/code/foundation/src/ents/items_list.c b/code/foundation/src/models/items_list.c
similarity index 95%
rename from code/foundation/src/ents/items_list.c
rename to code/foundation/src/models/items_list.c
index 43c4def..389382c 100644
--- a/code/foundation/src/ents/items_list.c
+++ b/code/foundation/src/models/items_list.c
@@ -1,4 +1,4 @@
-#include "ents/items.h"
+#include "models/items.h"
 #include "world/entity_view.h"
 #include "items_list_helpers.h"
 
diff --git a/code/foundation/src/ents/items_list_helpers.h b/code/foundation/src/models/items_list_helpers.h
similarity index 100%
rename from code/foundation/src/ents/items_list_helpers.h
rename to code/foundation/src/models/items_list_helpers.h
diff --git a/code/foundation/src/ents/prefabs/furnace.c b/code/foundation/src/models/prefabs/furnace.c
similarity index 88%
rename from code/foundation/src/ents/prefabs/furnace.c
rename to code/foundation/src/models/prefabs/furnace.c
index 33e5809..fe6bd94 100644
--- a/code/foundation/src/ents/prefabs/furnace.c
+++ b/code/foundation/src/models/prefabs/furnace.c
@@ -1,7 +1,7 @@
 #include "furnace.h"
-#include "ents/device.h"
+#include "models/device.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 uint64_t furnace_spawn(void) {
     ecs_entity_t e = device_spawn(ASSET_FURNACE);
diff --git a/code/foundation/src/ents/prefabs/furnace.h b/code/foundation/src/models/prefabs/furnace.h
similarity index 100%
rename from code/foundation/src/ents/prefabs/furnace.h
rename to code/foundation/src/models/prefabs/furnace.h
diff --git a/code/foundation/src/ents/prefabs/player.c b/code/foundation/src/models/prefabs/player.c
similarity index 95%
rename from code/foundation/src/ents/prefabs/player.c
rename to code/foundation/src/models/prefabs/player.c
index 0ca94e0..1211cca 100644
--- a/code/foundation/src/ents/prefabs/player.c
+++ b/code/foundation/src/models/prefabs/player.c
@@ -3,7 +3,7 @@
 
 #include "world/world.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 #define PLAYER_MAX_HP 100.0f
 
diff --git a/code/foundation/src/ents/prefabs/player.h b/code/foundation/src/models/prefabs/player.h
similarity index 100%
rename from code/foundation/src/ents/prefabs/player.h
rename to code/foundation/src/models/prefabs/player.h
diff --git a/code/foundation/src/ents/prefabs/storage.c b/code/foundation/src/models/prefabs/storage.c
similarity index 85%
rename from code/foundation/src/ents/prefabs/storage.c
rename to code/foundation/src/models/prefabs/storage.c
index b625a2e..8a4071d 100644
--- a/code/foundation/src/ents/prefabs/storage.c
+++ b/code/foundation/src/models/prefabs/storage.c
@@ -1,8 +1,8 @@
 #include "storage.h"
-#include "ents/device.h"
+#include "models/device.h"
 #include "world/world.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 uint64_t storage_spawn(void) {
     ecs_entity_t e = device_spawn(ASSET_CHEST);
diff --git a/code/foundation/src/ents/prefabs/storage.h b/code/foundation/src/models/prefabs/storage.h
similarity index 100%
rename from code/foundation/src/ents/prefabs/storage.h
rename to code/foundation/src/models/prefabs/storage.h
diff --git a/code/foundation/src/ents/prefabs/vehicle.c b/code/foundation/src/models/prefabs/vehicle.c
similarity index 93%
rename from code/foundation/src/ents/prefabs/vehicle.c
rename to code/foundation/src/models/prefabs/vehicle.c
index 0711c27..465e5fe 100644
--- a/code/foundation/src/ents/prefabs/vehicle.c
+++ b/code/foundation/src/models/prefabs/vehicle.c
@@ -3,7 +3,7 @@
 #include "world/entity_view.h"
 #include "world/world.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 uint64_t vehicle_spawn(void) {    
     ecs_entity_t e = entity_spawn(EKIND_VEHICLE);
diff --git a/code/foundation/src/ents/prefabs/vehicle.h b/code/foundation/src/models/prefabs/vehicle.h
similarity index 100%
rename from code/foundation/src/ents/prefabs/vehicle.h
rename to code/foundation/src/models/prefabs/vehicle.h
diff --git a/code/foundation/src/net/network_enet.c b/code/foundation/src/net/network_enet.c
index cc2c503..085c20a 100644
--- a/code/foundation/src/net/network_enet.c
+++ b/code/foundation/src/net/network_enet.c
@@ -16,9 +16,9 @@
 #include "packets/pkt_00_init.h"
 #include "world/world.h"
 #include "core/game.h"
-#include "ents/prefabs/player.h"
+#include "models/prefabs/player.h"
 
-#include "ecs/components.h"
+#include "models/components.h"
 
 #define NETWORK_UPDATE_DELAY 0.100
 
diff --git a/code/foundation/src/packets/pkt_00_init.c b/code/foundation/src/packets/pkt_00_init.c
index 350b9e9..df847d4 100644
--- a/code/foundation/src/packets/pkt_00_init.c
+++ b/code/foundation/src/packets/pkt_00_init.c
@@ -6,11 +6,11 @@
 #include "net/network.h"
 #include "world/entity_view.h"
 #include "core/camera.h"
-#include "ents/prefabs/player.h"
-#include "ents/entity.h"
+#include "models/prefabs/player.h"
+#include "models/entity.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 
 pkt_desc pkt_00_init_desc[] = {
     { PKT_FIELD(CWP_ITEM_POSITIVE_INTEGER, pkt_00_init, view_id) },
diff --git a/code/foundation/src/packets/pkt_send_keystate.c b/code/foundation/src/packets/pkt_send_keystate.c
index 18b815d..c4d2d30 100644
--- a/code/foundation/src/packets/pkt_send_keystate.c
+++ b/code/foundation/src/packets/pkt_send_keystate.c
@@ -1,10 +1,10 @@
 #include "pkt/packet_utils.h"
 #include "net/network.h"
 #include "packets/pkt_send_keystate.h"
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 #include "world/world.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 
 #include "debug/debug_replay.h"
 
diff --git a/code/foundation/src/packets/pkt_send_keystate.h b/code/foundation/src/packets/pkt_send_keystate.h
index 16846f1..aeccc9c 100644
--- a/code/foundation/src/packets/pkt_send_keystate.h
+++ b/code/foundation/src/packets/pkt_send_keystate.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "platform/system.h"
 #include "pkt/packet_utils.h"
-#include "ents/item_placement.h"
+#include "models/item_placement.h"
 
 typedef struct {
     float x;
diff --git a/code/foundation/src/packets/pkt_switch_viewer.c b/code/foundation/src/packets/pkt_switch_viewer.c
index 13625bf..cc0f94b 100644
--- a/code/foundation/src/packets/pkt_switch_viewer.c
+++ b/code/foundation/src/packets/pkt_switch_viewer.c
@@ -5,10 +5,10 @@
 #include "net/network.h"
 #include "world/entity_view.h"
 #include "core/camera.h"
-#include "ents/prefabs/player.h"
+#include "models/prefabs/player.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 
 pkt_desc pkt_switch_viewer_desc[] = {
     { PKT_FIELD(CWP_ITEM_POSITIVE_INTEGER, pkt_switch_viewer, view_id) },
diff --git a/code/foundation/src/ecs/modules/system_demo.c b/code/foundation/src/systems/modules/system_demo.c
similarity index 100%
rename from code/foundation/src/ecs/modules/system_demo.c
rename to code/foundation/src/systems/modules/system_demo.c
diff --git a/code/foundation/src/ecs/modules/system_furnace.c b/code/foundation/src/systems/modules/system_furnace.c
similarity index 100%
rename from code/foundation/src/ecs/modules/system_furnace.c
rename to code/foundation/src/systems/modules/system_furnace.c
diff --git a/code/foundation/src/ecs/modules/system_items.c b/code/foundation/src/systems/modules/system_items.c
similarity index 99%
rename from code/foundation/src/ecs/modules/system_items.c
rename to code/foundation/src/systems/modules/system_items.c
index e67ea95..127d46d 100644
--- a/code/foundation/src/ecs/modules/system_items.c
+++ b/code/foundation/src/systems/modules/system_items.c
@@ -1,4 +1,4 @@
-#include "ents/items.h"
+#include "models/items.h"
 
 void PickItem(ecs_iter_t *it) {
     Position *p = ecs_field(it, Position, 2);
diff --git a/code/foundation/src/ecs/modules/system_onfoot.c b/code/foundation/src/systems/modules/system_onfoot.c
similarity index 96%
rename from code/foundation/src/ecs/modules/system_onfoot.c
rename to code/foundation/src/systems/modules/system_onfoot.c
index 8c90e1a..4563eb7 100644
--- a/code/foundation/src/ecs/modules/system_onfoot.c
+++ b/code/foundation/src/systems/modules/system_onfoot.c
@@ -1,4 +1,4 @@
-#include "ents/entity.h"
+#include "models/entity.h"
 
 void MovementImpulse(ecs_iter_t *it) {
     Input *in = ecs_field(it, Input, 1);
diff --git a/code/foundation/src/ecs/modules/system_vehicle.c b/code/foundation/src/systems/modules/system_vehicle.c
similarity index 99%
rename from code/foundation/src/ecs/modules/system_vehicle.c
rename to code/foundation/src/systems/modules/system_vehicle.c
index 6833958..a17cd42 100644
--- a/code/foundation/src/ecs/modules/system_vehicle.c
+++ b/code/foundation/src/systems/modules/system_vehicle.c
@@ -1,5 +1,5 @@
 #include "debug/debug_draw.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 
 void LeaveVehicle(ecs_iter_t *it) {
     Input *in = ecs_field(it, Input, 1);
diff --git a/code/foundation/src/ecs/systems.c b/code/foundation/src/systems/systems.c
similarity index 99%
rename from code/foundation/src/ecs/systems.c
rename to code/foundation/src/systems/systems.c
index 8d2ae38..16477b7 100644
--- a/code/foundation/src/ecs/systems.c
+++ b/code/foundation/src/systems/systems.c
@@ -1,6 +1,6 @@
 #include "zpl.h"
-#include "ecs/systems.h"
-#include "ecs/components.h"
+#include "systems/systems.h"
+#include "models/components.h"
 #include "world/world.h"
 #include "world/blocks.h"
 #include "platform/profiler.h"
diff --git a/code/foundation/src/ecs/systems.h b/code/foundation/src/systems/systems.h
similarity index 85%
rename from code/foundation/src/ecs/systems.h
rename to code/foundation/src/systems/systems.h
index b3536f4..613aa29 100644
--- a/code/foundation/src/ecs/systems.h
+++ b/code/foundation/src/systems/systems.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "flecs/flecs.h"
+#include "flecs.h"
 
 static inline float safe_dt(ecs_iter_t *it) {
     return zpl_min(it->delta_time, 0.03334f);
diff --git a/code/foundation/src/world/entity_view.h b/code/foundation/src/world/entity_view.h
index 2299c12..9f2e9a6 100644
--- a/code/foundation/src/world/entity_view.h
+++ b/code/foundation/src/world/entity_view.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "platform/system.h"
 #include "gen/assets.h"
-#include "ents/items.h"
+#include "models/items.h"
 
 #define ZPL_PICO
 #include "zpl.h"
diff --git a/code/foundation/src/world/world.c b/code/foundation/src/world/world.c
index a50d7b3..f93249c 100644
--- a/code/foundation/src/world/world.c
+++ b/code/foundation/src/world/world.c
@@ -1,16 +1,16 @@
 #include "zpl.h"
 #include "librg.h"
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 #include "world/world.h"
 #include "world/entity_view.h"
 #include "debug/debug_replay.h"
-#include "ents/items.h"
+#include "models/items.h"
 #include "world/worldgen.h"
 #include "platform/platform.h"
 #include "platform/profiler.h"
 #include "core/game.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 
 #include "packets/pkt_send_librg_update.h"
 
diff --git a/code/foundation/src/world/world.h b/code/foundation/src/world/world.h
index 8b80865..e7ef6a9 100644
--- a/code/foundation/src/world/world.h
+++ b/code/foundation/src/world/world.h
@@ -2,7 +2,7 @@
 #include "platform/system.h"
 #include "librg.h"
 #include "pkt/packet.h"
-#include "flecs/flecs.h"
+#include "flecs.h"
 #include "world/blocks.h"
 
 #define WORLD_ERROR_NONE                +0x0000
diff --git a/code/games/minimal/src/main.c b/code/games/minimal/src/main.c
index 73a9dc6..7caafe3 100644
--- a/code/games/minimal/src/main.c
+++ b/code/games/minimal/src/main.c
@@ -2,17 +2,17 @@
 #include "zpl.h"
 #include "platform/system.h"
 #include "core/game.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 #include "world/entity_view.h"
 #include "utils/options.h"
 #include "platform/signal_handling.h"
 #include "platform/profiler.h"
 
-#include "flecs/flecs.h"
+#include "flecs.h"
 #include "flecs/flecs_os_api_stdcpp.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 
 #include "platform/arch.h"
 
diff --git a/code/games/minimal/src/worldgen.c b/code/games/minimal/src/worldgen.c
index 465a694..031c0b4 100644
--- a/code/games/minimal/src/worldgen.c
+++ b/code/games/minimal/src/worldgen.c
@@ -7,10 +7,10 @@
 #include "world/blocks.h"
 #include "world/perlin.h"
 
-#include "ecs/components.h"
-#include "ents/entity.h"
-#include "ents/prefabs/vehicle.h"
-#include "ents/items.h"
+#include "models/components.h"
+#include "models/entity.h"
+#include "models/prefabs/vehicle.h"
+#include "models/items.h"
 #include "world/blocks_info.h"
 
 #include "world/worldgen_utils.h"
diff --git a/code/games/sandbox/src/main.c b/code/games/sandbox/src/main.c
index 941ebd9..8327227 100644
--- a/code/games/sandbox/src/main.c
+++ b/code/games/sandbox/src/main.c
@@ -2,17 +2,17 @@
 #include "zpl.h"
 #include "platform/system.h"
 #include "core/game.h"
-#include "ents/entity.h"
+#include "models/entity.h"
 #include "world/entity_view.h"
 #include "utils/options.h"
 #include "platform/signal_handling.h"
 #include "platform/profiler.h"
 
-#include "flecs/flecs.h"
+#include "flecs.h"
 #include "flecs/flecs_os_api_stdcpp.h"
 
-#include "ecs/components.h"
-#include "ecs/systems.h"
+#include "models/components.h"
+#include "systems/systems.h"
 
 #include "platform/arch.h"
 
diff --git a/code/games/sandbox/src/worldgen.c b/code/games/sandbox/src/worldgen.c
index 5d34873..7914ff8 100644
--- a/code/games/sandbox/src/worldgen.c
+++ b/code/games/sandbox/src/worldgen.c
@@ -7,10 +7,10 @@
 #include "world/blocks.h"
 #include "world/perlin.h"
 
-#include "ecs/components.h"
-#include "ents/entity.h"
-#include "ents/prefabs/vehicle.h"
-#include "ents/items.h"
+#include "models/components.h"
+#include "models/entity.h"
+#include "models/prefabs/vehicle.h"
+#include "models/items.h"
 #include "world/blocks_info.h"
 
 #include "world/worldgen_utils.h"