diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 3d4717a97..d762ef0a3 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -205,16 +205,16 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/server/abstract_client.cpp
+    ../libcockatrice_network/libcockatrice/client/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
-    src/server/local_client.cpp
-    src/server/local_server.cpp
-    src/server/local_server_interface.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
     src/server/pending_command.cpp
-    src/server/remote/remote_client.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
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index f765c35b8..fced4f0c5 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 "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../tabs/tab_game.h"
 #include "abstract_game.h"
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 19c9cddbc..4fce3de97 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 
 #include <QObject>
 #include <QTimer>
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index 6669a0a37..0a96ccca1 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,7 +1,7 @@
 #include "player_list_widget.h"
 
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index 35f069763..d00974d35 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -1,6 +1,6 @@
 #include "home_widget.h"
 
-#include "../../../server/remote/remote_client.h"
+#include "../../../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
 #include "../../../tabs/tab_supervisor.h"
 #include "../../window_main.h"
 #include "background_sources.h"
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index 2c22bc29b..47e00cd3f 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -7,7 +7,7 @@
 
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "../../../server/abstract_client.h"
+#include "../../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../../tabs/tab_supervisor.h"
 #include "../cards/card_info_picture_art_crop_widget.h"
 #include "home_styled_button.h"
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 9225f2990..29717d4e1 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -19,6 +19,9 @@
  ***************************************************************************/
 #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"
@@ -35,10 +38,7 @@
 #include "../dialogs/dlg_update.h"
 #include "../dialogs/dlg_view_log.h"
 #include "../main.h"
-#include "../server/local_client.h"
-#include "../server/local_server.h"
 #include "../server/local_server_interface.h"
-#include "../server/remote/remote_client.h"
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_supervisor.h"
 #include "version_string.h"
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index a9e11f8de..2e1f6b7ff 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -25,7 +25,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 
 #include <QList>
 #include <QLoggingCategory>
diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp
index 2cf7eff55..d449a4f10 100644
--- a/cockatrice/src/server/game_selector.cpp
+++ b/cockatrice/src/server/game_selector.cpp
@@ -1,5 +1,6 @@
 #include "game_selector.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/get_text_with_max.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../dialogs/dlg_filter_games.h"
@@ -7,7 +8,6 @@
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_room.h"
 #include "../tabs/tab_supervisor.h"
-#include "abstract_client.h"
 #include "games_model.h"
 #include "pending_command.h"
 #include "user/user_list_manager.h"
diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
index 5606fb707..73b97786e 100644
--- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
@@ -1,6 +1,6 @@
 #include "remote_decklist_tree_widget.h"
 
-#include "../abstract_client.h"
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../pending_command.h"
 
 #include <QFileIconProvider>
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 c25391b1a..7e971680a 100644
--- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,6 +1,6 @@
 #include "remote_replay_list_tree_widget.h"
 
-#include "../abstract_client.h"
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../pending_command.h"
 
 #include <QFileIconProvider>
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index 44cad3d9b..154184184 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -1,9 +1,9 @@
 #include "user_context_menu.h"
 
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_game.h"
 #include "../../tabs/tab_supervisor.h"
-#include "../abstract_client.h"
 #include "../chat_view/chat_view.h"
 #include "../game_selector.h"
 #include "../pending_command.h"
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index 59422203b..1ac55f805 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,11 +1,11 @@
 #include "user_info_box.h"
 
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../client/get_text_with_max.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
 #include "../../dialogs/dlg_edit_user.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../abstract_client.h"
 #include "../pending_command.h"
 
 #include <QDateTime>
diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp
index 47fd86f88..0ea1bea16 100644
--- a/cockatrice/src/server/user/user_list_manager.cpp
+++ b/cockatrice/src/server/user/user_list_manager.cpp
@@ -1,7 +1,7 @@
 #include "user_list_manager.h"
 
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../client/sound_engine.h"
-#include "../abstract_client.h"
 #include "../pending_command.h"
 #include "user_info_box.h"
 
diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp
index 0a0cf4dbf..191fbcc65 100644
--- a/cockatrice/src/server/user/user_list_widget.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,9 +1,9 @@
 #include "user_list_widget.h"
 
+#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_supervisor.h"
-#include "../abstract_client.h"
 #include "../game_selector.h"
 #include "../pending_command.h"
 #include "user_context_menu.h"
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
index 8fc81f1d6..4972efe43 100644
--- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
@@ -1,5 +1,6 @@
 #include "abstract_tab_deck_editor.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/tapped_out_interface.h"
 #include "../deck/deck_stats_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -8,7 +9,6 @@
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
-#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "tab_supervisor.h"
 
diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp
index 34b06f1ee..4ddb48a87 100644
--- a/cockatrice/src/tabs/tab_account.cpp
+++ b/cockatrice/src/tabs/tab_account.cpp
@@ -1,8 +1,8 @@
 #include "tab_account.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
