diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h
index acb2e5e04..65c870afb 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game/board/card_item.h
@@ -3,7 +3,7 @@
 
 #include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
-#include "server_card.h"
+#include "server/game/server_card.h"
 
 class CardDatabase;
 class CardDragItem;
diff --git a/cockatrice/src/server/local_server.cpp b/cockatrice/src/server/local_server.cpp
index c40247c72..74ee8601d 100644
--- a/cockatrice/src/server/local_server.cpp
+++ b/cockatrice/src/server/local_server.cpp
@@ -1,7 +1,7 @@
 #include "local_server.h"
 
 #include "local_server_interface.h"
-#include "server_room.h"
+#include "server/server_room.h"
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
 {
diff --git a/cockatrice/src/server/local_server.h b/cockatrice/src/server/local_server.h
index 5f7d480dc..93dbeb827 100644
--- a/cockatrice/src/server/local_server.h
+++ b/cockatrice/src/server/local_server.h
@@ -1,8 +1,8 @@
 #ifndef LOCALSERVER_H
 #define LOCALSERVER_H
 
-#include "server.h"
-#include "server_database_interface.h"
+#include "server/server.h"
+#include "server/server_database_interface.h"
 
 class LocalServerInterface;
 
diff --git a/cockatrice/src/server/local_server_interface.h b/cockatrice/src/server/local_server_interface.h
index 8e997ae30..ebfc49719 100644
--- a/cockatrice/src/server/local_server_interface.h
+++ b/cockatrice/src/server/local_server_interface.h
@@ -1,7 +1,7 @@
 #ifndef LOCALSERVERINTERFACE_H
 #define LOCALSERVERINTERFACE_H
 
-#include "server_protocolhandler.h"
+#include "server/server_protocolhandler.h"
 
 class LocalServer;
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 50d136f4f..15bb9697d 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -17,20 +17,20 @@ set(common_SOURCES
     passwordhasher.cpp
     rng_abstract.cpp
     rng_sfmt.cpp
-    server.cpp
-    server_abstractuserinterface.cpp
-    server_arrow.cpp
-    server_arrowtarget.h
-    server_card.cpp
-    server_cardzone.cpp
-    server_counter.cpp
-    server_database_interface.cpp
-    server_game.cpp
-    server_player.cpp
-    server_protocolhandler.cpp
-    server_remoteuserinterface.cpp
-    server_response_containers.cpp
-    server_room.cpp
+    server/game/server_arrow.cpp
+    server/game/server_arrowtarget.cpp
+    server/game/server_card.cpp
+    server/game/server_cardzone.cpp
+    server/game/server_counter.cpp
+    server/game/server_game.cpp
+    server/game/server_player.cpp
+    server/server.cpp
+    server/server_abstractuserinterface.cpp
+    server/server_database_interface.cpp
+    server/server_protocolhandler.cpp
+    server/server_remoteuserinterface.cpp
+    server/server_response_containers.cpp
+    server/server_room.cpp
     serverinfo_user_container.cpp
     sfmt/SFMT.c
 )
diff --git a/common/server/game/server_card.h b/common/server/game/server_card.h
index d96b9d056..a24be2046 100644
--- a/common/server/game/server_card.h
+++ b/common/server/game/server_card.h
@@ -20,7 +20,7 @@
 #ifndef SERVER_CARD_H
 #define SERVER_CARD_H
 
-#include "card_ref.h"
+#include "../../card_ref.h"
 #include "pb/card_attributes.pb.h"
 #include "pb/serverinfo_card.pb.h"
 #include "server_arrowtarget.h"
diff --git a/common/server/game/server_cardzone.cpp b/common/server/game/server_cardzone.cpp
index 88b61622f..52fda1e45 100644
--- a/common/server/game/server_cardzone.cpp
+++ b/common/server/game/server_cardzone.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "server_cardzone.h"
 
+#include "../rng_abstract.h"
 #include "pb/command_move_card.pb.h"
-#include "rng_abstract.h"
 #include "server_card.h"
 #include "server_player.h"
 
diff --git a/common/server/game/server_game.cpp b/common/server/game/server_game.cpp
index e129f9f76..dd4d00b08 100644
--- a/common/server/game/server_game.cpp
+++ b/common/server/game/server_game.cpp
@@ -19,7 +19,11 @@
  ***************************************************************************/
 #include "server_game.h"
 
-#include "deck_list.h"
+#include "../../deck_list.h"
+#include "../server.h"
+#include "../server_database_interface.h"
+#include "../server_protocolhandler.h"
+#include "../server_room.h"
 #include "pb/context_connection_state_changed.pb.h"
 #include "pb/context_deck_select.pb.h"
 #include "pb/context_ping_changed.pb.h"
@@ -37,14 +41,10 @@
 #include "pb/event_set_active_player.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/serverinfo_playerping.pb.h"
-#include "server.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
-#include "server_database_interface.h"
 #include "server_player.h"
-#include "server_protocolhandler.h"
-#include "server_room.h"
 
 #include <QDebug>
 #include <QTimer>
diff --git a/common/server/game/server_game.h b/common/server/game/server_game.h
index 226a14149..439ca1680 100644
--- a/common/server/game/server_game.h
+++ b/common/server/game/server_game.h
@@ -20,10 +20,10 @@
 #ifndef SERVERGAME_H
 #define SERVERGAME_H
 
+#include "../server_response_containers.h"
 #include "pb/event_leave.pb.h"
 #include "pb/response.pb.h"
 #include "pb/serverinfo_game.pb.h"
-#include "server_response_containers.h"
 
 #include <QDateTime>
 #include <QMap>
diff --git a/common/server/game/server_player.cpp b/common/server/game/server_player.cpp
index b49f3c0e7..039761753 100644
--- a/common/server/game/server_player.cpp
+++ b/common/server/game/server_player.cpp
@@ -1,9 +1,15 @@
 #include "server_player.h"
 
-#include "color.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-#include "get_pb_extension.h"
+#include "../../color.h"
+#include "../../deck_list.h"
+#include "../../deck_list_card_node.h"
+#include "../../get_pb_extension.h"
+#include "../../rng_abstract.h"
+#include "../../trice_limits.h"
+#include "../server.h"
+#include "../server_abstractuserinterface.h"
+#include "../server_database_interface.h"
+#include "../server_room.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -70,17 +76,11 @@
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
-#include "rng_abstract.h"
-#include "server.h"
-#include "server_abstractuserinterface.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_counter.h"
-#include "server_database_interface.h"
 #include "server_game.h"
-#include "server_room.h"
-#include "trice_limits.h"
 
 #include <QDebug>
 #include <QRegularExpression>
diff --git a/common/server/game/server_player.h b/common/server/game/server_player.h
index 45736957d..4a996fdaa 100644
--- a/common/server/game/server_player.h
+++ b/common/server/game/server_player.h
@@ -1,10 +1,10 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "../../serverinfo_user_container.h"
 #include "pb/card_attributes.pb.h"
 #include "pb/response.pb.h"
 #include "server_arrowtarget.h"
-#include "serverinfo_user_container.h"
 
 #include <QList>
 #include <QMap>
diff --git a/common/server/server.cpp b/common/server/server.cpp
index 4b0120ea1..ab40065f2 100644
--- a/common/server/server.cpp
+++ b/common/server/server.cpp
@@ -19,18 +19,17 @@
  ***************************************************************************/
 #include "server.h"
 
-#include "debug_pb_message.h"
-#include "featureset.h"
+#include "../debug_pb_message.h"
+#include "../featureset.h"
+#include "game/server_game.h"
+#include "game/server_player.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_list_rooms.pb.h"
 #include "pb/event_user_joined.pb.h"
 #include "pb/event_user_left.pb.h"
 #include "pb/isl_message.pb.h"
 #include "pb/session_event.pb.h"
-#include "server_counter.h"
 #include "server_database_interface.h"
-#include "server_game.h"
-#include "server_player.h"
 #include "server_protocolhandler.h"
 #include "server_remoteuserinterface.h"
 #include "server_room.h"
diff --git a/common/server/server_abstractuserinterface.cpp b/common/server/server_abstractuserinterface.cpp
index f40e64f8c..f06625f19 100644
--- a/common/server/server_abstractuserinterface.cpp
+++ b/common/server/server_abstractuserinterface.cpp
@@ -1,10 +1,10 @@
 #include "server_abstractuserinterface.h"
 
+#include "game/server_game.h"
+#include "game/server_player.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_game_state_changed.pb.h"
 #include "server.h"
-#include "server_game.h"
-#include "server_player.h"
 #include "server_player_reference.h"
 #include "server_response_containers.h"
 #include "server_room.h"
diff --git a/common/server/server_abstractuserinterface.h b/common/server/server_abstractuserinterface.h
index 763bcc567..c65d8a5c4 100644
--- a/common/server/server_abstractuserinterface.h
+++ b/common/server/server_abstractuserinterface.h
@@ -1,9 +1,9 @@
 #ifndef SERVER_ABSTRACTUSERINTERFACE
 #define SERVER_ABSTRACTUSERINTERFACE
 
+#include "../serverinfo_user_container.h"
 #include "pb/response.pb.h"
 #include "pb/server_message.pb.h"
-#include "serverinfo_user_container.h"
 
 #include <QMap>
 #include <QMutex>
diff --git a/common/server/server_protocolhandler.cpp b/common/server/server_protocolhandler.cpp
index 8fa3dc414..3f1592f5f 100644
--- a/common/server/server_protocolhandler.cpp
+++ b/common/server/server_protocolhandler.cpp
@@ -1,8 +1,11 @@
 #include "server_protocolhandler.h"
 
-#include "debug_pb_message.h"
-#include "featureset.h"
-#include "get_pb_extension.h"
+#include "../debug_pb_message.h"
+#include "../featureset.h"
+#include "../get_pb_extension.h"
+#include "../trice_limits.h"
+#include "game/server_game.h"
+#include "game/server_player.h"
 #include "pb/commands.pb.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_list_rooms.pb.h"
@@ -18,10 +21,7 @@
 #include "pb/response_login.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "server_database_interface.h"
-#include "server_game.h"
-#include "server_player.h"
 #include "server_room.h"
-#include "trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/common/server/server_response_containers.cpp b/common/server/server_response_containers.cpp
index 03ce4d853..9b07bdb91 100644
--- a/common/server/server_response_containers.cpp
+++ b/common/server/server_response_containers.cpp
@@ -1,6 +1,6 @@
 #include "server_response_containers.h"
 
-#include "server_game.h"
+#include "game/server_game.h"
 
 #include <google/protobuf/descriptor.h>
 
diff --git a/common/server/server_room.cpp b/common/server/server_room.cpp
index 654666edf..badb37642 100644
--- a/common/server/server_room.cpp
+++ b/common/server/server_room.cpp
@@ -1,5 +1,7 @@
 #include "server_room.h"
 
+#include "../trice_limits.h"
+#include "game/server_game.h"
 #include "pb/commands.pb.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
@@ -9,9 +11,7 @@
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_chat_message.pb.h"
 #include "pb/serverinfo_room.pb.h"
-#include "server_game.h"
 #include "server_protocolhandler.h"
-#include "trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/common/server/server_room.h b/common/server/server_room.h
index 7c804a461..7e256dc15 100644
--- a/common/server/server_room.h
+++ b/common/server/server_room.h
@@ -1,9 +1,9 @@
 #ifndef SERVER_ROOM_H
 #define SERVER_ROOM_H
 
+#include "../serverinfo_user_container.h"
 #include "pb/response.pb.h"
 #include "pb/serverinfo_chat_message.pb.h"
-#include "serverinfo_user_container.h"
 
 #include <QList>
 #include <QMap>
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 351c608c5..0c13bcd0f 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -14,9 +14,9 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/isl_message.pb.h"
+#include "server/server_protocolhandler.h"
+#include "server/server_room.h"
 #include "server_logger.h"
-#include "server_protocolhandler.h"
-#include "server_room.h"
 
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 99a8f7c41..e1288a627 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -29,8 +29,8 @@
 #include "pb/event_server_shutdown.pb.h"
 #include "servatrice_connection_pool.h"
 #include "servatrice_database_interface.h"
+#include "server/server_room.h"
 #include "server_logger.h"
-#include "server_room.h"
 #include "serversocketinterface.h"
 #include "settingscache.h"
 #include "smtpclient.h"
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 8dbaf492f..c68327c60 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -20,7 +20,7 @@
 #ifndef SERVATRICE_H
 #define SERVATRICE_H
 
-#include "server.h"
+#include "server/server.h"
 
 #include <QHostAddress>
 #include <QMetaType>
@@ -284,4 +284,4 @@ public:
     QList<ServerProperties> getServerList() const;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index e3846cdd4..9eb492953 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,8 +1,8 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
-#include "server.h"
-#include "server_database_interface.h"
+#include "server/server.h"
+#include "server/server_database_interface.h"
 
 #include <QChar>
 #include <QHash>
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 5f765574f..9b08ee330 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -65,10 +65,10 @@
 #include "pb/serverinfo_user.pb.h"
 #include "servatrice.h"
 #include "servatrice_database_interface.h"
+#include "server/game/server_player.h"
+#include "server/server_response_containers.h"
+#include "server/server_room.h"
 #include "server_logger.h"
-#include "server_player.h"
-#include "server_response_containers.h"
-#include "server_room.h"
 #include "settingscache.h"
 #include "trice_limits.h"
 #include "version_string.h"
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 54a852fd7..9f15e62b8 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,7 +20,7 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
-#include "server_protocolhandler.h"
+#include "server/server_protocolhandler.h"
 
 #include <QHostAddress>
 #include <QMutex>