diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74511d7..8e476e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
 
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-    add_compile_options(/MP /W4 /nologo)
+    add_compile_options(/W4 /nologo)
 endif()
 
 include_directories(code/common code/vendors code/vendors/flecs)
diff --git a/code/game/CMakeLists.txt b/code/game/CMakeLists.txt
index dacbc8f..3f650cd 100644
--- a/code/game/CMakeLists.txt
+++ b/code/game/CMakeLists.txt
@@ -1,42 +1,42 @@
-file(GLOB PKT_SRCS ../game/header/packets/*.h ../game/source/packets/*.c)
+file(GLOB PKT_SRCS ../game/src/packets/*.h ../game/src/packets/*.c)
 
 add_executable(eco2d
-	source/platform_raylib.c
-	source/main.c
+	src/platform_raylib.c
+	src/main.c
 
-	source/network.c
-	source/game.c
-	source/camera.c
-	source/world_view.c
-	source/prediction.c
+	src/network.c
+	src/game.c
+	src/camera.c
+	src/world_view.c
+	src/prediction.c
 
-	source/assets.c
-	source/compress.c
-	source/entity.c
-	source/entity_view.c
-	source/packet.c
-	source/player.c
-	source/signal_handling.c
-	source/profiler.c
-	source/debug_ui.c
+	src/assets.c
+	src/compress.c
+	src/entity.c
+	src/entity_view.c
+	src/packet.c
+	src/player.c
+	src/signal_handling.c
+	src/profiler.c
+	src/debug_ui.c
   
-	source/utils/options.c
+	src/utils/options.c
 
-	header/network.h
+	src/network.h
 
-	source/world/blocks.c
-	source/world/perlin.c
-	source/world/world.c
+	src/world/blocks.c
+	src/world/perlin.c
+	src/world/world.c
 
-	source/gen/texgen.c
+	src/gen/texgen.c
 
-	source/world/worldgen/worldgen_test.c
+	src/world/worldgen/worldgen_test.c
 
 	${PKT_SRCS}
 )
 
 target_compile_definitions(eco2d PRIVATE CLIENT)
-include_directories(header ../modules ../../art/gen)
+include_directories(src ../modules ../../art/gen)
 target_link_libraries(eco2d raylib cwpack eco2d-modules flecs-bundle)
 
 link_system_libs(eco2d)
diff --git a/code/game/header/entity.h b/code/game/header/entity.h
deleted file mode 100644
index bbdecbc..0000000
--- a/code/game/header/entity.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#include "system.h"
-
-uint64_t entity_spawn(char *name, uint16_t class_id /* 0 = no streaming */);
-void entity_despawn(uint64_t ent_id);
diff --git a/code/game/source/assets.c b/code/game/src/assets.c
similarity index 100%
rename from code/game/source/assets.c
rename to code/game/src/assets.c
diff --git a/code/game/header/assets.h b/code/game/src/assets.h
similarity index 100%
rename from code/game/header/assets.h
rename to code/game/src/assets.h
diff --git a/code/game/source/assets_list.c b/code/game/src/assets_list.c
similarity index 100%
rename from code/game/source/assets_list.c
rename to code/game/src/assets_list.c
diff --git a/code/game/source/camera.c b/code/game/src/camera.c
similarity index 100%
rename from code/game/source/camera.c
rename to code/game/src/camera.c
diff --git a/code/game/header/camera.h b/code/game/src/camera.h
similarity index 100%
rename from code/game/header/camera.h
rename to code/game/src/camera.h
diff --git a/code/game/source/compress.c b/code/game/src/compress.c
similarity index 100%
rename from code/game/source/compress.c
rename to code/game/src/compress.c
diff --git a/code/game/header/compress.h b/code/game/src/compress.h
similarity index 100%
rename from code/game/header/compress.h
rename to code/game/src/compress.h
diff --git a/code/game/source/debug_ui.c b/code/game/src/debug_ui.c
similarity index 100%
rename from code/game/source/debug_ui.c
rename to code/game/src/debug_ui.c
diff --git a/code/game/header/debug_ui.h b/code/game/src/debug_ui.h
similarity index 100%
rename from code/game/header/debug_ui.h
rename to code/game/src/debug_ui.h
diff --git a/code/game/source/debug_ui_actions.c b/code/game/src/debug_ui_actions.c
similarity index 100%
rename from code/game/source/debug_ui_actions.c
rename to code/game/src/debug_ui_actions.c
diff --git a/code/game/source/debug_ui_widgets.c b/code/game/src/debug_ui_widgets.c
similarity index 100%
rename from code/game/source/debug_ui_widgets.c
rename to code/game/src/debug_ui_widgets.c
diff --git a/code/game/source/entity.c b/code/game/src/entity.c
similarity index 84%
rename from code/game/source/entity.c
rename to code/game/src/entity.c
index 05f1057..082688d 100644
--- a/code/game/source/entity.c
+++ b/code/game/src/entity.c
@@ -9,16 +9,11 @@
 #include "modules/systems.h"
 #include "zpl.h"
 
