diff --git a/CMakeLists.txt b/CMakeLists.txt
index d89bcee9c..b4e1c4c71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,9 +329,9 @@ endif()
 include(CPack)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_server ${CMAKE_BINARY_DIR}/libcockatrice_server)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 94b5edce8..2001a20c5 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -205,16 +205,10 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    ../libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp
     src/server/chat_view/chat_view.cpp
     src/server/game_selector.cpp
     src/server/games_model.cpp
     src/server/handle_public_servers.cpp
-    ../libcockatrice_network/libcockatrice/client/local/local_client.cpp
-    ../libcockatrice_network/libcockatrice/server/local/local_server.cpp
-    ../libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
-    ../libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
-    ../libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
     src/server/remote/remote_decklist_tree_widget.cpp
     src/server/remote/remote_replay_list_tree_widget.cpp
     src/server/user/user_context_menu.cpp
@@ -317,12 +311,6 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
-# Include directories
-include_directories(../common)
-include_directories(${PROTOBUF_INCLUDE_DIR})
-include_directories(${CMAKE_BINARY_DIR}/common)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
@@ -367,13 +355,13 @@ if(Qt5_FOUND)
     libcockatrice_card
     libcockatrice_deck_list
     libcockatrice_utility
-    libcockatrice_server
+      libcockatrice_network
     libcockatrice_rng
     ${COCKATRICE_QT_MODULES}
   )
 else()
   target_link_libraries(
-    cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_server
+      cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
                       libcockatrice_rng ${COCKATRICE_QT_MODULES}
   )
 endif()
diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp
index 96b87709b..a8f07c889 100644
--- a/cockatrice/src/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@@ -1,6 +1,5 @@
 #include "dlg_create_game.h"
 
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../tabs/tab_room.h"
 
 #include <QApplication>
@@ -17,6 +16,7 @@
 #include <QSpinBox>
 #include <QWizard>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h
index d8dbe2f44..dcaf33520 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game/board/card_item.h
@@ -10,7 +10,7 @@
 #include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
 
-#include <libcockatrice/server/game/server_card.h>
+#include <libcockatrice/network/server/remote/game/server_card.h>
 
 class CardDatabase;
 class CardDragItem;
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 76cefbec0..3ef1e1c1f 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,11 +1,11 @@
 #include "game_event_handler.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../tabs/tab_game.h"
 #include "abstract_game.h"
 #include "log/message_log_widget.h"
 
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
 #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_game_say.pb.h>
@@ -28,7 +28,7 @@
 #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_event_container.pb.h>
-#include <libcockatrice/server/get_pb_extension.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 574743d05..b5d6a6572 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -7,10 +7,9 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-
 #include <QObject>
 #include <QTimer>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 class AbstractGame;
diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h
index 16be19a3e..b40f6e5e4 100644
--- a/cockatrice/src/game/log/message_log_widget.h
+++ b/cockatrice/src/game/log/message_log_widget.h
@@ -11,7 +11,7 @@
 #include "../../server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
 
-#include <libcockatrice/server/user_level.h>
+#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class CardItem;
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index aa31f4251..009703499 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,6 +1,5 @@
 #include "player_list_widget.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
@@ -13,6 +12,7 @@
 #include <QHeaderView>
 #include <QMenu>
 #include <QMouseEvent>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index b38b16a96..61d771c79 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -11,7 +11,7 @@
 #include <QLoggingCategory>
 #include <QMap>
 #include <QPixmap>
-#include <libcockatrice/server/user_level.h>
+#include <libcockatrice/network/server/remote/user_level.h>
 
 inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");
 
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index d00974d35..14295858c 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -1,6 +1,5 @@
 #include "home_widget.h"
 
-#include "../../../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
 #include "../../../tabs/tab_supervisor.h"
 #include "../../window_main.h"
 #include "background_sources.h"
@@ -11,6 +10,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index e713575a0..3cc4d8da1 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -7,7 +7,6 @@
 
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "../../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../../../tabs/tab_supervisor.h"
 #include "../cards/card_info_picture_art_crop_widget.h"
 #include "home_styled_button.h"
@@ -15,6 +14,7 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QWidget>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class HomeWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 29717d4e1..fbe9b5b10 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -19,9 +19,6 @@
  ***************************************************************************/
 #include "window_main.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/local/local_client.h"
-#include "../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
-#include "../../../libcockatrice_network/libcockatrice/server/local/local_server.h"
 #include "../client/get_text_with_max.h"
 #include "../client/network/client_update_checker.h"
 #include "../client/network/release_channel.h"
@@ -38,7 +35,6 @@
 #include "../dialogs/dlg_update.h"
 #include "../dialogs/dlg_view_log.h"
 #include "../main.h"
-#include "../server/local_server_interface.h"
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_supervisor.h"
 #include "version_string.h"
@@ -66,6 +62,10 @@
 #include <QtNetwork>
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/network/client/local/local_client.h>
+#include <libcockatrice/network/client/remote/remote_client.h>
+#include <libcockatrice/network/server/local/local_server.h>
+#include <libcockatrice/network/server/local/local_server_interface.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index 5d9a874f4..620a09467 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -25,8 +25,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-
 #include <QList>
 #include <QLoggingCategory>
 #include <QMainWindow>
