diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df8be7f00..d5aeabf1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,12 +24,7 @@ set(CMAKE_CXX_CPPCHECK "")
 endif()
 
 add_subdirectory(modules)
-if (CLIENT)
-	add_subdirectory(client)
-endif()
-if (SERVER)
-	add_subdirectory(server)
-endif()
+add_subdirectory(games)
 add_subdirectory(tools)
 if (VISUALTESTS)
 	add_subdirectory(tests)
diff --git a/src/games/CMakeLists.txt b/src/games/CMakeLists.txt
new file mode 100644
index 000000000..3b7d74b9f
--- /dev/null
+++ b/src/games/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(openworld)
diff --git a/src/games/openworld/CMakeLists.txt b/src/games/openworld/CMakeLists.txt
new file mode 100644
index 000000000..00668a6fe
--- /dev/null
+++ b/src/games/openworld/CMakeLists.txt
@@ -0,0 +1,6 @@
+if (CLIENT)
+	add_subdirectory(client)
+endif()
+if (SERVER)
+	add_subdirectory(server)
+endif()
diff --git a/src/client/CMakeLists.txt b/src/games/openworld/client/CMakeLists.txt
similarity index 100%
rename from src/client/CMakeLists.txt
rename to src/games/openworld/client/CMakeLists.txt
diff --git a/src/client/Client.cpp b/src/games/openworld/client/Client.cpp
similarity index 100%
rename from src/client/Client.cpp
rename to src/games/openworld/client/Client.cpp
diff --git a/src/client/Client.h b/src/games/openworld/client/Client.h
similarity index 100%
rename from src/client/Client.h
rename to src/games/openworld/client/Client.h
diff --git a/src/client/ClientLUA.cpp b/src/games/openworld/client/ClientLUA.cpp
similarity index 100%
rename from src/client/ClientLUA.cpp
rename to src/games/openworld/client/ClientLUA.cpp
diff --git a/src/client/ClientLUA.h b/src/games/openworld/client/ClientLUA.h
similarity index 100%
rename from src/client/ClientLUA.h
rename to src/games/openworld/client/ClientLUA.h
diff --git a/src/client/lua/ui/client.lua b/src/games/openworld/client/lua/ui/client.lua
similarity index 100%
rename from src/client/lua/ui/client.lua
rename to src/games/openworld/client/lua/ui/client.lua
diff --git a/src/client/lua/ui/shared.lua b/src/games/openworld/client/lua/ui/shared.lua
similarity index 100%
rename from src/client/lua/ui/shared.lua
rename to src/games/openworld/client/lua/ui/shared.lua
diff --git a/src/client/lua/ui/style.lua b/src/games/openworld/client/lua/ui/style.lua
similarity index 100%
rename from src/client/lua/ui/style.lua
rename to src/games/openworld/client/lua/ui/style.lua
diff --git a/src/client/lua/ui/window/auth_failed.lua b/src/games/openworld/client/lua/ui/window/auth_failed.lua
similarity index 100%
rename from src/client/lua/ui/window/auth_failed.lua
rename to src/games/openworld/client/lua/ui/window/auth_failed.lua
diff --git a/src/client/lua/ui/window/disconnect.lua b/src/games/openworld/client/lua/ui/window/disconnect.lua
similarity index 100%
rename from src/client/lua/ui/window/disconnect.lua
rename to src/games/openworld/client/lua/ui/window/disconnect.lua
diff --git a/src/client/lua/ui/window/hud.lua b/src/games/openworld/client/lua/ui/window/hud.lua
similarity index 100%
rename from src/client/lua/ui/window/hud.lua
rename to src/games/openworld/client/lua/ui/window/hud.lua
diff --git a/src/client/lua/ui/window/main.lua b/src/games/openworld/client/lua/ui/window/main.lua
similarity index 100%
rename from src/client/lua/ui/window/main.lua
rename to src/games/openworld/client/lua/ui/window/main.lua
diff --git a/src/client/lua/ui/window/options.lua b/src/games/openworld/client/lua/ui/window/options.lua
similarity index 100%
rename from src/client/lua/ui/window/options.lua
rename to src/games/openworld/client/lua/ui/window/options.lua
diff --git a/src/client/lua/ui/window/popup.lua b/src/games/openworld/client/lua/ui/window/popup.lua
similarity index 100%
rename from src/client/lua/ui/window/popup.lua
rename to src/games/openworld/client/lua/ui/window/popup.lua
diff --git a/src/client/lua/ui/window/style.lua b/src/games/openworld/client/lua/ui/window/style.lua
similarity index 100%
rename from src/client/lua/ui/window/style.lua
rename to src/games/openworld/client/lua/ui/window/style.lua
diff --git a/src/client/lua/ui/window/validation_failed.lua b/src/games/openworld/client/lua/ui/window/validation_failed.lua
similarity index 100%
rename from src/client/lua/ui/window/validation_failed.lua
rename to src/games/openworld/client/lua/ui/window/validation_failed.lua
diff --git a/src/client/modules/CMakeLists.txt b/src/games/openworld/client/modules/CMakeLists.txt
similarity index 100%
rename from src/client/modules/CMakeLists.txt
rename to src/games/openworld/client/modules/CMakeLists.txt
diff --git a/src/client/modules/cooldown/CMakeLists.txt b/src/games/openworld/client/modules/cooldown/CMakeLists.txt
similarity index 100%
rename from src/client/modules/cooldown/CMakeLists.txt
rename to src/games/openworld/client/modules/cooldown/CMakeLists.txt
diff --git a/src/client/modules/cooldown/CooldownHandler.cpp b/src/games/openworld/client/modules/cooldown/CooldownHandler.cpp
similarity index 100%
rename from src/client/modules/cooldown/CooldownHandler.cpp
rename to src/games/openworld/client/modules/cooldown/CooldownHandler.cpp
diff --git a/src/client/modules/cooldown/CooldownHandler.h b/src/games/openworld/client/modules/cooldown/CooldownHandler.h
similarity index 100%
rename from src/client/modules/cooldown/CooldownHandler.h
rename to src/games/openworld/client/modules/cooldown/CooldownHandler.h
diff --git a/src/client/modules/network/AttribUpdateHandler.h b/src/games/openworld/client/modules/network/AttribUpdateHandler.h
similarity index 100%
rename from src/client/modules/network/AttribUpdateHandler.h
rename to src/games/openworld/client/modules/network/AttribUpdateHandler.h
diff --git a/src/client/modules/network/AuthFailedHandler.h b/src/games/openworld/client/modules/network/AuthFailedHandler.h
similarity index 100%
rename from src/client/modules/network/AuthFailedHandler.h
rename to src/games/openworld/client/modules/network/AuthFailedHandler.h
diff --git a/src/client/modules/network/CMakeLists.txt b/src/games/openworld/client/modules/network/CMakeLists.txt
similarity index 100%
rename from src/client/modules/network/CMakeLists.txt
rename to src/games/openworld/client/modules/network/CMakeLists.txt
diff --git a/src/client/modules/network/ClientMessageSender.cpp b/src/games/openworld/client/modules/network/ClientMessageSender.cpp
similarity index 100%
rename from src/client/modules/network/ClientMessageSender.cpp
rename to src/games/openworld/client/modules/network/ClientMessageSender.cpp
diff --git a/src/client/modules/network/ClientMessageSender.h b/src/games/openworld/client/modules/network/ClientMessageSender.h
similarity index 100%
rename from src/client/modules/network/ClientMessageSender.h
rename to src/games/openworld/client/modules/network/ClientMessageSender.h
diff --git a/src/client/modules/network/ClientNetwork.cpp b/src/games/openworld/client/modules/network/ClientNetwork.cpp
similarity index 100%
rename from src/client/modules/network/ClientNetwork.cpp
rename to src/games/openworld/client/modules/network/ClientNetwork.cpp
diff --git a/src/client/modules/network/ClientNetwork.h b/src/games/openworld/client/modules/network/ClientNetwork.h
similarity index 100%
rename from src/client/modules/network/ClientNetwork.h
rename to src/games/openworld/client/modules/network/ClientNetwork.h
diff --git a/src/client/modules/network/EntityRemoveHandler.h b/src/games/openworld/client/modules/network/EntityRemoveHandler.h
similarity index 100%
rename from src/client/modules/network/EntityRemoveHandler.h
rename to src/games/openworld/client/modules/network/EntityRemoveHandler.h
diff --git a/src/client/modules/network/EntitySpawnHandler.h b/src/games/openworld/client/modules/network/EntitySpawnHandler.h
similarity index 100%
rename from src/client/modules/network/EntitySpawnHandler.h
rename to src/games/openworld/client/modules/network/EntitySpawnHandler.h
diff --git a/src/client/modules/network/EntityUpdateHandler.h b/src/games/openworld/client/modules/network/EntityUpdateHandler.h
similarity index 100%
rename from src/client/modules/network/EntityUpdateHandler.h
rename to src/games/openworld/client/modules/network/EntityUpdateHandler.h
diff --git a/src/client/modules/network/IClientProtocolHandler.h b/src/games/openworld/client/modules/network/IClientProtocolHandler.h
similarity index 100%
rename from src/client/modules/network/IClientProtocolHandler.h
rename to src/games/openworld/client/modules/network/IClientProtocolHandler.h
diff --git a/src/client/modules/network/SignupValidationStateHandler.h b/src/games/openworld/client/modules/network/SignupValidationStateHandler.h
similarity index 100%
rename from src/client/modules/network/SignupValidationStateHandler.h
rename to src/games/openworld/client/modules/network/SignupValidationStateHandler.h
diff --git a/src/client/modules/network/StartCooldownHandler.h b/src/games/openworld/client/modules/network/StartCooldownHandler.h
similarity index 100%
rename from src/client/modules/network/StartCooldownHandler.h
rename to src/games/openworld/client/modules/network/StartCooldownHandler.h
diff --git a/src/client/modules/network/StopCooldownHandler.h b/src/games/openworld/client/modules/network/StopCooldownHandler.h
similarity index 100%
rename from src/client/modules/network/StopCooldownHandler.h
rename to src/games/openworld/client/modules/network/StopCooldownHandler.h
diff --git a/src/client/modules/network/UserInfoHandler.h b/src/games/openworld/client/modules/network/UserInfoHandler.h
similarity index 100%
rename from src/client/modules/network/UserInfoHandler.h
rename to src/games/openworld/client/modules/network/UserInfoHandler.h
diff --git a/src/client/modules/network/UserSpawnHandler.h b/src/games/openworld/client/modules/network/UserSpawnHandler.h
similarity index 100%
rename from src/client/modules/network/UserSpawnHandler.h
rename to src/games/openworld/client/modules/network/UserSpawnHandler.h
diff --git a/src/client/modules/network/VarUpdateHandler.h b/src/games/openworld/client/modules/network/VarUpdateHandler.h
similarity index 100%
rename from src/client/modules/network/VarUpdateHandler.h
rename to src/games/openworld/client/modules/network/VarUpdateHandler.h
diff --git a/src/client/modules/network/tests/ConnectTest.cpp b/src/games/openworld/client/modules/network/tests/ConnectTest.cpp
similarity index 100%
rename from src/client/modules/network/tests/ConnectTest.cpp
rename to src/games/openworld/client/modules/network/tests/ConnectTest.cpp
diff --git a/src/client/modules/voxel/CMakeLists.txt b/src/games/openworld/client/modules/voxel/CMakeLists.txt
similarity index 100%
rename from src/client/modules/voxel/CMakeLists.txt
rename to src/games/openworld/client/modules/voxel/CMakeLists.txt
diff --git a/src/client/modules/voxel/ClientPager.cpp b/src/games/openworld/client/modules/voxel/ClientPager.cpp
similarity index 100%
rename from src/client/modules/voxel/ClientPager.cpp
rename to src/games/openworld/client/modules/voxel/ClientPager.cpp
diff --git a/src/client/modules/voxel/ClientPager.h b/src/games/openworld/client/modules/voxel/ClientPager.h
similarity index 100%
rename from src/client/modules/voxel/ClientPager.h
rename to src/games/openworld/client/modules/voxel/ClientPager.h
diff --git a/src/server/CMakeLists.txt b/src/games/openworld/server/CMakeLists.txt
similarity index 100%
rename from src/server/CMakeLists.txt
rename to src/games/openworld/server/CMakeLists.txt
diff --git a/src/server/Dockerfile.in b/src/games/openworld/server/Dockerfile.in
similarity index 100%
rename from src/server/Dockerfile.in
rename to src/games/openworld/server/Dockerfile.in
diff --git a/src/server/Server.cpp b/src/games/openworld/server/Server.cpp
similarity index 100%
rename from src/server/Server.cpp
rename to src/games/openworld/server/Server.cpp
diff --git a/src/server/Server.h b/src/games/openworld/server/Server.h
similarity index 100%
rename from src/server/Server.h
rename to src/games/openworld/server/Server.h
diff --git a/src/server/deployment/postgres-config.yaml.in b/src/games/openworld/server/deployment/postgres-config.yaml.in
similarity index 100%
rename from src/server/deployment/postgres-config.yaml.in
rename to src/games/openworld/server/deployment/postgres-config.yaml.in
diff --git a/src/server/deployment/postgres-deployment.yaml.in b/src/games/openworld/server/deployment/postgres-deployment.yaml.in
similarity index 100%
rename from src/server/deployment/postgres-deployment.yaml.in
rename to src/games/openworld/server/deployment/postgres-deployment.yaml.in
diff --git a/src/server/deployment/postgres-secrets.yaml.in b/src/games/openworld/server/deployment/postgres-secrets.yaml.in
similarity index 100%
rename from src/server/deployment/postgres-secrets.yaml.in
rename to src/games/openworld/server/deployment/postgres-secrets.yaml.in
diff --git a/src/server/deployment/postgres-service.yaml.in b/src/games/openworld/server/deployment/postgres-service.yaml.in
similarity index 100%
rename from src/server/deployment/postgres-service.yaml.in
rename to src/games/openworld/server/deployment/postgres-service.yaml.in
diff --git a/src/server/deployment/postgres-storage.yaml.in b/src/games/openworld/server/deployment/postgres-storage.yaml.in
similarity index 100%
rename from src/server/deployment/postgres-storage.yaml.in
rename to src/games/openworld/server/deployment/postgres-storage.yaml.in
diff --git a/src/server/deployment/server-deployment.yaml.in b/src/games/openworld/server/deployment/server-deployment.yaml.in
similarity index 100%
rename from src/server/deployment/server-deployment.yaml.in
rename to src/games/openworld/server/deployment/server-deployment.yaml.in
diff --git a/src/server/deployment/server-ingress.yaml.in b/src/games/openworld/server/deployment/server-ingress.yaml.in
similarity index 100%
rename from src/server/deployment/server-ingress.yaml.in
rename to src/games/openworld/server/deployment/server-ingress.yaml.in
diff --git a/src/server/deployment/server-service.yaml.in b/src/games/openworld/server/deployment/server-service.yaml.in
similarity index 100%
rename from src/server/deployment/server-service.yaml.in
rename to src/games/openworld/server/deployment/server-service.yaml.in
diff --git a/src/server/docker-compose.yml.in b/src/games/openworld/server/docker-compose.yml.in
similarity index 100%
rename from src/server/docker-compose.yml.in
rename to src/games/openworld/server/docker-compose.yml.in
diff --git a/src/server/lua/ai/README.md b/src/games/openworld/server/lua/ai/README.md
similarity index 100%
rename from src/server/lua/ai/README.md
rename to src/games/openworld/server/lua/ai/README.md
diff --git a/src/server/lua/ai/animal-rabbit.lua b/src/games/openworld/server/lua/ai/animal-rabbit.lua
similarity index 100%
rename from src/server/lua/ai/animal-rabbit.lua
rename to src/games/openworld/server/lua/ai/animal-rabbit.lua
diff --git a/src/server/lua/ai/animal-wolf.lua b/src/games/openworld/server/lua/ai/animal-wolf.lua
similarity index 100%
rename from src/server/lua/ai/animal-wolf.lua
rename to src/games/openworld/server/lua/ai/animal-wolf.lua
diff --git a/src/server/lua/ai/dwarf-male-blacksmith.lua b/src/games/openworld/server/lua/ai/dwarf-male-blacksmith.lua
similarity index 100%
rename from src/server/lua/ai/dwarf-male-blacksmith.lua
rename to src/games/openworld/server/lua/ai/dwarf-male-blacksmith.lua
diff --git a/src/server/lua/ai/human-female-worker.lua b/src/games/openworld/server/lua/ai/human-female-worker.lua
similarity index 100%
rename from src/server/lua/ai/human-female-worker.lua
rename to src/games/openworld/server/lua/ai/human-female-worker.lua
diff --git a/src/server/lua/ai/human-male-blacksmith.lua b/src/games/openworld/server/lua/ai/human-male-blacksmith.lua
similarity index 100%
rename from src/server/lua/ai/human-male-blacksmith.lua
rename to src/games/openworld/server/lua/ai/human-male-blacksmith.lua
diff --git a/src/server/lua/ai/human-male-knight.lua b/src/games/openworld/server/lua/ai/human-male-knight.lua
similarity index 100%
rename from src/server/lua/ai/human-male-knight.lua
rename to src/games/openworld/server/lua/ai/human-male-knight.lua
diff --git a/src/server/lua/ai/human-male-shepherd.lua b/src/games/openworld/server/lua/ai/human-male-shepherd.lua
similarity index 100%
rename from src/server/lua/ai/human-male-shepherd.lua
rename to src/games/openworld/server/lua/ai/human-male-shepherd.lua
diff --git a/src/server/lua/ai/human-male-worker.lua b/src/games/openworld/server/lua/ai/human-male-worker.lua
similarity index 100%
rename from src/server/lua/ai/human-male-worker.lua
rename to src/games/openworld/server/lua/ai/human-male-worker.lua
diff --git a/src/server/lua/ai/shared.lua b/src/games/openworld/server/lua/ai/shared.lua
similarity index 100%
rename from src/server/lua/ai/shared.lua
rename to src/games/openworld/server/lua/ai/shared.lua
diff --git a/src/server/lua/ai/undead-male-skeleton.lua b/src/games/openworld/server/lua/ai/undead-male-skeleton.lua
similarity index 100%
rename from src/server/lua/ai/undead-male-skeleton.lua
rename to src/games/openworld/server/lua/ai/undead-male-skeleton.lua
diff --git a/src/server/lua/ai/undead-male-zombie.lua b/src/games/openworld/server/lua/ai/undead-male-zombie.lua
similarity index 100%
rename from src/server/lua/ai/undead-male-zombie.lua
rename to src/games/openworld/server/lua/ai/undead-male-zombie.lua
diff --git a/src/server/lua/attrib/animal-rabbit.lua b/src/games/openworld/server/lua/attrib/animal-rabbit.lua
similarity index 100%
rename from src/server/lua/attrib/animal-rabbit.lua
rename to src/games/openworld/server/lua/attrib/animal-rabbit.lua
diff --git a/src/server/lua/attrib/animal-wolf.lua b/src/games/openworld/server/lua/attrib/animal-wolf.lua
similarity index 100%
rename from src/server/lua/attrib/animal-wolf.lua
rename to src/games/openworld/server/lua/attrib/animal-wolf.lua
diff --git a/src/server/lua/attrib/dwarf-male-blacksmith.lua b/src/games/openworld/server/lua/attrib/dwarf-male-blacksmith.lua
similarity index 100%
rename from src/server/lua/attrib/dwarf-male-blacksmith.lua
rename to src/games/openworld/server/lua/attrib/dwarf-male-blacksmith.lua
diff --git a/src/server/lua/attrib/human-female-worker.lua b/src/games/openworld/server/lua/attrib/human-female-worker.lua
similarity index 100%
rename from src/server/lua/attrib/human-female-worker.lua
rename to src/games/openworld/server/lua/attrib/human-female-worker.lua
diff --git a/src/server/lua/attrib/human-male-blacksmith.lua b/src/games/openworld/server/lua/attrib/human-male-blacksmith.lua
similarity index 100%
rename from src/server/lua/attrib/human-male-blacksmith.lua
rename to src/games/openworld/server/lua/attrib/human-male-blacksmith.lua
diff --git a/src/server/lua/attrib/human-male-knight.lua b/src/games/openworld/server/lua/attrib/human-male-knight.lua
similarity index 100%
rename from src/server/lua/attrib/human-male-knight.lua
rename to src/games/openworld/server/lua/attrib/human-male-knight.lua
diff --git a/src/server/lua/attrib/human-male-shepherd.lua b/src/games/openworld/server/lua/attrib/human-male-shepherd.lua
similarity index 100%
rename from src/server/lua/attrib/human-male-shepherd.lua
rename to src/games/openworld/server/lua/attrib/human-male-shepherd.lua
diff --git a/src/server/lua/attrib/human-male-worker.lua b/src/games/openworld/server/lua/attrib/human-male-worker.lua
similarity index 100%
rename from src/server/lua/attrib/human-male-worker.lua
rename to src/games/openworld/server/lua/attrib/human-male-worker.lua
diff --git a/src/server/lua/attrib/shared.lua b/src/games/openworld/server/lua/attrib/shared.lua
similarity index 100%
rename from src/server/lua/attrib/shared.lua
rename to src/games/openworld/server/lua/attrib/shared.lua
diff --git a/src/server/lua/attrib/undead-male-skeleton.lua b/src/games/openworld/server/lua/attrib/undead-male-skeleton.lua
similarity index 100%
rename from src/server/lua/attrib/undead-male-skeleton.lua
rename to src/games/openworld/server/lua/attrib/undead-male-skeleton.lua
diff --git a/src/server/lua/attrib/undead-male-zombie.lua b/src/games/openworld/server/lua/attrib/undead-male-zombie.lua
similarity index 100%
rename from src/server/lua/attrib/undead-male-zombie.lua
rename to src/games/openworld/server/lua/attrib/undead-male-zombie.lua
diff --git a/src/server/lua/attributes.lua b/src/games/openworld/server/lua/attributes.lua
similarity index 100%
rename from src/server/lua/attributes.lua
rename to src/games/openworld/server/lua/attributes.lua
diff --git a/src/server/lua/behaviourtreenodes.lua b/src/games/openworld/server/lua/behaviourtreenodes.lua
similarity index 100%
rename from src/server/lua/behaviourtreenodes.lua
rename to src/games/openworld/server/lua/behaviourtreenodes.lua
diff --git a/src/server/lua/behaviourtrees.lua b/src/games/openworld/server/lua/behaviourtrees.lua
similarity index 100%
rename from src/server/lua/behaviourtrees.lua
rename to src/games/openworld/server/lua/behaviourtrees.lua
diff --git a/src/server/lua/event/generic.lua b/src/games/openworld/server/lua/event/generic.lua
similarity index 100%
rename from src/server/lua/event/generic.lua
rename to src/games/openworld/server/lua/event/generic.lua
diff --git a/src/server/lua/events.lua b/src/games/openworld/server/lua/events.lua
similarity index 100%
rename from src/server/lua/events.lua
rename to src/games/openworld/server/lua/events.lua
diff --git a/src/server/lua/map/map001.lua b/src/games/openworld/server/lua/map/map001.lua
similarity index 100%
rename from src/server/lua/map/map001.lua
rename to src/games/openworld/server/lua/map/map001.lua
diff --git a/src/server/lua/shared/entities.lua b/src/games/openworld/server/lua/shared/entities.lua
similarity index 100%
rename from src/server/lua/shared/entities.lua
rename to src/games/openworld/server/lua/shared/entities.lua
diff --git a/src/server/telegraf.conf b/src/games/openworld/server/telegraf.conf
similarity index 100%
rename from src/server/telegraf.conf
rename to src/games/openworld/server/telegraf.conf