-uint64_t entity_spawn(char *name, uint16_t class_id) {
+uint64_t entity_spawn(uint16_t class_id) {
     ECS_IMPORT(world_ecs(), Components);
     
     ecs_entity_t e = ecs_new(world_ecs(), 0);
     
-    if (!name) {
-        name = zpl_bprintf("entity_%d", e);
-    }
-    
-    ecs_set(world_ecs(), e, EcsName, {.alloc_value = name });
     ecs_set(world_ecs(), e, Velocity, {0});
     ecs_set(world_ecs(), e, Classify, { .id = class_id });
     ecs_add(world_ecs(), e, Walking);
diff --git a/code/game/src/entity.h b/code/game/src/entity.h
new file mode 100644
index 0000000..8ed113d
--- /dev/null
+++ b/code/game/src/entity.h
@@ -0,0 +1,5 @@
+#pragma once
+#include "system.h"
+
+uint64_t entity_spawn(uint16_t class_id /* 0 = no streaming */);
+void entity_despawn(uint64_t ent_id);
diff --git a/code/game/source/entity_view.c b/code/game/src/entity_view.c
similarity index 100%
rename from code/game/source/entity_view.c
rename to code/game/src/entity_view.c
diff --git a/code/game/header/entity_view.h b/code/game/src/entity_view.h
similarity index 100%
rename from code/game/header/entity_view.h
rename to code/game/src/entity_view.h
diff --git a/code/game/source/game.c b/code/game/src/game.c
similarity index 99%
rename from code/game/source/game.c
rename to code/game/src/game.c
index 902215c..9996633 100644
--- a/code/game/source/game.c
+++ b/code/game/src/game.c
@@ -133,7 +133,7 @@ void game_init(game_kind play_mode, uint32_t num_viewers, int32_t seed, uint16_t
 }
 
 int8_t game_is_networked() {
-    return game_mode > 0;
+    return game_mode != GAMEKIND_SINGLE;
 }
 
 void game_shutdown() {
diff --git a/code/game/header/game.h b/code/game/src/game.h
similarity index 100%
rename from code/game/header/game.h
rename to code/game/src/game.h
diff --git a/code/game/source/gen/texgen.c b/code/game/src/gen/texgen.c
similarity index 100%
rename from code/game/source/gen/texgen.c
rename to code/game/src/gen/texgen.c
diff --git a/code/game/header/gen/texgen.h b/code/game/src/gen/texgen.h
similarity index 100%
rename from code/game/header/gen/texgen.h
rename to code/game/src/gen/texgen.h
diff --git a/code/game/source/gen/texgen_data.c b/code/game/src/gen/texgen_data.c
similarity index 100%
rename from code/game/source/gen/texgen_data.c
rename to code/game/src/gen/texgen_data.c
diff --git a/code/game/source/main.c b/code/game/src/main.c
similarity index 98%
rename from code/game/source/main.c
rename to code/game/src/main.c
index 7421bab..bb2337f 100644
--- a/code/game/source/main.c
+++ b/code/game/src/main.c
@@ -70,7 +70,7 @@ int main(int argc, char** argv) {
     {
         ECS_IMPORT(world_ecs(), Components);
         for (uint32_t i = 0; i < npc_count; i++) {
-            uint64_t e = entity_spawn(NULL, EKIND_DEMO_NPC);
+            uint64_t e = entity_spawn(EKIND_DEMO_NPC);
             ecs_add(world_ecs(), e, EcsDemoNPC);
             Position *pos = ecs_get_mut(world_ecs(), e, Position, NULL);
             pos->x=rand() % world_dim();
diff --git a/code/game/source/network.c b/code/game/src/network.c
similarity index 100%
rename from code/game/source/network.c
rename to code/game/src/network.c
diff --git a/code/game/header/network.h b/code/game/src/network.h
similarity index 100%
rename from code/game/header/network.h
rename to code/game/src/network.h
diff --git a/code/game/source/packet.c b/code/game/src/packet.c
similarity index 100%
rename from code/game/source/packet.c
rename to code/game/src/packet.c
diff --git a/code/game/header/packet.h b/code/game/src/packet.h
similarity index 100%
rename from code/game/header/packet.h
rename to code/game/src/packet.h
diff --git a/code/game/header/packet_utils.h b/code/game/src/packet_utils.h
similarity index 100%
rename from code/game/header/packet_utils.h
rename to code/game/src/packet_utils.h
diff --git a/code/game/source/packets/pkt_00_init.c b/code/game/src/packets/pkt_00_init.c
similarity index 100%
rename from code/game/source/packets/pkt_00_init.c
rename to code/game/src/packets/pkt_00_init.c
diff --git a/code/game/header/packets/pkt_00_init.h b/code/game/src/packets/pkt_00_init.h
similarity index 100%
rename from code/game/header/packets/pkt_00_init.h
rename to code/game/src/packets/pkt_00_init.h
diff --git a/code/game/source/packets/pkt_01_welcome.c b/code/game/src/packets/pkt_01_welcome.c
similarity index 100%
rename from code/game/source/packets/pkt_01_welcome.c
rename to code/game/src/packets/pkt_01_welcome.c
diff --git a/code/game/header/packets/pkt_01_welcome.h b/code/game/src/packets/pkt_01_welcome.h
similarity index 100%
rename from code/game/header/packets/pkt_01_welcome.h
rename to code/game/src/packets/pkt_01_welcome.h
diff --git a/code/game/source/packets/pkt_send_keystate.c b/code/game/src/packets/pkt_send_keystate.c
similarity index 100%
rename from code/game/source/packets/pkt_send_keystate.c
rename to code/game/src/packets/pkt_send_keystate.c
diff --git a/code/game/header/packets/pkt_send_keystate.h b/code/game/src/packets/pkt_send_keystate.h
similarity index 100%
rename from code/game/header/packets/pkt_send_keystate.h
rename to code/game/src/packets/pkt_send_keystate.h
diff --git a/code/game/source/packets/pkt_send_librg_update.c b/code/game/src/packets/pkt_send_librg_update.c
similarity index 100%
rename from code/game/source/packets/pkt_send_librg_update.c
rename to code/game/src/packets/pkt_send_librg_update.c
diff --git a/code/game/header/packets/pkt_send_librg_update.h b/code/game/src/packets/pkt_send_librg_update.h
similarity index 100%
rename from code/game/header/packets/pkt_send_librg_update.h
rename to code/game/src/packets/pkt_send_librg_update.h
diff --git a/code/game/header/platform.h b/code/game/src/platform.h
similarity index 100%
rename from code/game/header/platform.h
rename to code/game/src/platform.h
diff --git a/code/game/source/platform_raylib.c b/code/game/src/platform_raylib.c
similarity index 99%
rename from code/game/source/platform_raylib.c
rename to code/game/src/platform_raylib.c
index b74dbbf..251ce0b 100644
--- a/code/game/source/platform_raylib.c
+++ b/code/game/src/platform_raylib.c
@@ -26,7 +26,7 @@ static Camera2D render_camera;
 void platform_init() {
     InitWindow(screenWidth, screenHeight, "eco2d - client");
     SetWindowState(FLAG_WINDOW_UNDECORATED|FLAG_WINDOW_MAXIMIZED|FLAG_WINDOW_RESIZABLE);
-    SetTargetFPS(60);
+    SetTargetFPS(0);
     
     screenWidth = GetScreenWidth();
     screenHeight = GetScreenHeight();
diff --git a/code/game/source/platform_text.c b/code/game/src/platform_text.c
similarity index 100%
rename from code/game/source/platform_text.c
rename to code/game/src/platform_text.c
diff --git a/code/game/source/player.c b/code/game/src/player.c
similarity index 94%
rename from code/game/source/player.c
rename to code/game/src/player.c
index e3b5675..d288c11 100644
--- a/code/game/source/player.c
+++ b/code/game/src/player.c
@@ -13,7 +13,7 @@
 #define PLAYER_MAX_HP 100.0f
 
 uint64_t player_spawn(char *name) {    
-    ecs_entity_t e = entity_spawn(NULL, EKIND_PLAYER);
+    ecs_entity_t e = entity_spawn(EKIND_PLAYER);
     
     if (!name) {
         name = zpl_bprintf("player_%d", e);
diff --git a/code/game/header/player.h b/code/game/src/player.h
similarity index 100%
rename from code/game/header/player.h
rename to code/game/src/player.h
diff --git a/code/game/source/prediction.c b/code/game/src/prediction.c
similarity index 100%
rename from code/game/source/prediction.c
rename to code/game/src/prediction.c
diff --git a/code/game/header/prediction.h b/code/game/src/prediction.h
similarity index 100%
rename from code/game/header/prediction.h
rename to code/game/src/prediction.h
diff --git a/code/game/source/profiler.c b/code/game/src/profiler.c
similarity index 100%
rename from code/game/source/profiler.c
rename to code/game/src/profiler.c
diff --git a/code/game/header/profiler.h b/code/game/src/profiler.h
similarity index 100%
rename from code/game/header/profiler.h
rename to code/game/src/profiler.h
diff --git a/code/game/source/signal_handling.c b/code/game/src/signal_handling.c
similarity index 100%
rename from code/game/source/signal_handling.c
rename to code/game/src/signal_handling.c
diff --git a/code/game/header/signal_handling.h b/code/game/src/signal_handling.h
similarity index 100%
rename from code/game/header/signal_handling.h
rename to code/game/src/signal_handling.h
diff --git a/code/game/header/system.h b/code/game/src/system.h
similarity index 100%
rename from code/game/header/system.h
rename to code/game/src/system.h
diff --git a/code/game/source/utils/options.c b/code/game/src/utils/options.c
similarity index 100%
rename from code/game/source/utils/options.c
rename to code/game/src/utils/options.c
diff --git a/code/game/header/utils/options.h b/code/game/src/utils/options.h
similarity index 100%
rename from code/game/header/utils/options.h
rename to code/game/src/utils/options.h
diff --git a/code/game/header/utils/raylib_helpers.h b/code/game/src/utils/raylib_helpers.h
similarity index 100%
rename from code/game/header/utils/raylib_helpers.h
rename to code/game/src/utils/raylib_helpers.h
diff --git a/code/game/source/world/blocks.c b/code/game/src/world/blocks.c
similarity index 100%
rename from code/game/source/world/blocks.c
rename to code/game/src/world/blocks.c
diff --git a/code/game/header/world/blocks.h b/code/game/src/world/blocks.h
similarity index 100%
rename from code/game/header/world/blocks.h
rename to code/game/src/world/blocks.h
diff --git a/code/game/header/world/blocks_info.h b/code/game/src/world/blocks_info.h
similarity index 100%
rename from code/game/header/world/blocks_info.h
rename to code/game/src/world/blocks_info.h
diff --git a/code/game/source/world/blocks_list.c b/code/game/src/world/blocks_list.c
similarity index 100%
rename from code/game/source/world/blocks_list.c
rename to code/game/src/world/blocks_list.c
diff --git a/code/game/source/world/perlin.c b/code/game/src/world/perlin.c
similarity index 100%
rename from code/game/source/world/perlin.c
rename to code/game/src/world/perlin.c
diff --git a/code/game/header/world/perlin.h b/code/game/src/world/perlin.h
similarity index 100%
rename from code/game/header/world/perlin.h
rename to code/game/src/world/perlin.h
diff --git a/code/game/source/world/world.c b/code/game/src/world/world.c
similarity index 100%
rename from code/game/source/world/world.c
rename to code/game/src/world/world.c
diff --git a/code/game/header/world/world.h b/code/game/src/world/world.h
similarity index 100%
rename from code/game/header/world/world.h
rename to code/game/src/world/world.h
diff --git a/code/game/header/world/worldgen/worldgen.h b/code/game/src/world/worldgen/worldgen.h
similarity index 100%
rename from code/game/header/world/worldgen/worldgen.h
rename to code/game/src/world/worldgen/worldgen.h
diff --git a/code/game/source/world/worldgen/worldgen_test.c b/code/game/src/world/worldgen/worldgen_test.c
similarity index 100%
rename from code/game/source/world/worldgen/worldgen_test.c
rename to code/game/src/world/worldgen/worldgen_test.c
diff --git a/code/game/source/world_view.c b/code/game/src/world_view.c
similarity index 100%
rename from code/game/source/world_view.c
rename to code/game/src/world_view.c
diff --git a/code/game/header/world_view.h b/code/game/src/world_view.h
similarity index 100%
rename from code/game/header/world_view.h
rename to code/game/src/world_view.h
diff --git a/code/modules/CMakeLists.txt b/code/modules/CMakeLists.txt
index b249aed..ae74ba3 100644
--- a/code/modules/CMakeLists.txt
+++ b/code/modules/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(eco2d-modules STATIC
-	source/systems.c
-	source/components.c
+	modules/systems.c
+	modules/components.c
 )
-include_directories(. ../game/header)
+include_directories(. ../game/src)
diff --git a/code/modules/source/components.c b/code/modules/modules/components.c
similarity index 100%
rename from code/modules/source/components.c
rename to code/modules/modules/components.c
diff --git a/code/modules/source/systems.c b/code/modules/modules/systems.c
similarity index 100%
rename from code/modules/source/systems.c
rename to code/modules/modules/systems.c