@@ -34,6 +32,7 @@
 #include <QProcess>
 #include <QSystemTrayIcon>
 #include <QtNetwork>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 
 inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index ca2a7b8d4..086c3ab70 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -29,6 +29,7 @@
 #include "interface/window_main.h"
 #include "version_string.h"
 
+#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h>
 #include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
@@ -43,7 +44,6 @@
 #include <QtPlugin>
 #include <libcockatrice/rng/rng_sfmt.h>
 #include <libcockatrice/settings/cache_settings.h>
-#include <libcockatrice/utility/featureset.h>
 #include <libcockatrice/utility/logger.h>
 
 QTranslator *translator, *qtTranslator;
diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
index e3ccb1f20..3288f6143 100644
--- a/cockatrice/src/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -12,7 +12,7 @@
 #include <QDesktopServices>
 #include <QMouseEvent>
 #include <QScrollBar>
-#include <libcockatrice/server/user_level.h>
+#include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h
index c3e9ce19a..3e4c21712 100644
--- a/cockatrice/src/server/chat_view/chat_view.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -16,8 +16,8 @@
 #include <QTextBrowser>
 #include <QTextCursor>
 #include <QTextFragment>
-#include <libcockatrice/server/room_message_type.h>
-#include <libcockatrice/server/user_level.h>
+#include <libcockatrice/network/server/remote/room_message_type.h>
+#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class QTextTable;
diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp
index dc3b4bf10..175def86d 100644
--- a/cockatrice/src/server/game_selector.cpp
+++ b/cockatrice/src/server/game_selector.cpp
@@ -1,7 +1,5 @@
 #include "game_selector.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/get_text_with_max.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../dialogs/dlg_filter_games.h"
@@ -23,9 +21,11 @@
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 GameSelector::GameSelector(AbstractClient *_client,
                            TabSupervisor *_tabSupervisor,
diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
index 5a6a2d48d..6ca680c3f 100644
--- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
@@ -1,14 +1,13 @@
 #include "remote_decklist_tree_widget.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
-
 #include <QFileIconProvider>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
                                                        RemoteDeckList_TreeModel::DirectoryNode *_parent)
diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
index da4249fa4..a5e8e46df 100644
--- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,14 +1,13 @@
 #include "remote_replay_list_tree_widget.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
-
 #include <QFileIconProvider>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 const int RemoteReplayList_TreeModel::numberOfColumns = 6;
 
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index b869b6fec..405799ba0 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -1,7 +1,5 @@
 #include "user_context_menu.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_game.h"
 #include "../../tabs/tab_supervisor.h"
@@ -18,6 +16,7 @@
 #include <QSignalMapper>
 #include <QtGui>
 #include <QtWidgets>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
@@ -28,6 +27,7 @@
 #include <libcockatrice/protocol/pb/response_warn_history.pb.h>
 #include <libcockatrice/protocol/pb/response_warn_list.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game)
     : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),
diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h
index 76af4acdc..0056d74ae 100644
--- a/cockatrice/src/server/user/user_context_menu.h
+++ b/cockatrice/src/server/user/user_context_menu.h
@@ -8,7 +8,7 @@
 #define USER_CONTEXT_MENU_H
 
 #include <QObject>
-#include <libcockatrice/server/user_level.h>
+#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class UserListProxy;
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index 9f7a540fb..e756dfbc9 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,7 +1,5 @@
 #include "user_info_box.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../../client/get_text_with_max.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
@@ -14,9 +12,11 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/passwordhasher.h>
 
 UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)
diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp
index 0f188b8c1..9b930b7f6 100644
--- a/cockatrice/src/server/user/user_list_manager.cpp
+++ b/cockatrice/src/server/user/user_list_manager.cpp
@@ -1,16 +1,16 @@
 #include "user_list_manager.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../../client/sound_engine.h"
 #include "user_info_box.h"
 
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/response_list_users.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 UserListManager::UserListManager(AbstractClient *_client, QObject *parent)
     : QObject(parent), client(_client), ownUserInfo(nullptr)
diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp
index 07c27c981..68f2f97c8 100644
--- a/cockatrice/src/server/user/user_list_widget.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,7 +1,5 @@
 #include "user_list_widget.h"
 
-#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_supervisor.h"
@@ -25,10 +23,12 @@
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h
index 2b1a40f95..897c01b83 100644
--- a/cockatrice/src/server/user/user_list_widget.h
+++ b/cockatrice/src/server/user/user_list_widget.h
@@ -13,8 +13,8 @@
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 #include <QTreeWidgetItem>
+#include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
-#include <libcockatrice/server/user_level.h>
 
 class QTreeWidget;
 class ServerInfo_User;
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
index 0670db93d..af120ac8b 100644
--- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
@@ -1,7 +1,5 @@
 #include "abstract_tab_deck_editor.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/tapped_out_interface.h"
 #include "../deck/deck_stats_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -35,8 +33,10 @@
 #include <QUrl>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp
index ef46a25f5..fb2df4907 100644
--- a/cockatrice/src/tabs/tab_account.cpp
+++ b/cockatrice/src/tabs/tab_account.cpp
@@ -1,7 +1,5 @@
 #include "tab_account.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../server/user/user_info_box.h"
@@ -11,12 +9,14 @@
 
 #include <QPushButton>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/response_list_users.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp
index 3c4728652..3ddb53579 100644
--- a/cockatrice/src/tabs/tab_admin.cpp
+++ b/cockatrice/src/tabs/tab_admin.cpp
@@ -1,8 +1,5 @@
 #include "tab_admin.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
-
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -11,9 +8,11 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/admin_commands.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp
index cb082091e..b4202803f 100644
--- a/cockatrice/src/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/tab_deck_editor.cpp
@@ -1,7 +1,5 @@
 #include "tab_deck_editor.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/deck_editor_menu.h"
 #include "../client/tapped_out_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -36,6 +34,8 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp
index 4f377e87d..5940d1210 100644
--- a/cockatrice/src/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/tabs/tab_deck_storage.cpp
@@ -1,6 +1,5 @@
 #include "tab_deck_storage.h"
 
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/get_text_with_max.h"
 #include "../deck/deck_loader.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
@@ -28,6 +27,7 @@
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h
index 8582fd78f..c0c4e9cfa 100644
--- a/cockatrice/src/tabs/tab_deck_storage.h
+++ b/cockatrice/src/tabs/tab_deck_storage.h
@@ -8,10 +8,11 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+
 class ServerInfo_User;
 class AbstractClient;
 class QTreeView;
diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp
index 47dbdb669..7c1bb6aee 100644
--- a/cockatrice/src/tabs/tab_game.cpp
+++ b/cockatrice/src/tabs/tab_game.cpp
@@ -1,6 +1,5 @@
 #include "tab_game.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../client/network/replay_timeline_widget.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../game/board/arrow_item.h"
@@ -40,6 +39,7 @@
 #include <QWidget>
 #include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h
index 5efe9e57a..3738b73fd 100644
--- a/cockatrice/src/tabs/tab_home.h
+++ b/cockatrice/src/tabs/tab_home.h
@@ -7,11 +7,11 @@
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../interface/widgets/general/home_widget.h"
 #include "tab.h"
 
 #include <QHBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <qgroupbox.h>
 
 class AbstractClient;
diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp
index 228b6c552..c23a26be3 100644
--- a/cockatrice/src/tabs/tab_logs.cpp
+++ b/cockatrice/src/tabs/tab_logs.cpp
@@ -1,7 +1,5 @@
 #include "tab_logs.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../deck/custom_line_edit.h"
 #include "../dialogs/dlg_manage_sets.h"
 
@@ -17,8 +15,10 @@
 #include <QTabWidget>
 #include <QtGui>
 #include <QtWidgets>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp
index d73776f2f..671a3285d 100644
--- a/cockatrice/src/tabs/tab_message.cpp
+++ b/cockatrice/src/tabs/tab_message.cpp
@@ -1,7 +1,5 @@
 #include "tab_message.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
@@ -13,9 +11,11 @@
 #include <QMenu>
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp
index ad5287a13..eb6543e44 100644
--- a/cockatrice/src/tabs/tab_replays.cpp
+++ b/cockatrice/src/tabs/tab_replays.cpp
@@ -1,7 +1,5 @@
 #include "tab_replays.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../server/remote/remote_replay_list_tree_widget.h"
 #include "tab_game.h"
 
@@ -19,6 +17,7 @@
 #include <QTreeView>
 #include <QUrl>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_download.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
@@ -29,6 +28,7 @@
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
diff --git a/cockatrice/src/tabs/tab_replays.h b/cockatrice/src/tabs/tab_replays.h
index 319e9301c..bf21ada82 100644
--- a/cockatrice/src/tabs/tab_replays.h
+++ b/cockatrice/src/tabs/tab_replays.h
@@ -8,9 +8,10 @@
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "tab.h"
 
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+
 class ServerInfo_User;
 class Response;
 class AbstractClient;
diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp
index 08799f84e..a1c2ca652 100644
--- a/cockatrice/src/tabs/tab_room.cpp
+++ b/cockatrice/src/tabs/tab_room.cpp
@@ -1,7 +1,5 @@
 #include "tab_room.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../dialogs/dlg_settings.h"
 #include "../main.h"
 #include "../server/chat_view/chat_view.h"
@@ -11,6 +9,7 @@
 #include "tab_account.h"
 #include "tab_supervisor.h"
 
+#include <../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h>
 #include <QApplication>
 #include <QCompleter>
 #include <QLabel>
@@ -22,6 +21,7 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QtCore/qdatetime.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_join_room.pb.h>
 #include <libcockatrice/protocol/pb/event_leave_room.pb.h>
 #include <libcockatrice/protocol/pb/event_list_games.pb.h>
@@ -29,7 +29,7 @@
 #include <libcockatrice/protocol/pb/event_room_say.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/server/get_pb_extension.h>
+#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp
index afc9644d5..593eb0702 100644
--- a/cockatrice/src/tabs/tab_server.cpp
+++ b/cockatrice/src/tabs/tab_server.cpp
@@ -1,7 +1,5 @@
 #include "tab_server.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
