diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 21b37a620..c8f5ddabf 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -270,7 +270,9 @@ set(cockatrice_SOURCES
     src/interface/utility/sequence_edit.cpp
 )
 
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card)
@@ -367,9 +369,9 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
 else()
-  target_link_libraries(cockatrice PUBLIC cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice PUBLIC cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
 endif()
 
 if(UNIX)
diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp
index 434ba2799..52c00f0c0 100644
--- a/cockatrice/src/client/tapped_out_interface.cpp
+++ b/cockatrice/src/client/tapped_out_interface.cpp
@@ -1,7 +1,7 @@
 #include "tapped_out_interface.h"
 
-#include "../../../libs/deck/deck_list.h"
-#include "../../../libs/deck/deck_list_card_node.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>
diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h
index c8202a037..a39a5b572 100644
--- a/cockatrice/src/client/tapped_out_interface.h
+++ b/cockatrice/src/client/tapped_out_interface.h
@@ -7,8 +7,8 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "../../../libs/deck/deck_list.h"
 #include "card/card_database/card_database.h"
+#include "deck_list/deck_list.h"
 
 #include <QLoggingCategory>
 #include <QObject>
diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h
index 4d8068f8b..a417d5058 100644
--- a/cockatrice/src/deck/deck_list_model.h
+++ b/cockatrice/src/deck/deck_list_model.h
@@ -1,10 +1,10 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "../../../libs/deck/abstract_deck_list_card_node.h"
-#include "../../../libs/deck/deck_list.h"
-#include "../../../libs/deck/deck_list_card_node.h"
 #include "card/card_printing/exact_card.h"
+#include "deck_list/abstract_deck_list_card_node.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 
 #include <QAbstractItemModel>
 #include <QList>
diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
index 2a677dfad..4b3c6cc16 100644
--- a/cockatrice/src/deck/deck_loader.cpp
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -1,10 +1,10 @@
 #include "deck_loader.h"
 
-#include "../../../libs/deck/deck_list.h"
-#include "../../../libs/deck/deck_list_card_node.h"
 #include "../main.h"
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h
index 797fee9e9..3617bfcb9 100644
--- a/cockatrice/src/deck/deck_loader.h
+++ b/cockatrice/src/deck/deck_loader.h
@@ -7,7 +7,7 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "../../../libs/deck/deck_list.h"
+#include "deck_list/deck_list.h"
 
 #include <QLoggingCategory>
 
diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp
index 24492f0eb..3bd6961e1 100644
--- a/cockatrice/src/deck/deck_stats_interface.cpp
+++ b/cockatrice/src/deck/deck_stats_interface.cpp
@@ -1,7 +1,7 @@
 #include "deck_stats_interface.h"
 
-#include "../../../libs/deck/deck_list.h"
-#include "../../../libs/deck/deck_list_card_node.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>
diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h
index 5cbd87f96..bad7394a4 100644
--- a/cockatrice/src/deck/deck_stats_interface.h
+++ b/cockatrice/src/deck/deck_stats_interface.h
@@ -7,8 +7,8 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "../../../libs/deck/deck_list.h"
 #include "card/card_database/card_database.h"
+#include "deck_list/deck_list.h"
 
 #include <QObject>
 
diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
index b32ce6569..3a6fb1fee 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -6,11 +6,11 @@
 #include "../zones/card_zone.h"
 #include "card/card_info.h"
 #include "card_item.h"
-#include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_create_arrow.pb.h"
 #include "pb/command_delete_arrow.pb.h"
 #include "settings/cache_settings.h"
+#include "utility/color.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp
index e6c4a6daf..f03b9625b 100644
--- a/cockatrice/src/game/deckview/deck_view.cpp
+++ b/cockatrice/src/game/deckview/deck_view.cpp
@@ -1,9 +1,9 @@
 #include "deck_view.h"
 
-#include "../../../../libs/deck/deck_list.h"
-#include "../../../../libs/deck/deck_list_card_node.h"
 #include "../../interface/theme_manager.h"
 #include "card/card_info.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 #include "settings/cache_settings.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
index 55feb28da..694d5dead 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -1,13 +1,13 @@
 #include "dlg_create_token.h"
 
-#include "../../../../libs/deck/deck_list.h"
-#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
 #include "card/card_database/card_database_manager.h"
 #include "card/card_database/model/card_database_model.h"
 #include "card/card_database/model/token/token_display_model.h"
+#include "deck_list/deck_list.h"
 #include "settings/cache_settings.h"
+#include "utility/trice_limits.h"
 
 #include <QCheckBox>
 #include <QCloseEvent>
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index a75bb2ed4..0baf30482 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,6 +1,6 @@
 #include "game_event_handler.h"
 
-#include "../../../libs/server/get_pb_extension.h"
+#include "../../../libs/server/include/server/get_pb_extension.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../tabs/tab_game.h"
diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h
index 724b57231..be751883a 100644
--- a/cockatrice/src/game/log/message_log_widget.h
+++ b/cockatrice/src/game/log/message_log_widget.h
@@ -7,7 +7,7 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
-#include "../../../../libs/server/include/user_level.h"
+#include "../../../../libs/server/include/server/user_level.h"
 #include "../../client/translation.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index b7faa0868..375759e6f 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -12,7 +12,6 @@
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
-#include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_set_card_counter.pb.h"
 #include "pb/event_create_arrow.pb.h"
@@ -22,6 +21,7 @@
 #include "pb/serverinfo_user.pb.h"
 #include "pb/serverinfo_zone.pb.h"
 #include "player_target.h"
+#include "utility/color.h"
 
 #include <QDebug>
 #include <QMenu>
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 4002227de..7c871e829 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -7,7 +7,7 @@
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
-#include "../../../libs/server/include/user_level.h"
+#include "server/user_level.h"
 
 #include <QIcon>
 #include <QLoggingCategory>
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
index 55ead69d8..1df7f2f11 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -13,11 +13,11 @@
 #include "mana_curve_widget.h"
 #include "mana_devotion_widget.h"
 
-#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <deck_list/deck_list.h>
 
 class DeckAnalyticsWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
index 6c0380b81..280a7753d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
@@ -6,9 +6,9 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
-#include <../../../../../libs/deck/deck_list.h>
 #include <QHash>
 #include <QRegularExpression>
+#include <deck_list/deck_list.h>
 
 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
     : QWidget(parent), deckListModel(_deckListModel)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
index d5b4c38bf..28b693bd1 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
@@ -10,9 +10,9 @@
 #include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
-#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QWidget>
+#include <deck_list/deck_list.h>
 #include <utility>
 
 class ManaBaseWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
index 3615a6be0..42bc0b22a 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
@@ -7,7 +7,7 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
-#include <../../../../../libs/deck/deck_list.h>
+#include <deck_list/deck_list.h>
 #include <unordered_map>
 
 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
index a92e16963..75d767d4a 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@@ -7,7 +7,7 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
-#include <../../../../../libs/deck/deck_list.h>
+#include <deck_list/deck_list.h>
 #include <iostream>
 #include <regex>
 #include <string>
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
index 61f157b3b..b59f0a6d4 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
@@ -10,9 +10,9 @@
 #include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
-#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QWidget>
+#include <deck_list/deck_list.h>
 #include <utility>
 
 class ManaDevotionWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 0d805fbb8..4f1cf893b 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -3,13 +3,13 @@
 #include "card/card_database/card_database_manager.h"
 #include "settings/cache_settings.h"
 
-#include <../../../../../libs/utility/include/utility/trice_limits.h>
 #include <QComboBox>
 #include <QDockWidget>
 #include <QHeaderView>
 #include <QLabel>
 #include <QSplitter>
 #include <QTextEdit>
+#include <utility/trice_limits.h>
 
 DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/server/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp
index dd6ea3cda..6fab1cd70 100644
--- a/cockatrice/src/server/abstract_client.cpp
+++ b/cockatrice/src/server/abstract_client.cpp
@@ -1,6 +1,6 @@
 #include "abstract_client.h"
 
-#include "../../../libs/server/get_pb_extension.h"
+#include "../../../libs/server/include/server/get_pb_extension.h"
 #include "../../../libs/utility/include/utility/featureset.h"
 #include "pb/commands.pb.h"
 #include "pb/event_add_to_list.pb.h"
diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
index e0d55c1ff..1d7f610f3 100644
--- a/cockatrice/src/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -1,6 +1,6 @@
 #include "chat_view.h"
 
-#include "../../../../libs/server/include/user_level.h"
+#include "../../../../libs/server/include/server/user_level.h"
 #include "../../client/sound_engine.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h
index abd91ae4c..c7c1515ce 100644
--- a/cockatrice/src/server/chat_view/chat_view.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -8,8 +8,8 @@
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "../../../../libs/server/include/room_message_type.h"
-#include "../../../../libs/server/include/user_level.h"
+#include "../../../../libs/server/include/server/room_message_type.h"
+#include "../../../../libs/server/include/server/user_level.h"
 #include "../../tabs/tab_supervisor.h"
 #include "../user/user_list_widget.h"
 
diff --git a/cockatrice/src/server/local_client.cpp b/cockatrice/src/server/local_client.cpp
index d6f9d9bb2..2270cac63 100644
--- a/cockatrice/src/server/local_client.cpp
+++ b/cockatrice/src/server/local_client.cpp
@@ -1,6 +1,6 @@
 #include "local_client.h"
 
-#include "../../../libs/server/debug_pb_message.h"
+#include "../../../libs/server/include/server/debug_pb_message.h"
 #include "local_server_interface.h"
 #include "pb/session_commands.pb.h"
 
diff --git a/cockatrice/src/server/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp
index ed6026050..114efe3d4 100644
--- a/cockatrice/src/server/remote/remote_client.cpp
+++ b/cockatrice/src/server/remote/remote_client.cpp
@@ -1,7 +1,5 @@
 #include "remote_client.h"
 
-#include "../../../../libs/server/debug_pb_message.h"
-#include "../../../../libs/utility/passwordhasher.h"
 #include "../../main.h"
 #include "../pending_command.h"
 #include "pb/event_server_identification.pb.h"
@@ -12,7 +10,9 @@
 #include "pb/response_register.pb.h"
 #include "pb/server_message.pb.h"
 #include "pb/session_commands.pb.h"
+#include "server/debug_pb_message.h"
 #include "settings/cache_settings.h"
+#include "utility/passwordhasher.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h
index 2516df9ce..8b3f53890 100644
--- a/cockatrice/src/server/user/user_context_menu.h
+++ b/cockatrice/src/server/user/user_context_menu.h
@@ -7,7 +7,7 @@
 #ifndef USER_CONTEXT_MENU_H
 #define USER_CONTEXT_MENU_H
 
-#include "../../../../libs/server/include/user_level.h"
+#include "../../../../libs/server/include/server/user_level.h"
 
 #include <QObject>
 
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index 96d7d048f..a650714aa 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,6 +1,5 @@
 #include "user_info_box.h"
 
-#include "../../../../libs/utility/passwordhasher.h"
 #include "../../client/get_text_with_max.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
@@ -11,6 +10,7 @@
 #include "pb/response_get_user_info.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"
+#include "utility/passwordhasher.h"
 
 #include <QDateTime>
 #include <QGridLayout>
diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h
index 5fce9b782..a3be08ec3 100644
--- a/cockatrice/src/server/user/user_list_widget.h
+++ b/cockatrice/src/server/user/user_list_widget.h
@@ -7,7 +7,7 @@
 #ifndef USERLIST_H
 #define USERLIST_H
 
-#include "../../../../libs/server/include/user_level.h"
+#include "../../../../libs/server/include/server/user_level.h"
 #include "pb/moderator_commands.pb.h"
 
 #include <QComboBox>
diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp
index 0b6311748..4f0643b21 100644
--- a/cockatrice/src/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/tabs/tab_deck_storage.cpp
@@ -1,10 +1,10 @@
 #include "tab_deck_storage.h"
 
-#include "../../../libs/deck/deck_list.h"
 #include "../client/get_text_with_max.h"
 #include "../deck/deck_loader.h"
 #include "../server/pending_command.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
+#include "deck_list/deck_list.h"
 #include "pb/command_deck_del.pb.h"
 #include "pb/command_deck_del_dir.pb.h"
 #include "pb/command_deck_download.pb.h"
diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp
index 3ae857e38..66f3ed960 100644
--- a/cockatrice/src/tabs/tab_room.cpp
+++ b/cockatrice/src/tabs/tab_room.cpp
@@ -1,6 +1,6 @@
 #include "tab_room.h"
 
-#include "../../../libs/server/get_pb_extension.h"
+#include "../../../libs/server/include/server/get_pb_extension.h"
 #include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../dialogs/dlg_settings.h"
 #include "../main.h"
diff --git a/libs/deck_list/CMakeLists.txt b/libs/deck_list/CMakeLists.txt
index 95f7134d6..21a2dc88e 100644
--- a/libs/deck_list/CMakeLists.txt
+++ b/libs/deck_list/CMakeLists.txt
@@ -16,7 +16,7 @@ elseif (Qt5_FOUND)
     qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
 endif ()
 
-qt_add_library(cardlib STATIC
+qt_add_library(cockatrice_deck_list STATIC
     src/abstract_deck_list_card_node.cpp
     src/abstract_deck_list_node.cpp
     src/deck_list.cpp
@@ -25,12 +25,11 @@ qt_add_library(cardlib STATIC
     ${MOC_SOURCES}
 )
 
-target_include_directories(deck_list
+target_include_directories(cockatrice_deck_list
     PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
 )
 
-target_link_libraries(deck_list
-    utility
-    PUBLIC ${COCKATRICE_QT_MODULES}
+target_link_libraries(cockatrice_deck_list
+    PUBLIC utility ${COCKATRICE_QT_MODULES}
 )
diff --git a/libs/pb/CMakeLists.txt b/libs/pb/CMakeLists.txt
index dc48823fd..783dca19c 100644
--- a/libs/pb/CMakeLists.txt
+++ b/libs/pb/CMakeLists.txt
@@ -190,8 +190,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
 else()
   add_library(cockatrice_protocol ${PROTO_FILES})
   target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf)
-  set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-  target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
+  set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb")
+  target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
   protobuf_generate(
     TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"
diff --git a/libs/rng/CMakeLists.txt b/libs/rng/CMakeLists.txt
index 130cd1e07..00d68994e 100644
--- a/libs/rng/CMakeLists.txt
+++ b/libs/rng/CMakeLists.txt
@@ -24,4 +24,7 @@ add_library(cockatrice_rng STATIC
 target_include_directories(cockatrice_rng
     PUBLIC include
     PUBLIC include/sfmt
+)
+
+target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}
 )
\ No newline at end of file
diff --git a/libs/server/CMakeLists.txt b/libs/server/CMakeLists.txt
index e136aef90..95efaeeb0 100644
--- a/libs/server/CMakeLists.txt
+++ b/libs/server/CMakeLists.txt
@@ -3,23 +3,25 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    include/game/server_abstract_participant.h
-    include/game/server_arrow.h
-    include/game/server_arrowtarget.h
-    include/game/server_card.h
-    include/game/server_cardzone.h
-    include/game/server_counter.h
-    include/game/server_game.h
-    include/game/server_player.h
-    include/game/server_spectator.h
-    include/server.h
-    include/server_abstractuserinterface.h
-    include/server_database_interface.h
-    include/server_protocolhandler.h
-    include/server_remoteuserinterface.h
-    include/server_response_containers.h
-    include/server_room.h
-    include/serverinfo_user_container.h
+    include/server/game/server_abstract_participant.h
+    include/server/game/server_arrow.h
+    include/server/game/server_arrowtarget.h
+    include/server/game/server_card.h
+    include/server/game/server_cardzone.h
+    include/server/game/server_counter.h
+    include/server/game/server_game.h
+    include/server/game/server_player.h
+    include/server/game/server_spectator.h
+    include/server/debug_pb_message.h
+    include/server/get_pb_extension.h
+    include/server/server.h
+    include/server/server_abstractuserinterface.h
+    include/server/server_database_interface.h
+    include/server/server_protocolhandler.h
+    include/server/server_remoteuserinterface.h
+    include/server/server_response_containers.h
+    include/server/server_room.h
+    include/server/serverinfo_user_container.h
 )
 
 if (Qt6_FOUND)
@@ -38,6 +40,8 @@ add_library(serverlib STATIC
     src/game/server_game.cpp
     src/game/server_player.cpp
     src/game/server_spectator.cpp
+    src/debug_pb_message.cpp
+    src/get_pb_extension.cpp
     src/server.cpp
     src/server_abstractuserinterface.cpp
     src/server_database_interface.cpp
@@ -54,9 +58,10 @@ target_include_directories(serverlib
     PUBLIC ${CMAKE_SOURCE_DIR}/common
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility
+    PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
 )
 
 # Make serverlib depend on cockatrice_protocol
 target_link_libraries(serverlib
-    PUBLIC cockatrice_common cockatrice_protocol utility ${COCKATRICE_QT_MODULES}
+    PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES}
 )
\ No newline at end of file
diff --git a/libs/server/debug_pb_message.h b/libs/server/include/server/debug_pb_message.h
similarity index 100%
rename from libs/server/debug_pb_message.h
rename to libs/server/include/server/debug_pb_message.h
diff --git a/libs/server/include/game/server_abstract_participant.h b/libs/server/include/server/game/server_abstract_participant.h
similarity index 100%
rename from libs/server/include/game/server_abstract_participant.h
rename to libs/server/include/server/game/server_abstract_participant.h
diff --git a/libs/server/include/game/server_arrow.h b/libs/server/include/server/game/server_arrow.h
similarity index 100%
rename from libs/server/include/game/server_arrow.h
rename to libs/server/include/server/game/server_arrow.h
diff --git a/libs/server/include/game/server_arrowtarget.h b/libs/server/include/server/game/server_arrowtarget.h
similarity index 100%
rename from libs/server/include/game/server_arrowtarget.h
rename to libs/server/include/server/game/server_arrowtarget.h
diff --git a/libs/server/include/game/server_card.h b/libs/server/include/server/game/server_card.h
similarity index 100%
rename from libs/server/include/game/server_card.h
rename to libs/server/include/server/game/server_card.h
diff --git a/libs/server/include/game/server_cardzone.h b/libs/server/include/server/game/server_cardzone.h
similarity index 100%
rename from libs/server/include/game/server_cardzone.h
rename to libs/server/include/server/game/server_cardzone.h
diff --git a/libs/server/include/game/server_counter.h b/libs/server/include/server/game/server_counter.h
similarity index 100%
rename from libs/server/include/game/server_counter.h
rename to libs/server/include/server/game/server_counter.h
diff --git a/libs/server/include/game/server_game.h b/libs/server/include/server/game/server_game.h
similarity index 100%
rename from libs/server/include/game/server_game.h
rename to libs/server/include/server/game/server_game.h
diff --git a/libs/server/include/game/server_player.h b/libs/server/include/server/game/server_player.h
similarity index 100%
rename from libs/server/include/game/server_player.h
rename to libs/server/include/server/game/server_player.h
diff --git a/libs/server/include/game/server_spectator.h b/libs/server/include/server/game/server_spectator.h
similarity index 100%
rename from libs/server/include/game/server_spectator.h
rename to libs/server/include/server/game/server_spectator.h
diff --git a/libs/server/get_pb_extension.h b/libs/server/include/server/get_pb_extension.h
similarity index 100%
rename from libs/server/get_pb_extension.h
rename to libs/server/include/server/get_pb_extension.h
diff --git a/libs/server/include/room_message_type.h b/libs/server/include/server/room_message_type.h
similarity index 100%
rename from libs/server/include/room_message_type.h
rename to libs/server/include/server/room_message_type.h
diff --git a/libs/server/include/server.h b/libs/server/include/server/server.h
similarity index 100%
rename from libs/server/include/server.h
rename to libs/server/include/server/server.h
diff --git a/libs/server/include/server_abstractuserinterface.h b/libs/server/include/server/server_abstractuserinterface.h
similarity index 100%
rename from libs/server/include/server_abstractuserinterface.h
rename to libs/server/include/server/server_abstractuserinterface.h
diff --git a/libs/server/include/server_database_interface.h b/libs/server/include/server/server_database_interface.h
similarity index 100%
rename from libs/server/include/server_database_interface.h
rename to libs/server/include/server/server_database_interface.h
diff --git a/libs/server/include/server_player_reference.h b/libs/server/include/server/server_player_reference.h
similarity index 100%
rename from libs/server/include/server_player_reference.h
rename to libs/server/include/server/server_player_reference.h
diff --git a/libs/server/include/server_protocolhandler.h b/libs/server/include/server/server_protocolhandler.h
similarity index 100%
rename from libs/server/include/server_protocolhandler.h
rename to libs/server/include/server/server_protocolhandler.h
diff --git a/libs/server/include/server_remoteuserinterface.h b/libs/server/include/server/server_remoteuserinterface.h
similarity index 100%
rename from libs/server/include/server_remoteuserinterface.h
rename to libs/server/include/server/server_remoteuserinterface.h
diff --git a/libs/server/include/server_response_containers.h b/libs/server/include/server/server_response_containers.h
similarity index 100%
rename from libs/server/include/server_response_containers.h
rename to libs/server/include/server/server_response_containers.h
diff --git a/libs/server/include/server_room.h b/libs/server/include/server/server_room.h
similarity index 98%
rename from libs/server/include/server_room.h
rename to libs/server/include/server/server_room.h
index 7e256dc15..7c804a461 100644
--- a/libs/server/include/server_room.h
+++ b/libs/server/include/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/libs/server/include/serverinfo_user_container.h b/libs/server/include/server/serverinfo_user_container.h
similarity index 100%
rename from libs/server/include/serverinfo_user_container.h
rename to libs/server/include/server/serverinfo_user_container.h
diff --git a/libs/server/include/user_level.h b/libs/server/include/server/user_level.h
similarity index 100%
rename from libs/server/include/user_level.h
rename to libs/server/include/server/user_level.h
diff --git a/libs/server/debug_pb_message.cpp b/libs/server/src/debug_pb_message.cpp
similarity index 97%
rename from libs/server/debug_pb_message.cpp
rename to libs/server/src/debug_pb_message.cpp
index deaaacde1..1ea14415f 100644
--- a/libs/server/debug_pb_message.cpp
+++ b/libs/server/src/debug_pb_message.cpp
@@ -1,6 +1,6 @@
-#include "../../common/debug_pb_message.h"
+#include "../include/server/debug_pb_message.h"
 
-#include "../utility/include/utility/trice_limits.h"
+#include "utility/trice_limits.h"
 
 #include <QList>
 #include <QString>
diff --git a/libs/server/src/game/server_abstract_participant.cpp b/libs/server/src/game/server_abstract_participant.cpp
index 7f46f0471..1aaf9f3c9 100644
--- a/libs/server/src/game/server_abstract_participant.cpp
+++ b/libs/server/src/game/server_abstract_participant.cpp
@@ -1,21 +1,18 @@
-#include "../../include/game/server_abstract_participant.h"
+#include "../../include/server/game/server_abstract_participant.h"
 
-#include "../../color.h"
-#include "../../deck_list.h"
-#include "../../deck_list_card_node.h"
-#include "../../game/server_arrow.h"
-#include "../../game/server_counter.h"
-#include "../../get_pb_extension.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_game.h"
-#include "../../include/game/server_player.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 "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_counter.h"
+#include "../../include/server/game/server_game.h"
+#include "../../include/server/game/server_player.h"
+#include "../../include/server/get_pb_extension.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_room.h"
+#include "../include/server/server_abstractuserinterface.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -82,6 +79,9 @@
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "rng/rng_abstract.h"
+#include "utility/color.h"
+#include "utility/trice_limits.h"
 
 #include <QDebug>
 #include <QRegularExpression>
diff --git a/libs/server/src/game/server_arrow.cpp b/libs/server/src/game/server_arrow.cpp
index 6885ec068..7b82976e5 100644
--- a/libs/server/src/game/server_arrow.cpp
+++ b/libs/server/src/game/server_arrow.cpp
@@ -1,8 +1,8 @@
-#include "../../include/game/server_arrow.h"
+#include "../../include/server/game/server_arrow.h"
 
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/serverinfo_arrow.pb.h"
 
 Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor)
diff --git a/libs/server/src/game/server_arrowtarget.cpp b/libs/server/src/game/server_arrowtarget.cpp
index c8724f7dd..47af6d338 100644
--- a/libs/server/src/game/server_arrowtarget.cpp
+++ b/libs/server/src/game/server_arrowtarget.cpp
@@ -1,2 +1,2 @@
 
-#include "../../include/game/server_arrowtarget.h"
+#include "../../include/server/game/server_arrowtarget.h"
diff --git a/libs/server/src/game/server_card.cpp b/libs/server/src/game/server_card.cpp
index 455f37ebc..d050c399e 100644
--- a/libs/server/src/game/server_card.cpp
+++ b/libs/server/src/game/server_card.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_card.h"
+#include "../../include/server/game/server_card.h"
 
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/event_set_card_attr.pb.h"
 #include "pb/event_set_card_counter.pb.h"
 #include "pb/serverinfo_card.pb.h"
diff --git a/libs/server/src/game/server_cardzone.cpp b/libs/server/src/game/server_cardzone.cpp
index 734f9f0f9..f2f7a275a 100644
--- a/libs/server/src/game/server_cardzone.cpp
+++ b/libs/server/src/game/server_cardzone.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_cardzone.h"
+#include "../../include/server/game/server_cardzone.h"
 
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_player.h"
-#include "../rng_abstract.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/command_move_card.pb.h"
+#include "rng/rng_abstract.h"
 
 #include <QDebug>
 #include <QSet>
diff --git a/libs/server/src/game/server_counter.cpp b/libs/server/src/game/server_counter.cpp
index f348c0ed0..621c63c8a 100644
--- a/libs/server/src/game/server_counter.cpp
+++ b/libs/server/src/game/server_counter.cpp
@@ -1,4 +1,4 @@
-#include "../../include/game/server_counter.h"
+#include "../../include/server/game/server_counter.h"
 
 #include "pb/serverinfo_counter.pb.h"
 
diff --git a/libs/server/src/game/server_game.cpp b/libs/server/src/game/server_game.cpp
index 2b63b18da..5e4f4c63b 100644
--- a/libs/server/src/game/server_game.cpp
+++ b/libs/server/src/game/server_game.cpp
@@ -17,18 +17,18 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_game.h"
+#include "../../include/server/game/server_game.h"
 
-#include "../../deck_list.h"
-#include "../../include/game/server_arrow.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
-#include "../../include/game/server_spectator.h"
-#include "../server.h"
-#include "../server_database_interface.h"
-#include "../server_protocolhandler.h"
-#include "../server_room.h"
+#include "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
+#include "../../include/server/game/server_spectator.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_protocolhandler.h"
+#include "../../include/server/server_room.h"
+#include "deck_list/deck_list.h"
 #include "pb/context_connection_state_changed.pb.h"
 #include "pb/context_deck_select.pb.h"
 #include "pb/context_ping_changed.pb.h"
diff --git a/libs/server/src/game/server_player.cpp b/libs/server/src/game/server_player.cpp
index 484fe240f..706526c19 100644
--- a/libs/server/src/game/server_player.cpp
+++ b/libs/server/src/game/server_player.cpp
@@ -1,20 +1,17 @@
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_player.h"
 
-#include "../../color.h"
-#include "../../deck_list.h"
-#include "../../deck_list_card_node.h"
-#include "../../get_pb_extension.h"
-#include "../../include/game/server_arrow.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_counter.h"
-#include "../../include/game/server_game.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 "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_counter.h"
+#include "../../include/server/game/server_game.h"
+#include "../../include/server/get_pb_extension.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_room.h"
+#include "../include/server/server_abstractuserinterface.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -81,6 +78,9 @@
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "rng/rng_abstract.h"
+#include "utility/color.h"
+#include "utility/trice_limits.h"
 
 #include <QDebug>
 #include <QRegularExpression>
diff --git a/libs/server/src/game/server_spectator.cpp b/libs/server/src/game/server_spectator.cpp
index 773244bdf..57ba8de05 100644
--- a/libs/server/src/game/server_spectator.cpp
+++ b/libs/server/src/game/server_spectator.cpp
@@ -1,4 +1,4 @@
-#include "../../include/game/server_spectator.h"
+#include "../../include/server/game/server_spectator.h"
 
 Server_Spectator::Server_Spectator(Server_Game *_game,
                                    int _playerId,
diff --git a/libs/server/get_pb_extension.cpp b/libs/server/src/get_pb_extension.cpp
similarity index 90%
rename from libs/server/get_pb_extension.cpp
rename to libs/server/src/get_pb_extension.cpp
index d6235858a..9980186a7 100644
--- a/libs/server/get_pb_extension.cpp
+++ b/libs/server/src/get_pb_extension.cpp
@@ -1,4 +1,4 @@
-#include "get_pb_extension.h"
+#include "../include/server/get_pb_extension.h"
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
diff --git a/libs/server/src/server.cpp b/libs/server/src/server.cpp
index 4cdf08cf5..d36c4f13c 100644
--- a/libs/server/src/server.cpp
+++ b/libs/server/src/server.cpp
@@ -17,22 +17,22 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../include/server.h"
+#include "../include/server/server.h"
 
-#include "../debug_pb_message.h"
-#include "../featureset.h"
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server_database_interface.h"
-#include "../include/server_protocolhandler.h"
-#include "../include/server_remoteuserinterface.h"
-#include "../include/server_room.h"
+#include "../include/server/debug_pb_message.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/server_database_interface.h"
+#include "../include/server/server_protocolhandler.h"
+#include "../include/server/server_remoteuserinterface.h"
+#include "../include/server/server_room.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 "utility/featureset.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/libs/server/src/server_abstractuserinterface.cpp b/libs/server/src/server_abstractuserinterface.cpp
index 33c7903a5..4c0ed9c68 100644
--- a/libs/server/src/server_abstractuserinterface.cpp
+++ b/libs/server/src/server_abstractuserinterface.cpp
@@ -1,11 +1,11 @@
-#include "../include/server_abstractuserinterface.h"
+#include "../include/server/server_abstractuserinterface.h"
 
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server.h"
-#include "../include/server_player_reference.h"
-#include "../include/server_response_containers.h"
-#include "../include/server_room.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/server.h"
+#include "../include/server/server_player_reference.h"
+#include "../include/server/server_response_containers.h"
+#include "../include/server/server_room.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_game_state_changed.pb.h"
 
diff --git a/libs/server/src/server_database_interface.cpp b/libs/server/src/server_database_interface.cpp
index 9720ff9dd..97ce1c710 100644
--- a/libs/server/src/server_database_interface.cpp
+++ b/libs/server/src/server_database_interface.cpp
@@ -1,2 +1,2 @@
 
-#include "../include/server_database_interface.h"
+#include "../include/server/server_database_interface.h"
diff --git a/libs/server/src/server_protocolhandler.cpp b/libs/server/src/server_protocolhandler.cpp
index a29d62654..a9856b355 100644
--- a/libs/server/src/server_protocolhandler.cpp
+++ b/libs/server/src/server_protocolhandler.cpp
@@ -1,13 +1,11 @@
-#include "../include/server_protocolhandler.h"
+#include "../include/server/server_protocolhandler.h"
 
-#include "../debug_pb_message.h"
-#include "../featureset.h"
-#include "../get_pb_extension.h"
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server_database_interface.h"
-#include "../include/server_room.h"
-#include "../trice_limits.h"
+#include "../include/server/debug_pb_message.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/get_pb_extension.h"
+#include "../include/server/server_database_interface.h"
+#include "../include/server/server_room.h"
 #include "pb/commands.pb.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_list_rooms.pb.h"
@@ -22,6 +20,8 @@
 #include "pb/response_list_users.pb.h"
 #include "pb/response_login.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "utility/featureset.h"
+#include "utility/trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/libs/server/src/server_remoteuserinterface.cpp b/libs/server/src/server_remoteuserinterface.cpp
index e5b9b7e2c..fb75d89df 100644
--- a/libs/server/src/server_remoteuserinterface.cpp
+++ b/libs/server/src/server_remoteuserinterface.cpp
@@ -1,6 +1,6 @@
-#include "../include/server_remoteuserinterface.h"
+#include "../include/server/server_remoteuserinterface.h"
 
-#include "../include/server.h"
+#include "../include/server/server.h"
 #include "pb/serverinfo_user.pb.h"
 
 void Server_RemoteUserInterface::sendProtocolItem(const Response &item)
diff --git a/libs/server/src/server_response_containers.cpp b/libs/server/src/server_response_containers.cpp
index 9156d64e4..fe76c814a 100644
--- a/libs/server/src/server_response_containers.cpp
+++ b/libs/server/src/server_response_containers.cpp
@@ -1,6 +1,6 @@
-#include "../include/server_response_containers.h"
+#include "../include/server/server_response_containers.h"
 
-#include "../include/game/server_game.h"
+#include "../include/server/game/server_game.h"
 
 #include <google/protobuf/descriptor.h>
 
diff --git a/libs/server/src/server_room.cpp b/libs/server/src/server_room.cpp
index f3cc990f9..e015a9a01 100644
--- a/libs/server/src/server_room.cpp
+++ b/libs/server/src/server_room.cpp
@@ -1,8 +1,7 @@
-#include "../include/server_room.h"
+#include "../include/server/server_room.h"
 
-#include "../include/game/server_game.h"
-#include "../include/server_protocolhandler.h"
-#include "../trice_limits.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/server_protocolhandler.h"
 #include "pb/commands.pb.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
@@ -12,6 +11,7 @@
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_chat_message.pb.h"
 #include "pb/serverinfo_room.pb.h"
+#include "utility/trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/libs/server/src/serverinfo_user_container.cpp b/libs/server/src/serverinfo_user_container.cpp
index d4328f527..98504cce2 100644
--- a/libs/server/src/serverinfo_user_container.cpp
+++ b/libs/server/src/serverinfo_user_container.cpp
@@ -1,4 +1,4 @@
-#include "../../common/serverinfo_user_container.h"
+#include "../include/server/serverinfo_user_container.h"
 
 #include "pb/serverinfo_user.pb.h"
 
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index a98ad26ad..8967676a3 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -1,7 +1,7 @@
 #include "isl_interface.h"
 
-#include "../../libs/server/debug_pb_message.h"
-#include "../../libs/server/get_pb_extension.h"
+#include "../../libs/server/include/server/debug_pb_message.h"
+#include "../../libs/server/include/server/get_pb_extension.h"
 #include "main.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_join_room.pb.h"
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 4804bd7d2..72af3056f 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "servatrice.h"
 
-#include "../../libs/deck/deck_list.h"
 #include "../../libs/utility/include/utility/featureset.h"
+#include "deck_list/deck_list.h"
 #include "email_parser.h"
 #include "isl_interface.h"
 #include "main.h"
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index cf88fae01..48a0de004 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1,7 +1,7 @@
 #include "servatrice_database_interface.h"
 
-#include "../../libs/deck/deck_list.h"
 #include "../../libs/utility/passwordhasher.h"
+#include "deck_list/deck_list.h"
 #include "pb/game_replay.pb.h"
 #include "servatrice.h"
 #include "serversocketinterface.h"
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 5543b67d2..1396eddda 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -20,8 +20,8 @@
 
 #include "serversocketinterface.h"
 
-#include "../../libs/deck/deck_list.h"
 #include "../../libs/utility/include/utility/trice_limits.h"
+#include "deck_list/deck_list.h"
 #include "email_parser.h"
 #include "main.h"
 #include "pb/command_deck_del.pb.h"
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index 6b888e052..cbf30cbe9 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
 add_executable(
-    loading_from_clipboard_test ../../libs/deck/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
+    loading_from_clipboard_test deck_list/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
 )
 
 if(NOT GTEST_FOUND)
diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp
index 312d9b6f1..a874ffa52 100644
--- a/tests/loading_from_clipboard/clipboard_testing.cpp
+++ b/tests/loading_from_clipboard/clipboard_testing.cpp
@@ -1,6 +1,6 @@
 #include "clipboard_testing.h"
 
-#include "../../libs/deck/deck_list_card_node.h"
+#include "deck_list/deck_list_card_node.h"
 
 #include <QTextStream>
 
diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h
index 5dc7cc1af..b1233d37c 100644
--- a/tests/loading_from_clipboard/clipboard_testing.h
+++ b/tests/loading_from_clipboard/clipboard_testing.h
@@ -1,7 +1,7 @@
 #ifndef CLIPBOARD_TESTING_H
 #define CLIPBOARD_TESTING_H
 
-#include "../../libs/deck/deck_list.h"
+#include "deck_list/deck_list.h"
 
 #include "gtest/gtest.h"