diff --git a/common/server_arrow.cpp b/common/server/game/server_arrow.cpp
similarity index 100%
rename from common/server_arrow.cpp
rename to common/server/game/server_arrow.cpp
diff --git a/common/server_arrow.h b/common/server/game/server_arrow.h
similarity index 100%
rename from common/server_arrow.h
rename to common/server/game/server_arrow.h
diff --git a/common/server_arrowtarget.cpp b/common/server/game/server_arrowtarget.cpp
similarity index 100%
rename from common/server_arrowtarget.cpp
rename to common/server/game/server_arrowtarget.cpp
diff --git a/common/server_arrowtarget.h b/common/server/game/server_arrowtarget.h
similarity index 100%
rename from common/server_arrowtarget.h
rename to common/server/game/server_arrowtarget.h
diff --git a/common/server_card.cpp b/common/server/game/server_card.cpp
similarity index 100%
rename from common/server_card.cpp
rename to common/server/game/server_card.cpp
diff --git a/common/server_card.h b/common/server/game/server_card.h
similarity index 100%
rename from common/server_card.h
rename to common/server/game/server_card.h
diff --git a/common/server_cardzone.cpp b/common/server/game/server_cardzone.cpp
similarity index 100%
rename from common/server_cardzone.cpp
rename to common/server/game/server_cardzone.cpp
diff --git a/common/server_cardzone.h b/common/server/game/server_cardzone.h
similarity index 100%
rename from common/server_cardzone.h
rename to common/server/game/server_cardzone.h
diff --git a/common/server_counter.cpp b/common/server/game/server_counter.cpp
similarity index 100%
rename from common/server_counter.cpp
rename to common/server/game/server_counter.cpp
diff --git a/common/server_counter.h b/common/server/game/server_counter.h
similarity index 100%
rename from common/server_counter.h
rename to common/server/game/server_counter.h
diff --git a/common/server_game.cpp b/common/server/game/server_game.cpp
similarity index 100%
rename from common/server_game.cpp
rename to common/server/game/server_game.cpp
diff --git a/common/server_game.h b/common/server/game/server_game.h
similarity index 100%
rename from common/server_game.h
rename to common/server/game/server_game.h
diff --git a/common/server_player.cpp b/common/server/game/server_player.cpp
similarity index 100%
rename from common/server_player.cpp
rename to common/server/game/server_player.cpp
diff --git a/common/server_player.h b/common/server/game/server_player.h
similarity index 100%
rename from common/server_player.h
rename to common/server/game/server_player.h
diff --git a/common/server.cpp b/common/server/server.cpp
similarity index 100%
rename from common/server.cpp
rename to common/server/server.cpp
diff --git a/common/server.h b/common/server/server.h
similarity index 100%
rename from common/server.h
rename to common/server/server.h
diff --git a/common/server_abstractuserinterface.cpp b/common/server/server_abstractuserinterface.cpp
similarity index 100%
rename from common/server_abstractuserinterface.cpp
rename to common/server/server_abstractuserinterface.cpp
diff --git a/common/server_abstractuserinterface.h b/common/server/server_abstractuserinterface.h
similarity index 100%
rename from common/server_abstractuserinterface.h
rename to common/server/server_abstractuserinterface.h
diff --git a/common/server_database_interface.cpp b/common/server/server_database_interface.cpp
similarity index 100%
rename from common/server_database_interface.cpp
rename to common/server/server_database_interface.cpp
diff --git a/common/server_database_interface.h b/common/server/server_database_interface.h
similarity index 100%
rename from common/server_database_interface.h
rename to common/server/server_database_interface.h
diff --git a/common/server_player_reference.h b/common/server/server_player_reference.h
similarity index 100%
rename from common/server_player_reference.h
rename to common/server/server_player_reference.h
diff --git a/common/server_protocolhandler.cpp b/common/server/server_protocolhandler.cpp
similarity index 100%
rename from common/server_protocolhandler.cpp
rename to common/server/server_protocolhandler.cpp
diff --git a/common/server_protocolhandler.h b/common/server/server_protocolhandler.h
similarity index 100%
rename from common/server_protocolhandler.h
rename to common/server/server_protocolhandler.h
diff --git a/common/server_remoteuserinterface.cpp b/common/server/server_remoteuserinterface.cpp
similarity index 100%
rename from common/server_remoteuserinterface.cpp
rename to common/server/server_remoteuserinterface.cpp
diff --git a/common/server_remoteuserinterface.h b/common/server/server_remoteuserinterface.h
similarity index 100%
rename from common/server_remoteuserinterface.h
rename to common/server/server_remoteuserinterface.h
diff --git a/common/server_response_containers.cpp b/common/server/server_response_containers.cpp
similarity index 100%
rename from common/server_response_containers.cpp
rename to common/server/server_response_containers.cpp
diff --git a/common/server_response_containers.h b/common/server/server_response_containers.h
similarity index 100%
rename from common/server_response_containers.h
rename to common/server/server_response_containers.h
diff --git a/common/server_room.cpp b/common/server/server_room.cpp
similarity index 100%
rename from common/server_room.cpp
rename to common/server/server_room.cpp
diff --git a/common/server_room.h b/common/server/server_room.h
similarity index 100%
rename from common/server_room.h
rename to common/server/server_room.h