-#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
 #include "../server/user/user_list_widget.h"
 #include "tab_supervisor.h"
 
@@ -16,10 +14,12 @@
 #include <QTextEdit>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/response_join_room.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
 {
diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp
index d2e630b60..41d05f618 100644
--- a/cockatrice/src/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/tabs/tab_supervisor.cpp
@@ -1,6 +1,5 @@
 #include "tab_supervisor.h"
 
-#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
 #include "../interface/pixel_map_generator.h"
 #include "../main.h"
 #include "../server/user/user_list_manager.h"
@@ -26,6 +25,7 @@
 #include <QMessageBox>
 #include <QPainter>
 #include <QSystemTrayIcon>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_notify_user.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt
index 7e78bc0b7..394887b79 100644
--- a/libcockatrice_network/CMakeLists.txt
+++ b/libcockatrice_network/CMakeLists.txt
@@ -2,15 +2,16 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-add_subdirectory(libcockatrice/client)
+add_subdirectory(libcockatrice/network/client)
+add_subdirectory(libcockatrice/network/server)
 
 add_library(
     libcockatrice_network INTERFACE
 )
 
 
-target_include_directories(libcockatrice_network PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(
-    libcockatrice_network PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client
+    libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
 )
diff --git a/libcockatrice_network/libcockatrice/CMakeLists.txt b/libcockatrice_network/libcockatrice/CMakeLists.txt
deleted file mode 100644
index 05d8e9021..000000000
--- a/libcockatrice_network/libcockatrice/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    local_client.h
-)
-
-set(SOURCES
-    local_client.cpp
-)
-
-if (Qt6_FOUND)
-    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif (Qt5_FOUND)
-    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif ()
-
-add_library(
-    libcockatrice_network_client_local STATIC
-    ${MOC_SOURCES}
-    ${SOURCES}
-)
-
-# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
-
-target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-    libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
-)
diff --git a/libcockatrice_network/libcockatrice/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/CMakeLists.txt
deleted file mode 100644
index 60df27928..000000000
--- a/libcockatrice_network/libcockatrice/client/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_subdirectory(abstract)
-add_subdirectory(local)
-add_subdirectory(remote)
-
-add_library(
-    libcockatrice_network_client INTERFACE
-)
-
-target_include_directories(libcockatrice_network_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-    libcockatrice_network_client PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote
-)
diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
new file mode 100644
index 000000000..e5ca6d293
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+add_subdirectory(abstract)
+add_subdirectory(local)
+add_subdirectory(remote)
+
+add_library(
+    libcockatrice_network_client INTERFACE
+)
+
+target_include_directories(libcockatrice_network_client INTERFACE .)
+
+target_link_libraries(
+    libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote
+)
diff --git a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
similarity index 81%
rename from libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt
rename to libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
index 675e78de1..d22111bab 100644
--- a/libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -22,10 +22,10 @@ add_library(
     ${SOURCES}
 )
 
-add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol)
+add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
 
-target_include_directories(libcockatrice_network_client_abstract PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
 
 target_link_libraries(
-    libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
+    libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol libcockatrice_network_server_remote
 )
diff --git a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
similarity index 97%
rename from libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp
rename to libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
index 20b3631f5..11458768d 100644
--- a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -1,8 +1,8 @@
 #include "abstract_client.h"
 
-#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
-
 #include <google/protobuf/descriptor.h>
+#include <libcockatrice/protocol/featureset.h>
+#include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
@@ -18,8 +18,7 @@
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
-#include <libcockatrice/server/get_pb_extension.h>
-#include <libcockatrice/utility/featureset.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 AbstractClient::AbstractClient(QObject *parent)
     : QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false)
