diff --git a/deerith_engine_server/include/deerith/network/network_internals.h b/deerith_engine_server/include/deerith/server/network/network_internals.h
similarity index 100%
rename from deerith_engine_server/include/deerith/network/network_internals.h
rename to deerith_engine_server/include/deerith/server/network/network_internals.h
diff --git a/deerith_engine_server/include/deerith/world.h b/deerith_engine_server/include/deerith/server/world.h
similarity index 100%
rename from deerith_engine_server/include/deerith/world.h
rename to deerith_engine_server/include/deerith/server/world.h
diff --git a/deerith_engine_server/include/deerith/world/world_internals.h b/deerith_engine_server/include/deerith/server/world/world_internals.h
similarity index 100%
rename from deerith_engine_server/include/deerith/world/world_internals.h
rename to deerith_engine_server/include/deerith/server/world/world_internals.h
diff --git a/deerith_engine_server/src/core.cpp b/deerith_engine_server/src/core.cpp
index df3fae9..f257967 100644
--- a/deerith_engine_server/src/core.cpp
+++ b/deerith_engine_server/src/core.cpp
@@ -1,6 +1,6 @@
 #include <deerith/engine.h>
 
-#include <deerith/network/network_internals.h>
+#include <deerith/server/network/network_internals.h>
 
 namespace deerith
 {
diff --git a/deerith_engine_server/src/network/network.cpp b/deerith_engine_server/src/network/network.cpp
index 8c89414..67bd929 100644
--- a/deerith_engine_server/src/network/network.cpp
+++ b/deerith_engine_server/src/network/network.cpp
@@ -3,7 +3,7 @@
 #include <deerith/network/router.h>
 #include <deerith/network/packets.h>
 
-#include <deerith/world.h>
+#include <deerith/server/world.h>
 
 #include <enet/enet.h>
 
@@ -11,8 +11,8 @@
 #include <vector>
 #include <memory>
 
-#include <deerith/network/network_internals.h>
-#include <deerith/world/world_internals.h>
+#include <deerith/server/network/network_internals.h>
+#include <deerith/server/world/world_internals.h>
 
 namespace deerith
 {
diff --git a/deerith_engine_server/src/world/player_communication.cpp b/deerith_engine_server/src/world/player_communication.cpp
index f396572..2137c7a 100644
--- a/deerith_engine_server/src/world/player_communication.cpp
+++ b/deerith_engine_server/src/world/player_communication.cpp
@@ -1,12 +1,13 @@
 #include <deerith/engine.h>
-#include <deerith/world.h>
 #include <deerith/world/components.h>
 #include <deerith/network/packets.h>
 #include <deerith/network/router.h>
 #include <deerith/network/client.h>
 
-#include <deerith/network/network_internals.h>
-#include <deerith/world/world_internals.h>
+#include <deerith/server/world.h>
+
+#include <deerith/server/network/network_internals.h>
+#include <deerith/server/world/world_internals.h>
 
 namespace deerith
 {
diff --git a/deerith_engine_server/src/world/world.cpp b/deerith_engine_server/src/world/world.cpp
index 8112c67..20e1c8c 100644
--- a/deerith_engine_server/src/world/world.cpp
+++ b/deerith_engine_server/src/world/world.cpp
@@ -1,9 +1,9 @@
-#include <deerith/world.h>
+#include <deerith/server/world.h>
 #include <deerith/core/log.h>
 #include <deerith/network/router.h>
 
-#include <deerith/network/network_internals.h>
-#include <deerith/world/world_internals.h>
+#include <deerith/server/network/network_internals.h>
+#include <deerith/server/world/world_internals.h>
 
 #include <deerith/world/components.h>
 #include <deerith/network/packets.h>
diff --git a/deerith_engine_server/src/world/world_simulation.cpp b/deerith_engine_server/src/world/world_simulation.cpp
index 4373de1..1318466 100644
--- a/deerith_engine_server/src/world/world_simulation.cpp
+++ b/deerith_engine_server/src/world/world_simulation.cpp
@@ -1,6 +1,6 @@
-#include <deerith/world/world_internals.h>
+#include <deerith/server/world/world_internals.h>
 
-#include <deerith/world.h>
+#include <deerith/server/world.h>
 #include <deerith/world/components.h>
 #include <deerith/network/packets.h>
 #include <deerith/network/router.h>
diff --git a/sandbox/src/main.cpp b/sandbox/src/main.cpp
index b3a83ca..de54ff6 100644
--- a/sandbox/src/main.cpp
+++ b/sandbox/src/main.cpp
@@ -1,5 +1,6 @@
 #include <deerith/engine.h>
-#include <deerith/world.h>
+#include <deerith/server/world.h>
+
 #include <thread>
 #include <args/argh.h>