-#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_info_box.h"
 #include "../server/user/user_list_manager.h"
diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp
index d8a4b52b7..5d3143a5b 100644
--- a/cockatrice/src/tabs/tab_admin.cpp
+++ b/cockatrice/src/tabs/tab_admin.cpp
@@ -1,6 +1,6 @@
 #include "tab_admin.h"
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../server/pending_command.h"
 
 #include <QDialogButtonBox>
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp
index 2e5f14649..fd5ad826b 100644
--- a/cockatrice/src/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/tab_deck_editor.cpp
@@ -1,5 +1,6 @@
 #include "tab_deck_editor.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/deck_editor_menu.h"
 #include "../client/tapped_out_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -9,7 +10,6 @@
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
-#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "tab_supervisor.h"
 
diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h
index ae52bba85..4da7f8fa4 100644
--- a/cockatrice/src/tabs/tab_deck_storage.h
+++ b/cockatrice/src/tabs/tab_deck_storage.h
@@ -8,7 +8,7 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp
index 103cecf8b..37311a3c9 100644
--- a/cockatrice/src/tabs/tab_game.cpp
+++ b/cockatrice/src/tabs/tab_game.cpp
@@ -1,5 +1,6 @@
 #include "tab_game.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/network/replay_timeline_widget.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../game/board/arrow_item.h"
@@ -20,7 +21,6 @@
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/window_main.h"
 #include "../main.h"
-#include "../server/abstract_client.h"
 #include "../server/user/user_list_manager.h"
 #include "tab_supervisor.h"
 
diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h
index 26a372884..84cea8c8f 100644
--- a/cockatrice/src/tabs/tab_home.h
+++ b/cockatrice/src/tabs/tab_home.h
@@ -7,8 +7,8 @@
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../interface/widgets/general/home_widget.h"
-#include "../server/abstract_client.h"
 #include "tab.h"
 
 #include <QHBoxLayout>
diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp
index c1722df5a..b82101933 100644
--- a/cockatrice/src/tabs/tab_logs.cpp
+++ b/cockatrice/src/tabs/tab_logs.cpp
@@ -1,8 +1,8 @@
 #include "tab_logs.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../deck/custom_line_edit.h"
 #include "../dialogs/dlg_manage_sets.h"
-#include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp
index 4ca598518..8b11ec274 100644
--- a/cockatrice/src/tabs/tab_message.cpp
+++ b/cockatrice/src/tabs/tab_message.cpp
@@ -1,9 +1,9 @@
 #include "tab_message.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
-#include "../server/abstract_client.h"
 #include "../server/chat_view/chat_view.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp
index adb75e79e..6c2e6f574 100644
--- a/cockatrice/src/tabs/tab_replays.cpp
+++ b/cockatrice/src/tabs/tab_replays.cpp
@@ -1,6 +1,6 @@
 #include "tab_replays.h"
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/remote/remote_replay_list_tree_widget.h"
 #include "tab_game.h"
diff --git a/cockatrice/src/tabs/tab_replays.h b/cockatrice/src/tabs/tab_replays.h
index 7a29abe1f..1035cec2f 100644
--- a/cockatrice/src/tabs/tab_replays.h
+++ b/cockatrice/src/tabs/tab_replays.h
@@ -8,7 +8,7 @@
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "tab.h"
 
 class ServerInfo_User;
diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp
index a691a3b6a..d8932d467 100644
--- a/cockatrice/src/tabs/tab_room.cpp
+++ b/cockatrice/src/tabs/tab_room.cpp
@@ -1,8 +1,8 @@
 #include "tab_room.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../dialogs/dlg_settings.h"
 #include "../main.h"
-#include "../server/abstract_client.h"
 #include "../server/chat_view/chat_view.h"
 #include "../server/game_selector.h"
 #include "../server/pending_command.h"
diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp
index fbfc5b11a..5e50285b2 100644
--- a/cockatrice/src/tabs/tab_server.cpp
+++ b/cockatrice/src/tabs/tab_server.cpp
@@ -1,6 +1,6 @@
 #include "tab_server.h"
 
-#include "../server/abstract_client.h"
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_list_widget.h"
 #include "tab_supervisor.h"
diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp
index 99b3f71a9..44352f6f4 100644
--- a/cockatrice/src/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/tabs/tab_supervisor.cpp
@@ -1,8 +1,8 @@
 #include "tab_supervisor.h"
 
+#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
 #include "../interface/pixel_map_generator.h"
 #include "../main.h"
-#include "../server/abstract_client.h"
 #include "../server/user/user_list_manager.h"
 #include "../server/user/user_list_widget.h"
 #include "api/edhrec/tab_edhrec_main.h"
diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/CMakeLists.txt b/libcockatrice_network/libcockatrice/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/CMakeLists.txt
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/client/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/cockatrice/src/server/abstract_client.cpp b/libcockatrice_network/libcockatrice/client/abstract_client.cpp
similarity index 98%
rename from cockatrice/src/server/abstract_client.cpp
rename to libcockatrice_network/libcockatrice/client/abstract_client.cpp
index 03c5fc3ae..1b594a779 100644
--- a/cockatrice/src/server/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/client/abstract_client.cpp
@@ -1,6 +1,6 @@
-#include "abstract_client.h"
+#include "../../../cockatrice/src/server/abstract_client.h"
 
-#include "pending_command.h"
+#include "../../../cockatrice/src/server/pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
diff --git a/cockatrice/src/server/abstract_client.h b/libcockatrice_network/libcockatrice/client/abstract_client.h
similarity index 100%
rename from cockatrice/src/server/abstract_client.h
rename to libcockatrice_network/libcockatrice/client/abstract_client.h
diff --git a/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/client/local/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/cockatrice/src/server/local_client.cpp b/libcockatrice_network/libcockatrice/client/local/local_client.cpp
similarity index 95%
rename from cockatrice/src/server/local_client.cpp
rename to libcockatrice_network/libcockatrice/client/local/local_client.cpp
index f227a2f28..be3f4b739 100644
--- a/cockatrice/src/server/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/client/local/local_client.cpp
@@ -1,6 +1,6 @@
 #include "local_client.h"
 
-#include "local_server_interface.h"
+#include "../../server/local/local_server_interface.h"
 
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/server/debug_pb_message.h>
diff --git a/cockatrice/src/server/local_client.h b/libcockatrice_network/libcockatrice/client/local/local_client.h
similarity index 95%
rename from cockatrice/src/server/local_client.h
rename to libcockatrice_network/libcockatrice/client/local/local_client.h
index 2523e1d51..871c953dc 100644
--- a/cockatrice/src/server/local_client.h
+++ b/libcockatrice_network/libcockatrice/client/local/local_client.h
@@ -7,7 +7,7 @@
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
 
-#include "abstract_client.h"
+#include "../abstract_client.h"
 
 #include <QLoggingCategory>
 
diff --git a/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/cockatrice/src/server/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
similarity index 99%
rename from cockatrice/src/server/remote/remote_client.cpp
rename to libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
index 9de8677b0..86ecb871c 100644
--- a/cockatrice/src/server/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
@@ -1,7 +1,7 @@
 #include "remote_client.h"
 
-#include "../../main.h"
-#include "../pending_command.h"
+#include "../../../../cockatrice/src/main.h"
+#include "../../../../cockatrice/src/server/pending_command.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
diff --git a/cockatrice/src/server/remote/remote_client.h b/libcockatrice_network/libcockatrice/client/remote/remote_client.h
similarity index 100%
rename from cockatrice/src/server/remote/remote_client.h
rename to libcockatrice_network/libcockatrice/client/remote/remote_client.h
diff --git a/libcockatrice_network/libcockatrice/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/server/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/server/local/CMakeLists.txt
@@ -0,0 +1,31 @@
+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/cockatrice/src/server/local_server.cpp b/libcockatrice_network/libcockatrice/server/local/local_server.cpp
similarity index 96%
rename from cockatrice/src/server/local_server.cpp
rename to libcockatrice_network/libcockatrice/server/local/local_server.cpp
index 381b30de7..cc2ee51dc 100644
--- a/cockatrice/src/server/local_server.cpp
+++ b/libcockatrice_network/libcockatrice/server/local/local_server.cpp
@@ -1,4 +1,4 @@
-#include "local_server.h"
+#include "../../../cockatrice/src/server/local_server.h"
 
 #include "local_server_interface.h"
 
diff --git a/cockatrice/src/server/local_server.h b/libcockatrice_network/libcockatrice/server/local/local_server.h
similarity index 100%
rename from cockatrice/src/server/local_server.h
rename to libcockatrice_network/libcockatrice/server/local/local_server.h
diff --git a/cockatrice/src/server/local_server_interface.cpp b/libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
similarity index 88%
rename from cockatrice/src/server/local_server_interface.cpp
rename to libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
index bb86198af..b927d2acd 100644
--- a/cockatrice/src/server/local_server_interface.cpp
+++ b/libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
@@ -1,4 +1,4 @@
-#include "local_server_interface.h"
+#include "../../../cockatrice/src/server/local_server_interface.h"
 
 #include "local_server.h"
 
diff --git a/cockatrice/src/server/local_server_interface.h b/libcockatrice_network/libcockatrice/server/local/local_server_interface.h
similarity index 100%
rename from cockatrice/src/server/local_server_interface.h
rename to libcockatrice_network/libcockatrice/server/local/local_server_interface.h
diff --git a/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt
new file mode 100644
index 000000000..05d8e9021
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/server/remote/CMakeLists.txt
@@ -0,0 +1,31 @@
+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}
+)