diff --git a/libcockatrice_network/libcockatrice/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/client/abstract/abstract_client.h
rename to libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
diff --git a/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
similarity index 95%
rename from libcockatrice_network/libcockatrice/client/local/CMakeLists.txt
rename to libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index 2315d30a4..4e5e9180c 100644
--- a/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -24,7 +24,7 @@ add_library(
 
 add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
 
-target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libcockatrice_network_client_local PUBLIC .)
 
 target_link_libraries(
     libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
diff --git a/libcockatrice_network/libcockatrice/client/local/local_client.cpp b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
similarity index 95%
rename from libcockatrice_network/libcockatrice/client/local/local_client.cpp
rename to libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
index be3f4b739..eefa3a2f3 100644
--- a/libcockatrice_network/libcockatrice/client/local/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
@@ -2,8 +2,8 @@
 
 #include "../../server/local/local_server_interface.h"
 
+#include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/server/debug_pb_message.h>
 
 LocalClient::LocalClient(LocalServerInterface *_lsi,
                          const QString &_playerName,
diff --git a/libcockatrice_network/libcockatrice/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/client/local/local_client.h
rename to libcockatrice_network/libcockatrice/network/client/local/local_client.h
diff --git a/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
similarity index 76%
rename from libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt
rename to libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
index f344c9633..97daaac92 100644
--- a/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -22,10 +22,10 @@ add_library(
     ${SOURCES}
 )
 
-add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract)
+add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
 
-target_include_directories(libcockatrice_network_client_remote PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libcockatrice_network_client_remote PUBLIC .)
 
 target_link_libraries(
-    libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
+    libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_settings libcockatrice_utility libcockatrice_protocol
 )
diff --git a/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
similarity index 99%
rename from libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
rename to libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index 2a4fae82e..6754aad90 100644
--- a/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -12,6 +12,7 @@
 #include <QThread>
 #include <QTimer>
 #include <QWebSocket>
+#include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
 #include <libcockatrice/protocol/pb/response_activate.pb.h>
 #include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
@@ -20,7 +21,6 @@
 #include <libcockatrice/protocol/pb/response_register.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/server/debug_pb_message.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/passwordhasher.h>
 
diff --git a/libcockatrice_network/libcockatrice/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/client/remote/remote_client.h
rename to libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
diff --git a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
new file mode 100644
index 000000000..e57ca882c
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+add_subdirectory(local)
+add_subdirectory(remote)
+
+add_library(
+    libcockatrice_network_server INTERFACE
+)
+
+target_include_directories(libcockatrice_network_server INTERFACE .)
+
+target_link_libraries(
+    libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local libcockatrice_network_server_remote
+)
diff --git a/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
similarity index 83%
rename from libcockatrice_network/libcockatrice/server/local/CMakeLists.txt
rename to libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
index 7e93d7461..feda6b841 100644
--- a/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
@@ -24,8 +24,10 @@ add_library(
     ${SOURCES}
 )
 
-target_include_directories(libcockatrice_network_server_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
+
+target_include_directories(libcockatrice_network_server_local PUBLIC .)
 
 target_link_libraries(
-    libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES}
+    libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
 )
diff --git a/libcockatrice_network/libcockatrice/server/local/local_server.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
similarity index 94%
rename from libcockatrice_network/libcockatrice/server/local/local_server.cpp
rename to libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
index cc2ee51dc..8f9d82aa4 100644
--- a/libcockatrice_network/libcockatrice/server/local/local_server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
@@ -1,8 +1,8 @@
-#include "../../../cockatrice/src/server/local_server.h"
+#include "local_server.h"
 
 #include "local_server_interface.h"
 
-#include <libcockatrice/server/server_room.h>
+#include <../remote/server_room.h>
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
 {
diff --git a/libcockatrice_network/libcockatrice/server/local/local_server.h b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
similarity index 93%
rename from libcockatrice_network/libcockatrice/server/local/local_server.h
rename to libcockatrice_network/libcockatrice/network/server/local/local_server.h
index 2a1d141a0..70586f6c1 100644
--- a/libcockatrice_network/libcockatrice/server/local/local_server.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
@@ -7,8 +7,8 @@
 #ifndef LOCALSERVER_H
 #define LOCALSERVER_H
 
-#include <libcockatrice/server/server.h>
-#include <libcockatrice/server/server_database_interface.h>
+#include <../remote/server.h>
+#include <../remote/server_database_interface.h>
 
 class LocalServerInterface;
 
diff --git a/libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
similarity index 88%
rename from libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
rename to libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
index b927d2acd..bb86198af 100644
--- a/libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
@@ -1,4 +1,4 @@
-#include "../../../cockatrice/src/server/local_server_interface.h"
+#include "local_server_interface.h"
 
 #include "local_server.h"
 
diff --git a/libcockatrice_network/libcockatrice/server/local/local_server_interface.h b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
similarity index 93%
rename from libcockatrice_network/libcockatrice/server/local/local_server_interface.h
rename to libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
index 08dce1feb..1ddf5a85a 100644
--- a/libcockatrice_network/libcockatrice/server/local/local_server_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
@@ -7,7 +7,7 @@
 #ifndef LOCALSERVERINTERFACE_H
 #define LOCALSERVERINTERFACE_H
 
-#include <libcockatrice/server/server_protocolhandler.h>
+#include <../remote/server_protocolhandler.h>
 
 class LocalServer;
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
new file mode 100644
index 000000000..0952d89bc
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
@@ -0,0 +1,63 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(HEADERS
+    game/server_abstract_participant.h
+    game/server_abstract_player.h
+    game/server_arrow.h
+    game/server_arrowtarget.h
+    game/server_card.h
+    game/server_cardzone.h
+    game/server_counter.h
+    game/server_game.h
+    game/server_player.h
+    game/server_spectator.h
+    server.h
+    server_abstractuserinterface.h
+    server_database_interface.h
+    server_protocolhandler.h
+    server_remoteuserinterface.h
+    server_response_containers.h
+    server_room.h
+    serverinfo_user_container.h
+)
+
+if (Qt6_FOUND)
+    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+elseif (Qt5_FOUND)
+    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
+endif ()
+
+add_library(
+    libcockatrice_network_server_remote STATIC
+    ${MOC_SOURCES}
+    game/server_abstract_participant.cpp
+    game/server_abstract_player.cpp
+    game/server_arrow.cpp
+    game/server_arrowtarget.cpp
+    game/server_card.cpp
+    game/server_cardzone.cpp
+    game/server_counter.cpp
+    game/server_game.cpp
+    game/server_player.cpp
+    game/server_spectator.cpp
+    server.cpp
+    server_abstractuserinterface.cpp
+    server_database_interface.cpp
+    server_protocolhandler.cpp
+    server_remoteuserinterface.cpp
+    server_response_containers.cpp
+    server_room.cpp
+    serverinfo_user_container.cpp
+)
+
+add_dependencies(libcockatrice_network_server_remote libcockatrice_protocol)
+
+target_include_directories(libcockatrice_network_server_remote PUBLIC .)
+
+# Make cockatrice_server depend on cockatrice_protocol
+target_link_libraries(
+    libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
+    libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
+)
diff --git a/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
similarity index 99%
rename from libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
index 629036c73..29517fc4e 100644
--- a/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
@@ -1,6 +1,6 @@
 #include "server_abstract_participant.h"
 
-#include "../get_pb_extension.h"
+#include "../../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h"
 #include "../server.h"
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
diff --git a/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_abstract_player.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_arrow.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_arrow.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_arrow.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_arrow.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_card.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_card.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_card.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_cardzone.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_cardzone.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_counter.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_counter.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_counter.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_counter.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_game.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_game.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
similarity index 99%
rename from libcockatrice_server/libcockatrice/server/game/server_player.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index 35dae547c..0e6c23fff 100644
--- a/libcockatrice_server/libcockatrice/server/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -1,6 +1,6 @@
 #include "server_player.h"
 
-#include "../get_pb_extension.h"
+#include "../../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h"
 #include "../server.h"
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
diff --git a/libcockatrice_server/libcockatrice/server/game/server_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_player.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
diff --git a/libcockatrice_server/libcockatrice/server/game/server_spectator.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_spectator.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
diff --git a/libcockatrice_server/libcockatrice/server/game/server_spectator.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/game/server_spectator.h
rename to libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
diff --git a/libcockatrice_server/libcockatrice/server/room_message_type.h b/libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/room_message_type.h
rename to libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h
diff --git a/libcockatrice_server/libcockatrice/server/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
similarity index 99%
rename from libcockatrice_server/libcockatrice/server/server.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server.cpp
index e5641d71a..801bd5820 100644
--- a/libcockatrice_server/libcockatrice/server/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "server.h"
 
-#include "debug_pb_message.h"
+
 #include "game/server_game.h"
 #include "game/server_player.h"
 #include "server_database_interface.h"
@@ -30,13 +30,14 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QThread>
+#include <libcockatrice/protocol/featureset.h>
+#include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
 #include <libcockatrice/protocol/pb/session_event.pb.h>
-#include <libcockatrice/utility/featureset.h>
 
 Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0)
 {
diff --git a/libcockatrice_server/libcockatrice/server/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server.h
diff --git a/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
diff --git a/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
diff --git a/libcockatrice_server/libcockatrice/server/server_database_interface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_database_interface.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.cpp
diff --git a/libcockatrice_server/libcockatrice/server/server_database_interface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_database_interface.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
diff --git a/libcockatrice_server/libcockatrice/server/server_player_reference.h b/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_player_reference.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
diff --git a/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
similarity index 99%
rename from libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index a3c4f9750..4524b2aa2 100644
--- a/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -1,9 +1,7 @@
 #include "server_protocolhandler.h"
 
-#include "debug_pb_message.h"
 #include "game/server_game.h"
 #include "game/server_player.h"
-#include "get_pb_extension.h"
 #include "server_database_interface.h"
 #include "server_room.h"
 
@@ -11,6 +9,8 @@
 #include <QDebug>
 #include <QtMath>
 #include <google/protobuf/descriptor.h>
+#include <libcockatrice/protocol/featureset.h>
+#include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
@@ -25,7 +25,6 @@
 #include <libcockatrice/protocol/pb/response_list_users.pb.h>
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/featureset.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
diff --git a/libcockatrice_server/libcockatrice/server/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_protocolhandler.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
diff --git a/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp
diff --git a/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
diff --git a/libcockatrice_server/libcockatrice/server/server_response_containers.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_response_containers.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
diff --git a/libcockatrice_server/libcockatrice/server/server_response_containers.h b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_response_containers.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
diff --git a/libcockatrice_server/libcockatrice/server/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_room.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
diff --git a/libcockatrice_server/libcockatrice/server/server_room.h b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/server_room.h
rename to libcockatrice_network/libcockatrice/network/server/remote/server_room.h
diff --git a/libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp
rename to libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
diff --git a/libcockatrice_server/libcockatrice/server/serverinfo_user_container.h b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/serverinfo_user_container.h
rename to libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h
diff --git a/libcockatrice_server/libcockatrice/server/user_level.h b/libcockatrice_network/libcockatrice/network/server/remote/user_level.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/user_level.h
rename to libcockatrice_network/libcockatrice/network/server/remote/user_level.h
diff --git a/libcockatrice_network/libcockatrice/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/CMakeLists.txt
deleted file mode 100644
index 05d8e9021..000000000
--- a/libcockatrice_network/libcockatrice/server/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    local_client.h
-)
-
-set(SOURCES
-    local_client.cpp
-)
-
-if (Qt6_FOUND)
-    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif (Qt5_FOUND)
-    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif ()
-
-add_library(
-    libcockatrice_network_client_local STATIC
-    ${MOC_SOURCES}
-    ${SOURCES}
-)
-
-# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
-
-target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-    libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
-)
diff --git a/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt
deleted file mode 100644
index 05d8e9021..000000000
--- a/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    local_client.h
-)
-
-set(SOURCES
-    local_client.cpp
-)
-
-if (Qt6_FOUND)
-    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif (Qt5_FOUND)
-    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif ()
-
-add_library(
-    libcockatrice_network_client_local STATIC
-    ${MOC_SOURCES}
-    ${SOURCES}
-)
-
-# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
-
-target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-    libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
-)
diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt
index 4bd984c25..a1ae2abf0 100644
--- a/libcockatrice_protocol/CMakeLists.txt
+++ b/libcockatrice_protocol/CMakeLists.txt
@@ -5,10 +5,16 @@ add_subdirectory(libcockatrice/protocol/pb)
 add_library(libcockatrice_protocol STATIC)
 
 set(SOURCES
+    libcockatrice/protocol/debug_pb_message.cpp
+    libcockatrice/protocol/featureset.cpp
+    libcockatrice/protocol/get_pb_extension.cpp
     libcockatrice/protocol/pending_command.cpp
 )
 
 set(HEADERS
+    libcockatrice/protocol/debug_pb_message.h
+    libcockatrice/protocol/featureset.h
+    libcockatrice/protocol/get_pb_extension.h
     libcockatrice/protocol/pending_command.h
 )
 
@@ -21,7 +27,7 @@ target_sources(libcockatrice_protocol
 add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
 
 # Link the actual generated protobuf library
-target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb)
+target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb libcockatrice_utility)
 
 # Expose include paths
 target_include_directories(
diff --git a/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt
deleted file mode 100644
index cc7536c79..000000000
--- a/libcockatrice_protocol/libcockatrice/protocol/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# Top-level wrapper for the protobuf library
-
-add_subdirectory(pb)
-
-add_library(libcockatrice_protocol STATIC)
-
-set(SOURCES
-    pending_command.cpp
-)
-
-set(HEADERS
-    pending_command.h
-)
-
-target_sources(libcockatrice_protocol
-    PRIVATE
-    ${SOURCES}
-    ${HEADERS}
-)
-
-add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
-
-# Link the actual generated protobuf library
-target_link_libraries(libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb)
-
-# Expose include paths
-target_include_directories(
-    libcockatrice_protocol
-    PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/pb   # generated pb headers
-)
diff --git a/libcockatrice_server/libcockatrice/server/debug_pb_message.cpp b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/debug_pb_message.cpp
rename to libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
diff --git a/libcockatrice_server/libcockatrice/server/debug_pb_message.h b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/debug_pb_message.h
rename to libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h
diff --git a/libcockatrice_utility/libcockatrice/utility/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/featureset.cpp
rename to libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
diff --git a/libcockatrice_utility/libcockatrice/utility/featureset.h b/libcockatrice_protocol/libcockatrice/protocol/featureset.h
similarity index 94%
rename from libcockatrice_utility/libcockatrice/utility/featureset.h
rename to libcockatrice_protocol/libcockatrice/protocol/featureset.h
index da495c4b7..424d0b975 100644
--- a/libcockatrice_utility/libcockatrice/utility/featureset.h
+++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.h
@@ -2,10 +2,11 @@
 #define FEATURESET_H
 
 #include <QMap>
+#include <QObject>
 #include <QSet>
 #include <QString>
 
-class FeatureSet
+class FeatureSet : public QObject
 {
 public:
     FeatureSet();
diff --git a/libcockatrice_server/libcockatrice/server/get_pb_extension.cpp b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/get_pb_extension.cpp
rename to libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
diff --git a/libcockatrice_server/libcockatrice/server/get_pb_extension.h b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h
similarity index 100%
rename from libcockatrice_server/libcockatrice/server/get_pb_extension.h
rename to libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h
diff --git a/libcockatrice_server/CMakeLists.txt b/libcockatrice_server/CMakeLists.txt
deleted file mode 100644
index 693538c52..000000000
--- a/libcockatrice_server/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    libcockatrice/server/game/server_abstract_participant.h
-    libcockatrice/server/game/server_abstract_player.h
-    libcockatrice/server/game/server_arrow.h
-    libcockatrice/server/game/server_arrowtarget.h
-    libcockatrice/server/game/server_card.h
-    libcockatrice/server/game/server_cardzone.h
-    libcockatrice/server/game/server_counter.h
-    libcockatrice/server/game/server_game.h
-    libcockatrice/server/game/server_player.h
-    libcockatrice/server/game/server_spectator.h
-    libcockatrice/server/debug_pb_message.h
-    libcockatrice/server/get_pb_extension.h
-    libcockatrice/server/server.h
-    libcockatrice/server/server_abstractuserinterface.h
-    libcockatrice/server/server_database_interface.h
-    libcockatrice/server/server_protocolhandler.h
-    libcockatrice/server/server_remoteuserinterface.h
-    libcockatrice/server/server_response_containers.h
-    libcockatrice/server/server_room.h
-    libcockatrice/server/serverinfo_user_container.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_server STATIC
-  ${MOC_SOURCES}
-  libcockatrice/server/debug_pb_message.cpp
-  libcockatrice/server/game/server_abstract_participant.cpp
-  libcockatrice/server/game/server_abstract_player.cpp
-  libcockatrice/server/game/server_arrow.cpp
-  libcockatrice/server/game/server_arrowtarget.cpp
-  libcockatrice/server/game/server_card.cpp
-  libcockatrice/server/game/server_cardzone.cpp
-  libcockatrice/server/game/server_counter.cpp
-  libcockatrice/server/game/server_game.cpp
-  libcockatrice/server/game/server_player.cpp
-  libcockatrice/server/game/server_spectator.cpp
-  libcockatrice/server/get_pb_extension.cpp
-  libcockatrice/server/server.cpp
-  libcockatrice/server/server_abstractuserinterface.cpp
-  libcockatrice/server/server_database_interface.cpp
-  libcockatrice/server/server_protocolhandler.cpp
-  libcockatrice/server/server_remoteuserinterface.cpp
-  libcockatrice/server/server_response_containers.cpp
-  libcockatrice/server/server_room.cpp
-  libcockatrice/server/serverinfo_user_container.cpp
-)
-
-add_dependencies(libcockatrice_server libcockatrice_protocol)
-
-target_include_directories(libcockatrice_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Make cockatrice_server depend on cockatrice_protocol
-target_link_libraries(
-    libcockatrice_server PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
-                              libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
-)
diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
index e531b7983..0a0b1cf35 100644
--- a/libcockatrice_utility/CMakeLists.txt
+++ b/libcockatrice_utility/CMakeLists.txt
@@ -6,14 +6,13 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(UTILITY_SOURCES
-    libcockatrice/utility/expression.cpp libcockatrice/utility/featureset.cpp libcockatrice/utility/key_signals.cpp
+    libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp
     libcockatrice/utility/levenshtein.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp
 )
 
 set(UTILITY_HEADERS
     libcockatrice/utility/color.h
     libcockatrice/utility/expression.h
-    libcockatrice/utility/featureset.h
     libcockatrice/utility/key_signals.h
     libcockatrice/utility/levenshtein.h
     libcockatrice/utility/logger.h
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 514df9f87..0453b83bd 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -3,6 +3,10 @@
 #include "main.h"
 #include "server_logger.h"
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h>
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
+#include <../../libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h>
+#include <../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -16,10 +20,6 @@
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
-#include <libcockatrice/server/debug_pb_message.h>
-#include <libcockatrice/server/get_pb_extension.h>
-#include <libcockatrice/server/server_protocolhandler.h>
-#include <libcockatrice/server/server_room.h>
 
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
 {
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 65beb0646..b246c2b66 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -29,6 +29,8 @@
 #include "settingscache.h"
 #include "smtpclient.h"
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
+#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h>
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
@@ -43,8 +45,6 @@
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
-#include <libcockatrice/server/server_room.h>
-#include <libcockatrice/utility/featureset.h>
 
 Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
                                              int _numberPools,
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 4bd2500cf..d5c87a4ab 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -20,6 +20,7 @@
 #ifndef SERVATRICE_H
 #define SERVATRICE_H
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
 #include <QHostAddress>
 #include <QMetaType>
 #include <QMutex>
@@ -29,7 +30,6 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QWebSocketServer>
-#include <libcockatrice/server/server.h>
 #include <utility>
 
 Q_DECLARE_METATYPE(QSqlDatabase)
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index dc1c8505b..310aa432d 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,12 +1,12 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_database_interface.h>
 #include <QChar>
 #include <QHash>
 #include <QObject>
 #include <QSqlDatabase>
-#include <libcockatrice/server/server.h>
-#include <libcockatrice/server/server_database_interface.h>
 
 #define DATABASE_SCHEMA_VERSION 34
 
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index ea3940a71..03faa2b0f 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -28,6 +28,8 @@
 #include "settingscache.h"
 #include "version_string.h"
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_response_containers.h>
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
 #include <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
@@ -78,8 +80,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/server/game/server_player.h>
-#include <libcockatrice/server/server_response_containers.h>
-#include <libcockatrice/server/server_room.h>
 #include <libcockatrice/utility/trice_limits.h>
 #include <string>
 
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index b68e836de..213dae1d9 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,11 +20,11 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
+#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h>
 #include <QHostAddress>
 #include <QMutex>
 #include <QTcpSocket>
 #include <QWebSocket>
-#include <libcockatrice/server/server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;
@@ -146,7 +146,7 @@ public:
     AbstractServerSocketInterface(Servatrice *_server,
                                   Servatrice_DatabaseInterface *_databaseInterface,
                                   QObject *parent = 0);
-    ~AbstractServerSocketInterface(){};
+    ~AbstractServerSocketInterface() {};
     bool initSession();
 
     virtual QHostAddress getPeerAddress() const = 0;