diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 731c55369..370f0738f 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -5,128 +5,128 @@
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 set(cockatrice_SOURCES
-    src/abstractcarddragitem.cpp
-    src/abstractcarditem.cpp
-    src/abstractclient.cpp
-    src/abstractcounter.cpp
-    src/abstractgraphicsitem.cpp
-    src/arrowitem.cpp
-    src/arrowtarget.cpp
-    src/carddatabase.cpp
-    src/carddatabasemodel.cpp
-    src/carddbparser/carddatabaseparser.cpp
-    src/carddbparser/cockatricexml3.cpp
-    src/carddbparser/cockatricexml4.cpp
-    src/carddragitem.cpp
-    src/cardfilter.cpp
-    src/cardframe.cpp
-    src/cardinfopicture.cpp
-    src/cardinfotext.cpp
-    src/cardinfowidget.cpp
-    src/carditem.cpp
-    src/cardlist.cpp
-    src/cardzone.cpp
-    src/chatview/chatview.cpp
-    src/counter_general.cpp
-    src/customlineedit.cpp
-    src/deck_loader.cpp
-    src/decklistmodel.cpp
-    src/deckstats_interface.cpp
-    src/deckview.cpp
-    src/dlg_connect.cpp
-    src/dlg_create_token.cpp
-    src/dlg_creategame.cpp
-    src/dlg_edit_avatar.cpp
-    src/dlg_edit_password.cpp
-    src/dlg_edit_tokens.cpp
-    src/dlg_edit_user.cpp
-    src/dlg_filter_games.cpp
-    src/dlg_forgotpasswordchallenge.cpp
-    src/dlg_forgotpasswordrequest.cpp
-    src/dlg_forgotpasswordreset.cpp
-    src/dlg_load_deck_from_clipboard.cpp
-    src/dlg_load_remote_deck.cpp
-    src/dlg_manage_sets.cpp
-    src/dlg_register.cpp
-    src/dlg_roll_dice.cpp
-    src/dlg_settings.cpp
-    src/dlg_tip_of_the_day.cpp
-    src/dlg_update.cpp
-    src/dlg_viewlog.cpp
-    src/filter_string.cpp
-    src/filterbuilder.cpp
-    src/filtertree.cpp
-    src/filtertreemodel.cpp
-    src/gamescene.cpp
-    src/gameselector.cpp
-    src/gamesmodel.cpp
-    src/gameview.cpp
-    src/gettextwithmax.cpp
-    src/handcounter.cpp
-    src/handle_public_servers.cpp
-    src/handzone.cpp
-    src/keysignals.cpp
-    src/lineeditcompleter.cpp
-    src/localclient.cpp
-    src/localserver.cpp
-    src/localserverinterface.cpp
-    src/logger.cpp
+    src/game/cards/abstract_card_drag_item.cpp
+    src/game/cards/abstract_card_item.cpp
+    src/client/game_logic/abstract_client.cpp
+    src/game/board/abstract_counter.cpp
+    src/game/board/abstract_graphics_item.cpp
+    src/game/board/arrow_item.cpp
+    src/game/board/arrow_target.cpp
+    src/game/cards/card_database.cpp
+    src/game/cards/card_database_model.cpp
+    src/game/cards/card_database_parser/card_database_parser.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    src/game/cards/card_drag_item.cpp
+    src/game/filters/filter_card.cpp
+    src/game/cards/card_frame.cpp
+    src/game/cards/card_info_picture.cpp
+    src/game/cards/card_info_text.cpp
+    src/game/cards/card_info_widget.cpp
+    src/game/cards/card_item.cpp
+    src/game/cards/card_list.cpp
+    src/game/zones/card_zone.cpp
+    src/server/chat_view/chat_view.cpp
+    src/game/board/counter_general.cpp
+    src/deck/custom_line_edit.cpp
+    src/deck/deck_loader.cpp
+    src/deck/deck_list_model.cpp
+    src/deck/deck_stats_interface.cpp
+    src/deck/deck_view.cpp
+    src/dialogs/dlg_connect.cpp
+    src/dialogs/dlg_create_token.cpp
+    src/dialogs/dlg_create_game.cpp
+    src/dialogs/dlg_edit_avatar.cpp
+    src/dialogs/dlg_edit_password.cpp
+    src/dialogs/dlg_edit_tokens.cpp
+    src/dialogs/dlg_edit_user.cpp
+    src/dialogs/dlg_filter_games.cpp
+    src/dialogs/dlg_forgot_password_challenge.cpp
+    src/dialogs/dlg_forgot_password_request.cpp
+    src/dialogs/dlg_forgot_password_reset.cpp
+    src/dialogs/dlg_load_deck_from_clipboard.cpp
+    src/dialogs/dlg_load_remote_deck.cpp
+    src/dialogs/dlg_manage_sets.cpp
+    src/dialogs/dlg_register.cpp
+    src/dialogs/dlg_roll_dice.cpp
+    src/dialogs/dlg_settings.cpp
+    src/dialogs/dlg_tip_of_the_day.cpp
+    src/dialogs/dlg_update.cpp
+    src/dialogs/dlg_view_log.cpp
+    src/game/filters/filter_string.cpp
+    src/game/filters/filter_builder.cpp
+    src/game/filters/filter_tree.cpp
+    src/game/filters/filter_tree_model.cpp
+    src/game/game_scene.cpp
+    src/game/game_selector.cpp
+    src/game/games_model.cpp
+    src/game/game_view.cpp
+    src/client/get_text_with_max.cpp
+    src/game/hand_counter.cpp
+    src/server/handle_public_servers.cpp
+    src/game/zones/hand_zone.cpp
+    src/client/game_logic/key_signals.cpp
+    src/client/ui/line_edit_completer.cpp
+    src/server/local_client.cpp
+    src/server/local_server.cpp
+    src/server/local_server_interface.cpp
+    src/utility/logger.cpp
     src/main.cpp
-    src/messagelogwidget.cpp
-    src/pending_command.cpp
-    src/phase.cpp
-    src/phasestoolbar.cpp
-    src/pictureloader.cpp
-    src/pilezone.cpp
-    src/pixmapgenerator.cpp
-    src/player.cpp
-    src/playerlistwidget.cpp
-    src/playertarget.cpp
-    src/releasechannel.cpp
-    src/remoteclient.cpp
-    src/remotedecklist_treewidget.cpp
-    src/remotereplaylist_treewidget.cpp
-    src/replay_timeline_widget.cpp
-    src/selectzone.cpp
-    src/sequenceEdit/sequenceedit.cpp
-    src/setsmodel.cpp
-    src/settings/carddatabasesettings.cpp
-    src/settings/downloadsettings.cpp
-    src/settings/gamefilterssettings.cpp
-    src/settings/layoutssettings.cpp
-    src/settings/messagesettings.cpp
-    src/settings/serverssettings.cpp
-    src/settings/settingsmanager.cpp
-    src/settingscache.cpp
-    src/shortcutssettings.cpp
-    src/soundengine.cpp
-    src/spoilerbackgroundupdater.cpp
-    src/stackzone.cpp
-    src/tab.cpp
-    src/tab_account.cpp
-    src/tab_admin.cpp
-    src/tab_deck_editor.cpp
-    src/tab_deck_storage.cpp
-    src/tab_game.cpp
-    src/tab_logs.cpp
-    src/tab_message.cpp
-    src/tab_replays.cpp
-    src/tab_room.cpp
-    src/tab_server.cpp
-    src/tab_supervisor.cpp
-    src/tablezone.cpp
-    src/tappedout_interface.cpp
-    src/thememanager.cpp
-    src/tip_of_the_day.cpp
-    src/translatecountername.cpp
-    src/update_downloader.cpp
-    src/user_context_menu.cpp
-    src/userconnection_information.cpp
-    src/userinfobox.cpp
-    src/userlist.cpp
-    src/window_main.cpp
-    src/zoneviewwidget.cpp
-    src/zoneviewzone.cpp
+    src/server/message_log_widget.cpp
+    src/server/pending_command.cpp
+    src/game/phase.cpp
+    src/client/ui/phases_toolbar.cpp
+    src/client/ui/picture_loader.cpp
+    src/game/zones/pile_zone.cpp
+    src/client/ui/pixel_map_generator.cpp
+    src/game/player/player.cpp
+    src/game/player/player_list_widget.cpp
+    src/game/player/player_target.cpp
+    src/client/network/release_channel.cpp
+    src/server/remote/remote_client.cpp
+    src/server/remote/remote_decklist_tree_widget.cpp
+    src/server/remote/remote_replay_list_tree_widget.cpp
+    src/client/network/replay_timeline_widget.cpp
+    src/game/zones/select_zone.cpp
+    src/utility/sequence_edit.cpp
+    src/client/network/sets_model.cpp
+    src/settings/card_database_settings.cpp
+    src/settings/download_settings.cpp
+    src/settings/game_filters_settings.cpp
+    src/settings/layouts_settings.cpp
+    src/settings/message_settings.cpp
+    src/settings/servers_settings.cpp
+    src/settings/settings_manager.cpp
+    src/settings/cache_settings.cpp
+    src/settings/shortcuts_settings.cpp
+    src/client/sound_engine.cpp
+    src/client/network/spoiler_background_updater.cpp
+    src/game/zones/stack_zone.cpp
+    src/client/tabs/tab.cpp
+    src/client/tabs/tab_account.cpp
+    src/client/tabs/tab_admin.cpp
+    src/client/tabs/tab_deck_editor.cpp
+    src/client/tabs/tab_deck_storage.cpp
+    src/client/tabs/tab_game.cpp
+    src/client/tabs/tab_logs.cpp
+    src/client/tabs/tab_message.cpp
+    src/client/tabs/tab_replays.cpp
+    src/client/tabs/tab_room.cpp
+    src/client/tabs/tab_server.cpp
+    src/client/tabs/tab_supervisor.cpp
+    src/game/zones/table_zone.cpp
+    src/client/tapped_out_interface.cpp
+    src/client/ui/theme_manager.cpp
+    src/client/ui/tip_of_the_day.cpp
+    src/client/translate_counter_name.cpp
+    src/client/update_downloader.cpp
+    src/server/user/user_context_menu.cpp
+    src/server/user/user_info_connection.cpp
+    src/server/user/user_info_box.cpp
+    src/server/user/user_list.cpp
+    src/client/ui/window_main.cpp
+    src/game/zones/view_zone_widget.cpp
+    src/game/zones/view_zone.cpp
     ${VERSION_STRING_CPP}
 )
 
diff --git a/cockatrice/src/abstractclient.cpp b/cockatrice/src/client/game_logic/abstract_client.cpp
similarity index 99%
rename from cockatrice/src/abstractclient.cpp
rename to cockatrice/src/client/game_logic/abstract_client.cpp
index 5f578c353..c186ae323 100644
--- a/cockatrice/src/abstractclient.cpp
+++ b/cockatrice/src/client/game_logic/abstract_client.cpp
@@ -1,5 +1,6 @@
-#include "abstractclient.h"
+#include "abstract_client.h"
 
+#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -17,7 +18,6 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
-#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 
diff --git a/cockatrice/src/abstractclient.h b/cockatrice/src/client/game_logic/abstract_client.h
similarity index 100%
rename from cockatrice/src/abstractclient.h
rename to cockatrice/src/client/game_logic/abstract_client.h
diff --git a/cockatrice/src/keysignals.cpp b/cockatrice/src/client/game_logic/key_signals.cpp
similarity index 98%
rename from cockatrice/src/keysignals.cpp
rename to cockatrice/src/client/game_logic/key_signals.cpp
index c8f75aab5..b4a38fad5 100644
--- a/cockatrice/src/keysignals.cpp
+++ b/cockatrice/src/client/game_logic/key_signals.cpp
@@ -1,4 +1,4 @@
-#include "keysignals.h"
+#include "key_signals.h"
 
 #include <QKeyEvent>
 
diff --git a/cockatrice/src/keysignals.h b/cockatrice/src/client/game_logic/key_signals.h
similarity index 100%
rename from cockatrice/src/keysignals.h
rename to cockatrice/src/client/game_logic/key_signals.h
diff --git a/cockatrice/src/gettextwithmax.cpp b/cockatrice/src/client/get_text_with_max.cpp
similarity index 96%
rename from cockatrice/src/gettextwithmax.cpp
rename to cockatrice/src/client/get_text_with_max.cpp
index 200661bba..73745be02 100644
--- a/cockatrice/src/gettextwithmax.cpp
+++ b/cockatrice/src/client/get_text_with_max.cpp
@@ -1,4 +1,4 @@
-#include "gettextwithmax.h"
+#include "get_text_with_max.h"
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
diff --git a/cockatrice/src/gettextwithmax.h b/cockatrice/src/client/get_text_with_max.h
similarity index 100%
rename from cockatrice/src/gettextwithmax.h
rename to cockatrice/src/client/get_text_with_max.h
diff --git a/cockatrice/src/releasechannel.cpp b/cockatrice/src/client/network/release_channel.cpp
similarity index 99%
rename from cockatrice/src/releasechannel.cpp
rename to cockatrice/src/client/network/release_channel.cpp
index 31a268185..b467aa4a4 100644
--- a/cockatrice/src/releasechannel.cpp
+++ b/cockatrice/src/client/network/release_channel.cpp
@@ -1,4 +1,4 @@
-#include "releasechannel.h"
+#include "release_channel.h"
 
 #include "version_string.h"
 
diff --git a/cockatrice/src/releasechannel.h b/cockatrice/src/client/network/release_channel.h
similarity index 100%
rename from cockatrice/src/releasechannel.h
rename to cockatrice/src/client/network/release_channel.h
diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/client/network/replay_timeline_widget.cpp
similarity index 100%
rename from cockatrice/src/replay_timeline_widget.cpp
rename to cockatrice/src/client/network/replay_timeline_widget.cpp
diff --git a/cockatrice/src/replay_timeline_widget.h b/cockatrice/src/client/network/replay_timeline_widget.h
similarity index 100%
rename from cockatrice/src/replay_timeline_widget.h
rename to cockatrice/src/client/network/replay_timeline_widget.h
diff --git a/cockatrice/src/setsmodel.cpp b/cockatrice/src/client/network/sets_model.cpp
similarity index 99%
rename from cockatrice/src/setsmodel.cpp
rename to cockatrice/src/client/network/sets_model.cpp
index b4a684176..de3521772 100644
--- a/cockatrice/src/setsmodel.cpp
+++ b/cockatrice/src/client/network/sets_model.cpp
@@ -1,4 +1,4 @@
-#include "setsmodel.h"
+#include "sets_model.h"
 
 #include <QSortFilterProxyModel>
 
diff --git a/cockatrice/src/setsmodel.h b/cockatrice/src/client/network/sets_model.h
similarity index 98%
rename from cockatrice/src/setsmodel.h
rename to cockatrice/src/client/network/sets_model.h
index b40a53906..20b5adbcb 100644
--- a/cockatrice/src/setsmodel.h
+++ b/cockatrice/src/client/network/sets_model.h
@@ -1,7 +1,7 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "carddatabase.h"
+#include "../../game/cards/card_database.h"
 
 #include <QAbstractTableModel>
 #include <QMimeData>
diff --git a/cockatrice/src/spoilerbackgroundupdater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp
similarity index 97%
rename from cockatrice/src/spoilerbackgroundupdater.cpp
rename to cockatrice/src/client/network/spoiler_background_updater.cpp
index 7fb55f167..58b182bf2 100644
--- a/cockatrice/src/spoilerbackgroundupdater.cpp
+++ b/cockatrice/src/client/network/spoiler_background_updater.cpp
@@ -1,9 +1,9 @@
-#include "spoilerbackgroundupdater.h"
+#include "spoiler_background_updater.h"
 
-#include "carddatabase.h"
-#include "main.h"
-#include "settingscache.h"
-#include "window_main.h"
+#include "../../game/cards/card_database.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
diff --git a/cockatrice/src/spoilerbackgroundupdater.h b/cockatrice/src/client/network/spoiler_background_updater.h
similarity index 100%
rename from cockatrice/src/spoilerbackgroundupdater.h
rename to cockatrice/src/client/network/spoiler_background_updater.h
diff --git a/cockatrice/src/soundengine.cpp b/cockatrice/src/client/sound_engine.cpp
similarity index 98%
rename from cockatrice/src/soundengine.cpp
rename to cockatrice/src/client/sound_engine.cpp
index f2918cf52..35cc6d5c7 100644
--- a/cockatrice/src/soundengine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -1,6 +1,6 @@
-#include "soundengine.h"
+#include "sound_engine.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QDir>
 #include <QMediaPlayer>
diff --git a/cockatrice/src/soundengine.h b/cockatrice/src/client/sound_engine.h
similarity index 100%
rename from cockatrice/src/soundengine.h
rename to cockatrice/src/client/sound_engine.h
diff --git a/cockatrice/src/tab.cpp b/cockatrice/src/client/tabs/tab.cpp
similarity index 96%
rename from cockatrice/src/tab.cpp
rename to cockatrice/src/client/tabs/tab.cpp
index 06cf377c8..f1af00d3d 100644
--- a/cockatrice/src/tab.cpp
+++ b/cockatrice/src/client/tabs/tab.cpp
@@ -1,6 +1,6 @@
 #include "tab.h"
 
-#include "cardinfowidget.h"
+#include "../../game/cards/card_info_widget.h"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/cockatrice/src/tab.h b/cockatrice/src/client/tabs/tab.h
similarity index 100%
rename from cockatrice/src/tab.h
rename to cockatrice/src/client/tabs/tab.h
diff --git a/cockatrice/src/tab_account.cpp b/cockatrice/src/client/tabs/tab_account.cpp
similarity index 97%
rename from cockatrice/src/tab_account.cpp
rename to cockatrice/src/client/tabs/tab_account.cpp
index f289f7da0..fab79bea1 100644
--- a/cockatrice/src/tab_account.cpp
+++ b/cockatrice/src/client/tabs/tab_account.cpp
@@ -1,18 +1,18 @@
 #include "tab_account.h"
 
-#include "abstractclient.h"
-#include "customlineedit.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_info_box.h"
+#include "../../server/user/user_list.h"
+#include "../game_logic/abstract_client.h"
+#include "../sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"
 #include "pb/event_user_joined.pb.h"
 #include "pb/event_user_left.pb.h"
 #include "pb/response_list_users.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "soundengine.h"
 #include "trice_limits.h"
-#include "userinfobox.h"
-#include "userlist.h"
 
 #include <QHBoxLayout>
 #include <QPushButton>
diff --git a/cockatrice/src/tab_account.h b/cockatrice/src/client/tabs/tab_account.h
similarity index 100%
rename from cockatrice/src/tab_account.h
rename to cockatrice/src/client/tabs/tab_account.h
diff --git a/cockatrice/src/tab_admin.cpp b/cockatrice/src/client/tabs/tab_admin.cpp
similarity index 99%
rename from cockatrice/src/tab_admin.cpp
rename to cockatrice/src/client/tabs/tab_admin.cpp
index 5610fa542..07031c1cc 100644
--- a/cockatrice/src/tab_admin.cpp
+++ b/cockatrice/src/client/tabs/tab_admin.cpp
@@ -1,6 +1,6 @@
 #include "tab_admin.h"
 
-#include "abstractclient.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/admin_commands.pb.h"
 #include "trice_limits.h"
 
diff --git a/cockatrice/src/tab_admin.h b/cockatrice/src/client/tabs/tab_admin.h
similarity index 100%
rename from cockatrice/src/tab_admin.h
rename to cockatrice/src/client/tabs/tab_admin.h
diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp
similarity index 98%
rename from cockatrice/src/tab_deck_editor.cpp
rename to cockatrice/src/client/tabs/tab_deck_editor.cpp
index 558a6a529..b7e976f63 100644
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp
@@ -1,22 +1,22 @@
 #include "tab_deck_editor.h"
 
-#include "abstractclient.h"
-#include "carddatabasemodel.h"
-#include "cardframe.h"
-#include "decklistmodel.h"
-#include "deckstats_interface.h"
-#include "dlg_load_deck_from_clipboard.h"
-#include "filterbuilder.h"
-#include "filtertreemodel.h"
-#include "main.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/tapped_out_interface.h"
+#include "../../deck/deck_list_model.h"
+#include "../../deck/deck_stats_interface.h"
+#include "../../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../../game/cards/card_database_model.h"
+#include "../../game/cards/card_frame.h"
+#include "../../game/filters/filter_builder.h"
+#include "../../game/filters/filter_tree_model.h"
+#include "../../main.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/picture_loader.h"
+#include "../ui/pixel_map_generator.h"
 #include "pb/command_deck_upload.pb.h"
 #include "pb/response.pb.h"
-#include "pending_command.h"
-#include "pictureloader.h"
-#include "pixmapgenerator.h"
-#include "settingscache.h"
 #include "tab_supervisor.h"
-#include "tappedout_interface.h"
 #include "trice_limits.h"
 
 #include <QAction>
diff --git a/cockatrice/src/tab_deck_editor.h b/cockatrice/src/client/tabs/tab_deck_editor.h
similarity index 97%
rename from cockatrice/src/tab_deck_editor.h
rename to cockatrice/src/client/tabs/tab_deck_editor.h
index 2eb643178..1b7a795a9 100644
--- a/cockatrice/src/tab_deck_editor.h
+++ b/cockatrice/src/client/tabs/tab_deck_editor.h
@@ -1,9 +1,9 @@
 #ifndef WINDOW_DECKEDITOR_H
 #define WINDOW_DECKEDITOR_H
 
-#include "carddatabase.h"
-#include "customlineedit.h"
-#include "keysignals.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../game/cards/card_database.h"
+#include "../game_logic/key_signals.h"
 #include "tab.h"
 
 #include <QAbstractItemModel>
diff --git a/cockatrice/src/tab_deck_storage.cpp b/cockatrice/src/client/tabs/tab_deck_storage.cpp
similarity index 98%
rename from cockatrice/src/tab_deck_storage.cpp
rename to cockatrice/src/client/tabs/tab_deck_storage.cpp
index fb52e3a62..8ab91e2be 100644
--- a/cockatrice/src/tab_deck_storage.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_storage.cpp
@@ -1,9 +1,12 @@
 #include "tab_deck_storage.h"
 
-#include "abstractclient.h"
-#include "deck_loader.h"
+#include "../../deck/deck_loader.h"
+#include "../../server/pending_command.h"
+#include "../../server/remote/remote_decklist_tree_widget.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../get_text_with_max.h"
 #include "decklist.h"
-#include "gettextwithmax.h"
 #include "pb/command_deck_del.pb.h"
 #include "pb/command_deck_del_dir.pb.h"
 #include "pb/command_deck_download.pb.h"
@@ -12,9 +15,6 @@
 #include "pb/response.pb.h"
 #include "pb/response_deck_download.pb.h"
 #include "pb/response_deck_upload.pb.h"
-#include "pending_command.h"
-#include "remotedecklist_treewidget.h"
-#include "settingscache.h"
 
 #include <QAction>
 #include <QApplication>
diff --git a/cockatrice/src/tab_deck_storage.h b/cockatrice/src/client/tabs/tab_deck_storage.h
similarity index 100%
rename from cockatrice/src/tab_deck_storage.h
rename to cockatrice/src/client/tabs/tab_deck_storage.h
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
similarity index 98%
rename from cockatrice/src/tab_game.cpp
rename to cockatrice/src/client/tabs/tab_game.cpp
index 796659112..a5f718b67 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -1,21 +1,31 @@
 #include "tab_game.h"
 
-#include "abstractclient.h"
-#include "arrowitem.h"
-#include "carddatabase.h"
-#include "cardframe.h"
-#include "carditem.h"
-#include "deck_loader.h"
-#include "deckview.h"
-#include "dlg_creategame.h"
-#include "dlg_load_remote_deck.h"
-#include "dlg_manage_sets.h"
-#include "gamescene.h"
-#include "gameview.h"
+#include "../../deck/deck_loader.h"
+#include "../../deck/deck_view.h"
+#include "../../dialogs/dlg_create_game.h"
+#include "../../dialogs/dlg_load_remote_deck.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../game/board/arrow_item.h"
+#include "../../game/cards/card_database.h"
+#include "../../game/cards/card_frame.h"
+#include "../../game/cards/card_item.h"
+#include "../../game/game_scene.h"
+#include "../../game/game_view.h"
+#include "../../game/player/player.h"
+#include "../../game/player/player_list_widget.h"
+#include "../../game/zones/view_zone.h"
+#include "../../game/zones/view_zone_widget.h"
+#include "../../main.h"
+#include "../../server/message_log_widget.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../network/replay_timeline_widget.h"
+#include "../ui/line_edit_completer.h"
+#include "../ui/phases_toolbar.h"
+#include "../ui/picture_loader.h"
+#include "../ui/window_main.h"
 #include "get_pb_extension.h"
-#include "lineeditcompleter.h"
-#include "main.h"
-#include "messagelogwidget.h"
 #include "pb/command_concede.pb.h"
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_delete_arrow.pb.h"
@@ -45,18 +55,8 @@
 #include "pb/game_event_container.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/response_deck_download.pb.h"
-#include "pending_command.h"
-#include "phasestoolbar.h"
-#include "pictureloader.h"
-#include "player.h"
-#include "playerlistwidget.h"
-#include "replay_timeline_widget.h"
-#include "settingscache.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
-#include "window_main.h"
-#include "zoneviewwidget.h"
-#include "zoneviewzone.h"
 
 #include <QAction>
 #include <QCompleter>
diff --git a/cockatrice/src/tab_game.h b/cockatrice/src/client/tabs/tab_game.h
similarity index 99%
rename from cockatrice/src/tab_game.h
rename to cockatrice/src/client/tabs/tab_game.h
index 655c19e0a..a1d1bdc28 100644
--- a/cockatrice/src/tab_game.h
+++ b/cockatrice/src/client/tabs/tab_game.h
@@ -1,10 +1,10 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
+#include "../../client/tearoff_menu.h"
 #include "pb/event_leave.pb.h"
 #include "pb/serverinfo_game.pb.h"
 #include "tab.h"
-#include "tearoffmenu.h"
 
 #include <QCompleter>
 #include <QMap>
diff --git a/cockatrice/src/tab_logs.cpp b/cockatrice/src/client/tabs/tab_logs.cpp
similarity index 98%
rename from cockatrice/src/tab_logs.cpp
rename to cockatrice/src/client/tabs/tab_logs.cpp
index dd4ee9c50..b9d06dee2 100644
--- a/cockatrice/src/tab_logs.cpp
+++ b/cockatrice/src/client/tabs/tab_logs.cpp
@@ -1,11 +1,11 @@
 #include "tab_logs.h"
 
-#include "abstractclient.h"
-#include "customlineedit.h"
-#include "dlg_manage_sets.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../server/pending_command.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_viewlog_history.pb.h"
-#include "pending_command.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/tab_logs.h b/cockatrice/src/client/tabs/tab_logs.h
similarity index 100%
rename from cockatrice/src/tab_logs.h
rename to cockatrice/src/client/tabs/tab_logs.h
diff --git a/cockatrice/src/tab_message.cpp b/cockatrice/src/client/tabs/tab_message.cpp
similarity index 95%
rename from cockatrice/src/tab_message.cpp
rename to cockatrice/src/client/tabs/tab_message.cpp
index 8c7dac2b5..21fc0e265 100644
--- a/cockatrice/src/tab_message.cpp
+++ b/cockatrice/src/client/tabs/tab_message.cpp
@@ -1,15 +1,15 @@
 #include "tab_message.h"
 
-#include "abstractclient.h"
-#include "chatview/chatview.h"
-#include "customlineedit.h"
-#include "main.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../main.h"
+#include "../../server/chat_view/chat_view.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../sound_engine.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
-#include "soundengine.h"
 #include "trice_limits.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/tab_message.h b/cockatrice/src/client/tabs/tab_message.h
similarity index 100%
rename from cockatrice/src/tab_message.h
rename to cockatrice/src/client/tabs/tab_message.h
diff --git a/cockatrice/src/tab_replays.cpp b/cockatrice/src/client/tabs/tab_replays.cpp
similarity index 98%
rename from cockatrice/src/tab_replays.cpp
rename to cockatrice/src/client/tabs/tab_replays.cpp
index c284a531e..3a3655d79 100644
--- a/cockatrice/src/tab_replays.cpp
+++ b/cockatrice/src/client/tabs/tab_replays.cpp
@@ -1,6 +1,9 @@
 #include "tab_replays.h"
 
-#include "abstractclient.h"
+#include "../../server/pending_command.h"
+#include "../../server/remote/remote_replay_list_tree_widget.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/command_replay_delete_match.pb.h"
 #include "pb/command_replay_download.pb.h"
 #include "pb/command_replay_modify_match.pb.h"
@@ -8,9 +11,6 @@
 #include "pb/game_replay.pb.h"
 #include "pb/response.pb.h"
 #include "pb/response_replay_download.pb.h"
-#include "pending_command.h"
-#include "remotereplaylist_treewidget.h"
-#include "settingscache.h"
 #include "tab_game.h"
 
 #include <QAction>
diff --git a/cockatrice/src/tab_replays.h b/cockatrice/src/client/tabs/tab_replays.h
similarity index 100%
rename from cockatrice/src/tab_replays.h
rename to cockatrice/src/client/tabs/tab_replays.h
diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp
similarity index 97%
rename from cockatrice/src/tab_room.cpp
rename to cockatrice/src/client/tabs/tab_room.cpp
index fc260d175..034a236ce 100644
--- a/cockatrice/src/tab_room.cpp
+++ b/cockatrice/src/client/tabs/tab_room.cpp
@@ -1,11 +1,14 @@
 #include "tab_room.h"
 
-#include "abstractclient.h"
-#include "chatview/chatview.h"
-#include "dlg_settings.h"
-#include "gameselector.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../dialogs/dlg_settings.h"
+#include "../../game/game_selector.h"
+#include "../../main.h"
+#include "../../server/chat_view/chat_view.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_list.h"
+#include "../../settings/cache_settings.h"
 #include "get_pb_extension.h"
-#include "main.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
 #include "pb/event_list_games.pb.h"
@@ -13,12 +16,9 @@
 #include "pb/event_room_say.pb.h"
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_room.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
 #include "tab_account.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
-#include "userlist.h"
 
 #include <QApplication>
 #include <QCompleter>
diff --git a/cockatrice/src/tab_room.h b/cockatrice/src/client/tabs/tab_room.h
similarity index 98%
rename from cockatrice/src/tab_room.h
rename to cockatrice/src/client/tabs/tab_room.h
index d9e6d9246..a01943742 100644
--- a/cockatrice/src/tab_room.h
+++ b/cockatrice/src/client/tabs/tab_room.h
@@ -1,7 +1,7 @@
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "lineeditcompleter.h"
+#include "../ui/line_edit_completer.h"
 #include "tab.h"
 
 #include <QFocusEvent>
diff --git a/cockatrice/src/tab_server.cpp b/cockatrice/src/client/tabs/tab_server.cpp
similarity index 98%
rename from cockatrice/src/tab_server.cpp
rename to cockatrice/src/client/tabs/tab_server.cpp
index 03919f364..e0906e8d4 100644
--- a/cockatrice/src/tab_server.cpp
+++ b/cockatrice/src/client/tabs/tab_server.cpp
@@ -1,13 +1,13 @@
 #include "tab_server.h"
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_list.h"
 #include "pb/event_list_rooms.pb.h"
 #include "pb/event_server_message.pb.h"
 #include "pb/response_join_room.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
 #include "tab_supervisor.h"
-#include "userlist.h"
 
 #include <QCheckBox>
 #include <QDebug>
diff --git a/cockatrice/src/tab_server.h b/cockatrice/src/client/tabs/tab_server.h
similarity index 100%
rename from cockatrice/src/tab_server.h
rename to cockatrice/src/client/tabs/tab_server.h
diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
similarity index 99%
rename from cockatrice/src/tab_supervisor.cpp
rename to cockatrice/src/client/tabs/tab_supervisor.cpp
index 5649b046c..567469249 100644
--- a/cockatrice/src/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -1,7 +1,10 @@
 #include "tab_supervisor.h"
 
-#include "abstractclient.h"
-#include "main.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../main.h"
+#include "../../server/user/user_list.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/pixel_map_generator.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_notify_user.pb.h"
 #include "pb/event_user_message.pb.h"
@@ -11,8 +14,6 @@
 #include "pb/room_event.pb.h"
 #include "pb/serverinfo_room.pb.h"
 #include "pb/serverinfo_user.pb.h"
-#include "pixmapgenerator.h"
-#include "settingscache.h"
 #include "tab_account.h"
 #include "tab_admin.h"
 #include "tab_deck_editor.h"
@@ -23,7 +24,6 @@
 #include "tab_replays.h"
 #include "tab_room.h"
 #include "tab_server.h"
-#include "userlist.h"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/cockatrice/src/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h
similarity index 97%
rename from cockatrice/src/tab_supervisor.h
rename to cockatrice/src/client/tabs/tab_supervisor.h
index 1e4c0f949..7b43881d3 100644
--- a/cockatrice/src/tab_supervisor.h
+++ b/cockatrice/src/client/tabs/tab_supervisor.h
@@ -1,8 +1,8 @@
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "chatview/userlistProxy.h"
-#include "deck_loader.h"
+#include "../../deck/deck_loader.h"
+#include "../../server/chat_view/user_list_proxy.h"
 
 #include <QAbstractButton>
 #include <QCommonStyle>
diff --git a/cockatrice/src/tappedout_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp
similarity index 99%
rename from cockatrice/src/tappedout_interface.cpp
rename to cockatrice/src/client/tapped_out_interface.cpp
index aad61e250..c0cbab095 100644
--- a/cockatrice/src/tappedout_interface.cpp
+++ b/cockatrice/src/client/tapped_out_interface.cpp
@@ -1,4 +1,4 @@
-#include "tappedout_interface.h"
+#include "tapped_out_interface.h"
 
 #include "decklist.h"
 
diff --git a/cockatrice/src/tappedout_interface.h b/cockatrice/src/client/tapped_out_interface.h
similarity index 95%
rename from cockatrice/src/tappedout_interface.h
rename to cockatrice/src/client/tapped_out_interface.h
index 670e00030..239a3ee18 100644
--- a/cockatrice/src/tappedout_interface.h
+++ b/cockatrice/src/client/tapped_out_interface.h
@@ -1,7 +1,7 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 #include "decklist.h"
 
 #include <QObject>
diff --git a/cockatrice/src/tearoffmenu.h b/cockatrice/src/client/tearoff_menu.h
similarity index 95%
rename from cockatrice/src/tearoffmenu.h
rename to cockatrice/src/client/tearoff_menu.h
index 14a3a26e2..20ee30e10 100644
--- a/cockatrice/src/tearoffmenu.h
+++ b/cockatrice/src/client/tearoff_menu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QMenu>
 
diff --git a/cockatrice/src/translatecountername.cpp b/cockatrice/src/client/translate_counter_name.cpp
similarity index 94%
rename from cockatrice/src/translatecountername.cpp
rename to cockatrice/src/client/translate_counter_name.cpp
index 0f2813883..4f1c97657 100644
--- a/cockatrice/src/translatecountername.cpp
+++ b/cockatrice/src/client/translate_counter_name.cpp
@@ -1,4 +1,4 @@
-#include "translatecountername.h"
+#include "translate_counter_name.h"
 
 const QMap<QString, QString> TranslateCounterName::translated = {
     {"life", QT_TRANSLATE_NOOP("TranslateCounterName", "Life")},
diff --git a/cockatrice/src/translatecountername.h b/cockatrice/src/client/translate_counter_name.h
similarity index 100%
rename from cockatrice/src/translatecountername.h
rename to cockatrice/src/client/translate_counter_name.h
diff --git a/cockatrice/src/translation.h b/cockatrice/src/client/translation.h
similarity index 100%
rename from cockatrice/src/translation.h
rename to cockatrice/src/client/translation.h
diff --git a/cockatrice/src/lineeditcompleter.cpp b/cockatrice/src/client/ui/line_edit_completer.cpp
similarity index 99%
rename from cockatrice/src/lineeditcompleter.cpp
rename to cockatrice/src/client/ui/line_edit_completer.cpp
index f8cad38aa..31e82248d 100644
--- a/cockatrice/src/lineeditcompleter.cpp
+++ b/cockatrice/src/client/ui/line_edit_completer.cpp
@@ -1,4 +1,4 @@
-#include "lineeditcompleter.h"
+#include "line_edit_completer.h"
 
 #include <QAbstractItemView>
 #include <QCompleter>
diff --git a/cockatrice/src/lineeditcompleter.h b/cockatrice/src/client/ui/line_edit_completer.h
similarity index 93%
rename from cockatrice/src/lineeditcompleter.h
rename to cockatrice/src/client/ui/line_edit_completer.h
index 5be1562d2..2eadb8347 100644
--- a/cockatrice/src/lineeditcompleter.h
+++ b/cockatrice/src/client/ui/line_edit_completer.h
@@ -1,7 +1,7 @@
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
-#include "customlineedit.h"
+#include "../../deck/custom_line_edit.h"
 
 #include <QFocusEvent>
 #include <QKeyEvent>
diff --git a/cockatrice/src/phasestoolbar.cpp b/cockatrice/src/client/ui/phases_toolbar.cpp
similarity index 99%
rename from cockatrice/src/phasestoolbar.cpp
rename to cockatrice/src/client/ui/phases_toolbar.cpp
index a0202782c..fdc0227ba 100644
--- a/cockatrice/src/phasestoolbar.cpp
+++ b/cockatrice/src/client/ui/phases_toolbar.cpp
@@ -1,10 +1,10 @@
-#include "phasestoolbar.h"
+#include "phases_toolbar.h"
 
 #include "pb/command_draw_cards.pb.h"
 #include "pb/command_next_turn.pb.h"
 #include "pb/command_set_active_phase.pb.h"
 #include "pb/command_set_card_attr.pb.h"
-#include "pixmapgenerator.h"
+#include "pixel_map_generator.h"
 
 #include <QAction>
 #include <QDebug>
diff --git a/cockatrice/src/phasestoolbar.h b/cockatrice/src/client/ui/phases_toolbar.h
similarity index 97%
rename from cockatrice/src/phasestoolbar.h
rename to cockatrice/src/client/ui/phases_toolbar.h
index 2de1cfe6a..3567e741b 100644
--- a/cockatrice/src/phasestoolbar.h
+++ b/cockatrice/src/client/ui/phases_toolbar.h
@@ -1,7 +1,7 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "abstractgraphicsitem.h"
+#include "../../game/board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>
diff --git a/cockatrice/src/pictureloader.cpp b/cockatrice/src/client/ui/picture_loader.cpp
similarity index 99%
rename from cockatrice/src/pictureloader.cpp
rename to cockatrice/src/client/ui/picture_loader.cpp
index 27fb106ff..087862651 100644
--- a/cockatrice/src/pictureloader.cpp
+++ b/cockatrice/src/client/ui/picture_loader.cpp
@@ -1,9 +1,9 @@
-#include "pictureloader.h"
+#include "picture_loader.h"
 
-#include "carddatabase.h"
-#include "main.h"
-#include "settingscache.h"
-#include "thememanager.h"
+#include "../../game/cards/card_database.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "theme_manager.h"
 
 #include <QApplication>
 #include <QBuffer>
diff --git a/cockatrice/src/pictureloader.h b/cockatrice/src/client/ui/picture_loader.h
similarity index 98%
rename from cockatrice/src/pictureloader.h
rename to cockatrice/src/client/ui/picture_loader.h
index 65eafaea6..1c840eb40 100644
--- a/cockatrice/src/pictureloader.h
+++ b/cockatrice/src/client/ui/picture_loader.h
@@ -1,7 +1,7 @@
 #ifndef PICTURELOADER_H
 #define PICTURELOADER_H
 
-#include "carddatabase.h"
+#include "../../game/cards/card_database.h"
 
 #include <QList>
 #include <QMap>
diff --git a/cockatrice/src/pixmapgenerator.cpp b/cockatrice/src/client/ui/pixel_map_generator.cpp
similarity index 99%
rename from cockatrice/src/pixmapgenerator.cpp
rename to cockatrice/src/client/ui/pixel_map_generator.cpp
index 66d9283bb..09dc2d1ae 100644
--- a/cockatrice/src/pixmapgenerator.cpp
+++ b/cockatrice/src/client/ui/pixel_map_generator.cpp
@@ -1,4 +1,4 @@
-#include "pixmapgenerator.h"
+#include "pixel_map_generator.h"
 
 #include "pb/serverinfo_user.pb.h"
 
diff --git a/cockatrice/src/pixmapgenerator.h b/cockatrice/src/client/ui/pixel_map_generator.h
similarity index 100%
rename from cockatrice/src/pixmapgenerator.h
rename to cockatrice/src/client/ui/pixel_map_generator.h
diff --git a/cockatrice/src/thememanager.cpp b/cockatrice/src/client/ui/theme_manager.cpp
similarity index 98%
rename from cockatrice/src/thememanager.cpp
rename to cockatrice/src/client/ui/theme_manager.cpp
index 45d3b10e0..249032dfa 100644
--- a/cockatrice/src/thememanager.cpp
+++ b/cockatrice/src/client/ui/theme_manager.cpp
@@ -1,6 +1,6 @@
-#include "thememanager.h"
+#include "theme_manager.h"
 
-#include "settingscache.h"
+#include "../../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QColor>
diff --git a/cockatrice/src/thememanager.h b/cockatrice/src/client/ui/theme_manager.h
similarity index 100%
rename from cockatrice/src/thememanager.h
rename to cockatrice/src/client/ui/theme_manager.h
diff --git a/cockatrice/src/tip_of_the_day.cpp b/cockatrice/src/client/ui/tip_of_the_day.cpp
similarity index 100%
rename from cockatrice/src/tip_of_the_day.cpp
rename to cockatrice/src/client/ui/tip_of_the_day.cpp
diff --git a/cockatrice/src/tip_of_the_day.h b/cockatrice/src/client/ui/tip_of_the_day.h
similarity index 100%
rename from cockatrice/src/tip_of_the_day.h
rename to cockatrice/src/client/ui/tip_of_the_day.h
diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/client/ui/window_main.cpp
similarity index 98%
rename from cockatrice/src/window_main.cpp
rename to cockatrice/src/client/ui/window_main.cpp
index 8c7a51b19..346fd24e6 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/client/ui/window_main.cpp
@@ -19,32 +19,32 @@
  ***************************************************************************/
 #include "window_main.h"
 
-#include "carddatabase.h"
-#include "dlg_connect.h"
-#include "dlg_edit_tokens.h"
-#include "dlg_forgotpasswordchallenge.h"
-#include "dlg_forgotpasswordrequest.h"
-#include "dlg_forgotpasswordreset.h"
-#include "dlg_manage_sets.h"
-#include "dlg_register.h"
-#include "dlg_settings.h"
-#include "dlg_tip_of_the_day.h"
-#include "dlg_update.h"
-#include "dlg_viewlog.h"
-#include "gettextwithmax.h"
-#include "localclient.h"
-#include "localserver.h"
-#include "localserverinterface.h"
-#include "logger.h"
-#include "main.h"
+#include "../../dialogs/dlg_connect.h"
+#include "../../dialogs/dlg_edit_tokens.h"
+#include "../../dialogs/dlg_forgot_password_challenge.h"
+#include "../../dialogs/dlg_forgot_password_request.h"
+#include "../../dialogs/dlg_forgot_password_reset.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../dialogs/dlg_register.h"
+#include "../../dialogs/dlg_settings.h"
+#include "../../dialogs/dlg_tip_of_the_day.h"
+#include "../../dialogs/dlg_update.h"
+#include "../../dialogs/dlg_view_log.h"
+#include "../../game/cards/card_database.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 "../../settings/cache_settings.h"
+#include "../../utility/logger.h"
+#include "../get_text_with_max.h"
+#include "../tabs/tab_game.h"
+#include "../tabs/tab_supervisor.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_server_shutdown.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/room_commands.pb.h"
-#include "remoteclient.h"
-#include "settingscache.h"
-#include "tab_game.h"
-#include "tab_supervisor.h"
 #include "version_string.h"
 
 #include <QAction>
diff --git a/cockatrice/src/window_main.h b/cockatrice/src/client/ui/window_main.h
similarity index 99%
rename from cockatrice/src/window_main.h
rename to cockatrice/src/client/ui/window_main.h
index bc5acb2ec..1813b3b4a 100644
--- a/cockatrice/src/window_main.h
+++ b/cockatrice/src/client/ui/window_main.h
@@ -20,7 +20,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "abstractclient.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/response.pb.h"
 
 #include <QList>
diff --git a/cockatrice/src/update_downloader.cpp b/cockatrice/src/client/update_downloader.cpp
similarity index 100%
rename from cockatrice/src/update_downloader.cpp
rename to cockatrice/src/client/update_downloader.cpp
diff --git a/cockatrice/src/update_downloader.h b/cockatrice/src/client/update_downloader.h
similarity index 100%
rename from cockatrice/src/update_downloader.h
rename to cockatrice/src/client/update_downloader.h
diff --git a/cockatrice/src/customlineedit.cpp b/cockatrice/src/deck/custom_line_edit.cpp
similarity index 93%
rename from cockatrice/src/customlineedit.cpp
rename to cockatrice/src/deck/custom_line_edit.cpp
index 0afdac3a9..bbbb544d5 100644
--- a/cockatrice/src/customlineedit.cpp
+++ b/cockatrice/src/deck/custom_line_edit.cpp
@@ -1,7 +1,7 @@
-#include "customlineedit.h"
+#include "custom_line_edit.h"
 
-#include "settingscache.h"
-#include "shortcutssettings.h"
+#include "../settings/cache_settings.h"
+#include "../settings/shortcuts_settings.h"
 
 #include <QKeyEvent>
 #include <QLineEdit>
diff --git a/cockatrice/src/customlineedit.h b/cockatrice/src/deck/custom_line_edit.h
similarity index 100%
rename from cockatrice/src/customlineedit.h
rename to cockatrice/src/deck/custom_line_edit.h
diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/deck/deck_list_model.cpp
similarity index 99%
rename from cockatrice/src/decklistmodel.cpp
rename to cockatrice/src/deck/deck_list_model.cpp
index 6d09d3812..942d715ac 100644
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/deck/deck_list_model.cpp
@@ -1,9 +1,9 @@
-#include "decklistmodel.h"
+#include "deck_list_model.h"
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "deck_loader.h"
-#include "main.h"
-#include "settingscache.h"
 
 #include <QBrush>
 #include <QFile>
diff --git a/cockatrice/src/decklistmodel.h b/cockatrice/src/deck/deck_list_model.h
similarity index 100%
rename from cockatrice/src/decklistmodel.h
rename to cockatrice/src/deck/deck_list_model.h
diff --git a/cockatrice/src/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
similarity index 99%
rename from cockatrice/src/deck_loader.cpp
rename to cockatrice/src/deck/deck_loader.cpp
index af5b77783..3d7c5831b 100644
--- a/cockatrice/src/deck_loader.cpp
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -1,8 +1,8 @@
 #include "deck_loader.h"
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
 #include "decklist.h"
-#include "main.h"
 
 #include <QDebug>
 #include <QFile>
diff --git a/cockatrice/src/deck_loader.h b/cockatrice/src/deck/deck_loader.h
similarity index 100%
rename from cockatrice/src/deck_loader.h
rename to cockatrice/src/deck/deck_loader.h
diff --git a/cockatrice/src/deckstats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp
similarity index 98%
rename from cockatrice/src/deckstats_interface.cpp
rename to cockatrice/src/deck/deck_stats_interface.cpp
index b5d8370c6..038565370 100644
--- a/cockatrice/src/deckstats_interface.cpp
+++ b/cockatrice/src/deck/deck_stats_interface.cpp
@@ -1,4 +1,4 @@
-#include "deckstats_interface.h"
+#include "deck_stats_interface.h"
 
 #include "decklist.h"
 
diff --git a/cockatrice/src/deckstats_interface.h b/cockatrice/src/deck/deck_stats_interface.h
similarity index 95%
rename from cockatrice/src/deckstats_interface.h
rename to cockatrice/src/deck/deck_stats_interface.h
index 6738c35b4..4798ee67b 100644
--- a/cockatrice/src/deckstats_interface.h
+++ b/cockatrice/src/deck/deck_stats_interface.h
@@ -1,7 +1,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 #include "decklist.h"
 
 #include <QObject>
diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deck/deck_view.cpp
similarity index 99%
rename from cockatrice/src/deckview.cpp
rename to cockatrice/src/deck/deck_view.cpp
index 252d655c3..ff58fc882 100644
--- a/cockatrice/src/deckview.cpp
+++ b/cockatrice/src/deck/deck_view.cpp
@@ -1,10 +1,10 @@
-#include "deckview.h"
+#include "deck_view.h"
 
-#include "carddatabase.h"
+#include "../client/ui/theme_manager.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "decklist.h"
-#include "main.h"
-#include "settingscache.h"
-#include "thememanager.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
@@ -517,4 +517,4 @@ void DeckView::setDeck(const DeckList &_deck)
 void DeckView::resetSideboardPlan()
 {
     deckViewScene->resetSideboardPlan();
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/deckview.h b/cockatrice/src/deck/deck_view.h
similarity index 98%
rename from cockatrice/src/deckview.h
rename to cockatrice/src/deck/deck_view.h
index 8aab1dc25..11068d97b 100644
--- a/cockatrice/src/deckview.h
+++ b/cockatrice/src/deck/deck_view.h
@@ -1,7 +1,7 @@
 #ifndef DECKVIEW_H
 #define DECKVIEW_H
 
-#include "abstractcarddragitem.h"
+#include "../game/cards/abstract_card_drag_item.h"
 #include "pb/move_card_to_zone.pb.h"
 
 #include <QGraphicsScene>
diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dialogs/dlg_connect.cpp
similarity index 99%
rename from cockatrice/src/dlg_connect.cpp
rename to cockatrice/src/dialogs/dlg_connect.cpp
index 3a2fbc0d5..a4b097efc 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dialogs/dlg_connect.cpp
@@ -1,8 +1,8 @@
 #include "dlg_connect.h"
 
-#include "settingscache.h"
+#include "../server/user/user_info_connection.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
-#include "userconnection_information.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -361,4 +361,4 @@ void DlgConnect::actForgotPassword()
 
     emit sigStartForgotPasswordRequest();
     reject();
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h
similarity index 95%
rename from cockatrice/src/dlg_connect.h
rename to cockatrice/src/dialogs/dlg_connect.h
index f7f70b630..c48875290 100644
--- a/cockatrice/src/dlg_connect.h
+++ b/cockatrice/src/dialogs/dlg_connect.h
@@ -1,8 +1,8 @@
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
-#include "handle_public_servers.h"
-#include "userconnection_information.h"
+#include "../server/handle_public_servers.h"
+#include "../server/user/user_info_connection.h"
 
 #include <QDialog>
 #include <QLineEdit>
diff --git a/cockatrice/src/dlg_creategame.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp
similarity index 98%
rename from cockatrice/src/dlg_creategame.cpp
rename to cockatrice/src/dialogs/dlg_create_game.cpp
index 7dbada5d2..ab7698856 100644
--- a/cockatrice/src/dlg_creategame.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@@ -1,9 +1,9 @@
-#include "dlg_creategame.h"
+#include "dlg_create_game.h"
 
+#include "../client/tabs/tab_room.h"
+#include "../server/pending_command.h"
+#include "../settings/cache_settings.h"
 #include "pb/serverinfo_game.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
-#include "tab_room.h"
 #include "trice_limits.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/dlg_creategame.h b/cockatrice/src/dialogs/dlg_create_game.h
similarity index 100%
rename from cockatrice/src/dlg_creategame.h
rename to cockatrice/src/dialogs/dlg_create_game.h
diff --git a/cockatrice/src/dlg_create_token.cpp b/cockatrice/src/dialogs/dlg_create_token.cpp
similarity index 98%
rename from cockatrice/src/dlg_create_token.cpp
rename to cockatrice/src/dialogs/dlg_create_token.cpp
index 6aedf2cc3..c668fe04b 100644
--- a/cockatrice/src/dlg_create_token.cpp
+++ b/cockatrice/src/dialogs/dlg_create_token.cpp
@@ -1,10 +1,10 @@
 #include "dlg_create_token.h"
 
-#include "carddatabasemodel.h"
-#include "cardinfopicture.h"
+#include "../game/cards/card_database_model.h"
+#include "../game/cards/card_info_picture.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "decklist.h"
-#include "main.h"
-#include "settingscache.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dlg_create_token.h b/cockatrice/src/dialogs/dlg_create_token.h
similarity index 100%
rename from cockatrice/src/dlg_create_token.h
rename to cockatrice/src/dialogs/dlg_create_token.h
diff --git a/cockatrice/src/dlg_edit_avatar.cpp b/cockatrice/src/dialogs/dlg_edit_avatar.cpp
similarity index 100%
rename from cockatrice/src/dlg_edit_avatar.cpp
rename to cockatrice/src/dialogs/dlg_edit_avatar.cpp
diff --git a/cockatrice/src/dlg_edit_avatar.h b/cockatrice/src/dialogs/dlg_edit_avatar.h
similarity index 100%
rename from cockatrice/src/dlg_edit_avatar.h
rename to cockatrice/src/dialogs/dlg_edit_avatar.h
diff --git a/cockatrice/src/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp
similarity index 98%
rename from cockatrice/src/dlg_edit_password.cpp
rename to cockatrice/src/dialogs/dlg_edit_password.cpp
index 95787ad37..e29169c31 100644
--- a/cockatrice/src/dlg_edit_password.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_password.cpp
@@ -1,6 +1,6 @@
 #include "dlg_edit_password.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QDialogButtonBox>
diff --git a/cockatrice/src/dlg_edit_password.h b/cockatrice/src/dialogs/dlg_edit_password.h
similarity index 100%
rename from cockatrice/src/dlg_edit_password.h
rename to cockatrice/src/dialogs/dlg_edit_password.h
diff --git a/cockatrice/src/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
similarity index 97%
rename from cockatrice/src/dlg_edit_tokens.cpp
rename to cockatrice/src/dialogs/dlg_edit_tokens.cpp
index 6bf048e1c..6275e90bb 100644
--- a/cockatrice/src/dlg_edit_tokens.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
@@ -1,9 +1,9 @@
 #include "dlg_edit_tokens.h"
 
-#include "carddatabase.h"
-#include "carddatabasemodel.h"
-#include "gettextwithmax.h"
-#include "main.h"
+#include "../client/get_text_with_max.h"
+#include "../game/cards/card_database.h"
+#include "../game/cards/card_database_model.h"
+#include "../main.h"
 #include "trice_limits.h"
 
 #include <QAction>
diff --git a/cockatrice/src/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h
similarity index 95%
rename from cockatrice/src/dlg_edit_tokens.h
rename to cockatrice/src/dialogs/dlg_edit_tokens.h
index 2c7c8ebc9..e5befe892 100644
--- a/cockatrice/src/dlg_edit_tokens.h
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.h
@@ -1,7 +1,7 @@
 #ifndef DLG_EDIT_TOKENS_H
 #define DLG_EDIT_TOKENS_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 
 #include <QDialog>
 
diff --git a/cockatrice/src/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp
similarity index 98%
rename from cockatrice/src/dlg_edit_user.cpp
rename to cockatrice/src/dialogs/dlg_edit_user.cpp
index dbe91e31c..088a5fe71 100644
--- a/cockatrice/src/dlg_edit_user.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_user.cpp
@@ -1,6 +1,6 @@
 #include "dlg_edit_user.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QDebug>
diff --git a/cockatrice/src/dlg_edit_user.h b/cockatrice/src/dialogs/dlg_edit_user.h
similarity index 100%
rename from cockatrice/src/dlg_edit_user.h
rename to cockatrice/src/dialogs/dlg_edit_user.h
diff --git a/cockatrice/src/dlg_filter_games.cpp b/cockatrice/src/dialogs/dlg_filter_games.cpp
similarity index 100%
rename from cockatrice/src/dlg_filter_games.cpp
rename to cockatrice/src/dialogs/dlg_filter_games.cpp
diff --git a/cockatrice/src/dlg_filter_games.h b/cockatrice/src/dialogs/dlg_filter_games.h
similarity index 98%
rename from cockatrice/src/dlg_filter_games.h
rename to cockatrice/src/dialogs/dlg_filter_games.h
index 24c048ca8..0b1fd333c 100644
--- a/cockatrice/src/dlg_filter_games.h
+++ b/cockatrice/src/dialogs/dlg_filter_games.h
@@ -1,7 +1,7 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "gamesmodel.h"
+#include "../game/games_model.h"
 
 #include <QCheckBox>
 #include <QComboBox>
diff --git a/cockatrice/src/dlg_forgotpasswordchallenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
similarity index 97%
rename from cockatrice/src/dlg_forgotpasswordchallenge.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
index 75412b591..57aa240ae 100644
--- a/cockatrice/src/dlg_forgotpasswordchallenge.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordchallenge.h"
+#include "dlg_forgot_password_challenge.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dlg_forgotpasswordchallenge.h b/cockatrice/src/dialogs/dlg_forgot_password_challenge.h
similarity index 100%
rename from cockatrice/src/dlg_forgotpasswordchallenge.h
rename to cockatrice/src/dialogs/dlg_forgot_password_challenge.h
diff --git a/cockatrice/src/dlg_forgotpasswordrequest.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp
similarity index 97%
rename from cockatrice/src/dlg_forgotpasswordrequest.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_request.cpp
index 9849f236d..1370a1100 100644
--- a/cockatrice/src/dlg_forgotpasswordrequest.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp
@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordrequest.h"
+#include "dlg_forgot_password_request.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dlg_forgotpasswordrequest.h b/cockatrice/src/dialogs/dlg_forgot_password_request.h
similarity index 100%
rename from cockatrice/src/dlg_forgotpasswordrequest.h
rename to cockatrice/src/dialogs/dlg_forgot_password_request.h
diff --git a/cockatrice/src/dlg_forgotpasswordreset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
similarity index 98%
rename from cockatrice/src/dlg_forgotpasswordreset.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
index 79ef053c5..12fe8eaca 100644
--- a/cockatrice/src/dlg_forgotpasswordreset.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordreset.h"
+#include "dlg_forgot_password_reset.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dlg_forgotpasswordreset.h b/cockatrice/src/dialogs/dlg_forgot_password_reset.h
similarity index 100%
rename from cockatrice/src/dlg_forgotpasswordreset.h
rename to cockatrice/src/dialogs/dlg_forgot_password_reset.h
diff --git a/cockatrice/src/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
similarity index 96%
rename from cockatrice/src/dlg_load_deck_from_clipboard.cpp
rename to cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
index 3fe183514..e3673d1a3 100644
--- a/cockatrice/src/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
@@ -1,7 +1,7 @@
 #include "dlg_load_deck_from_clipboard.h"
 
-#include "deck_loader.h"
-#include "settingscache.h"
+#include "../deck/deck_loader.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/cockatrice/src/dlg_load_deck_from_clipboard.h b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
similarity index 100%
rename from cockatrice/src/dlg_load_deck_from_clipboard.h
rename to cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
diff --git a/cockatrice/src/dlg_load_remote_deck.cpp b/cockatrice/src/dialogs/dlg_load_remote_deck.cpp
similarity index 94%
rename from cockatrice/src/dlg_load_remote_deck.cpp
rename to cockatrice/src/dialogs/dlg_load_remote_deck.cpp
index cd32e0f6c..d49f5a593 100644
--- a/cockatrice/src/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/dialogs/dlg_load_remote_deck.cpp
@@ -1,7 +1,7 @@
 #include "dlg_load_remote_deck.h"
 
-#include "main.h"
-#include "remotedecklist_treewidget.h"
+#include "../main.h"
+#include "../server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
diff --git a/cockatrice/src/dlg_load_remote_deck.h b/cockatrice/src/dialogs/dlg_load_remote_deck.h
similarity index 100%
rename from cockatrice/src/dlg_load_remote_deck.h
rename to cockatrice/src/dialogs/dlg_load_remote_deck.h
diff --git a/cockatrice/src/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp
similarity index 98%
rename from cockatrice/src/dlg_manage_sets.cpp
rename to cockatrice/src/dialogs/dlg_manage_sets.cpp
index 1f163e9d3..153018a2d 100644
--- a/cockatrice/src/dlg_manage_sets.cpp
+++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp
@@ -1,10 +1,10 @@
 #include "dlg_manage_sets.h"
 
-#include "customlineedit.h"
-#include "main.h"
-#include "pictureloader.h"
-#include "setsmodel.h"
-#include "settingscache.h"
+#include "../client/network/sets_model.h"
+#include "../client/ui/picture_loader.h"
+#include "../deck/custom_line_edit.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 
 #include <QAction>
 #include <QDebug>
diff --git a/cockatrice/src/dlg_manage_sets.h b/cockatrice/src/dialogs/dlg_manage_sets.h
similarity index 100%
rename from cockatrice/src/dlg_manage_sets.h
rename to cockatrice/src/dialogs/dlg_manage_sets.h
diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dialogs/dlg_register.cpp
similarity index 99%
rename from cockatrice/src/dlg_register.cpp
rename to cockatrice/src/dialogs/dlg_register.cpp
index 51c2d4dae..1f0a715c6 100644
--- a/cockatrice/src/dlg_register.cpp
+++ b/cockatrice/src/dialogs/dlg_register.cpp
@@ -1,7 +1,7 @@
 #include "dlg_register.h"
 
+#include "../settings/cache_settings.h"
 #include "pb/serverinfo_user.pb.h"
-#include "settingscache.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dlg_register.h b/cockatrice/src/dialogs/dlg_register.h
similarity index 100%
rename from cockatrice/src/dlg_register.h
rename to cockatrice/src/dialogs/dlg_register.h
diff --git a/cockatrice/src/dlg_roll_dice.cpp b/cockatrice/src/dialogs/dlg_roll_dice.cpp
similarity index 100%
rename from cockatrice/src/dlg_roll_dice.cpp
rename to cockatrice/src/dialogs/dlg_roll_dice.cpp
diff --git a/cockatrice/src/dlg_roll_dice.h b/cockatrice/src/dialogs/dlg_roll_dice.h
similarity index 100%
rename from cockatrice/src/dlg_roll_dice.h
rename to cockatrice/src/dialogs/dlg_roll_dice.h
diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp
similarity index 99%
rename from cockatrice/src/dlg_settings.cpp
rename to cockatrice/src/dialogs/dlg_settings.cpp
index fdf57e9ef..c18ef6711 100644
--- a/cockatrice/src/dlg_settings.cpp
+++ b/cockatrice/src/dialogs/dlg_settings.cpp
@@ -1,15 +1,15 @@
 #include "dlg_settings.h"
 
-#include "carddatabase.h"
-#include "gettextwithmax.h"
-#include "main.h"
-#include "pictureloader.h"
-#include "releasechannel.h"
-#include "sequenceEdit/sequenceedit.h"
-#include "settingscache.h"
-#include "soundengine.h"
-#include "spoilerbackgroundupdater.h"
-#include "thememanager.h"
+#include "../client/get_text_with_max.h"
+#include "../client/network/release_channel.h"
+#include "../client/network/spoiler_background_updater.h"
+#include "../client/sound_engine.h"
+#include "../client/ui/picture_loader.h"
+#include "../client/ui/theme_manager.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
+#include "../utility/sequence_edit.h"
 
 #include <QAction>
 #include <QApplication>
diff --git a/cockatrice/src/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h
similarity index 100%
rename from cockatrice/src/dlg_settings.h
rename to cockatrice/src/dialogs/dlg_settings.h
diff --git a/cockatrice/src/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
similarity index 98%
rename from cockatrice/src/dlg_tip_of_the_day.cpp
rename to cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
index e8a87d628..c4b75ccd0 100644
--- a/cockatrice/src/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
@@ -1,7 +1,7 @@
 #include "dlg_tip_of_the_day.h"
 
-#include "settingscache.h"
-#include "tip_of_the_day.h"
+#include "../client/ui/tip_of_the_day.h"
+#include "../settings/cache_settings.h"
 
 #include <QCheckBox>
 #include <QDate>
diff --git a/cockatrice/src/dlg_tip_of_the_day.h b/cockatrice/src/dialogs/dlg_tip_of_the_day.h
similarity index 100%
rename from cockatrice/src/dlg_tip_of_the_day.h
rename to cockatrice/src/dialogs/dlg_tip_of_the_day.h
diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp
similarity index 98%
rename from cockatrice/src/dlg_update.cpp
rename to cockatrice/src/dialogs/dlg_update.cpp
index 98d318adc..21f08f827 100644
--- a/cockatrice/src/dlg_update.cpp
+++ b/cockatrice/src/dialogs/dlg_update.cpp
@@ -1,8 +1,8 @@
 #include "dlg_update.h"
 
-#include "releasechannel.h"
-#include "settingscache.h"
-#include "window_main.h"
+#include "../client/network/release_channel.h"
+#include "../client/ui/window_main.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QDesktopServices>
diff --git a/cockatrice/src/dlg_update.h b/cockatrice/src/dialogs/dlg_update.h
similarity index 96%
rename from cockatrice/src/dlg_update.h
rename to cockatrice/src/dialogs/dlg_update.h
index 42cfc5f58..0eaa3ba76 100644
--- a/cockatrice/src/dlg_update.h
+++ b/cockatrice/src/dialogs/dlg_update.h
@@ -1,7 +1,7 @@
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "update_downloader.h"
+#include "../client/update_downloader.h"
 
 #include <QDialogButtonBox>
 #include <QProgressDialog>
diff --git a/cockatrice/src/dlg_viewlog.cpp b/cockatrice/src/dialogs/dlg_view_log.cpp
similarity index 93%
rename from cockatrice/src/dlg_viewlog.cpp
rename to cockatrice/src/dialogs/dlg_view_log.cpp
index 22ec9d2df..545da6ad4 100644
--- a/cockatrice/src/dlg_viewlog.cpp
+++ b/cockatrice/src/dialogs/dlg_view_log.cpp
@@ -1,7 +1,7 @@
-#include "dlg_viewlog.h"
+#include "dlg_view_log.h"
 
-#include "logger.h"
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
+#include "../utility/logger.h"
 
 #include <QPlainTextEdit>
 #include <QVBoxLayout>
diff --git a/cockatrice/src/dlg_viewlog.h b/cockatrice/src/dialogs/dlg_view_log.h
similarity index 100%
rename from cockatrice/src/dlg_viewlog.h
rename to cockatrice/src/dialogs/dlg_view_log.h
diff --git a/cockatrice/src/abstractcounter.cpp b/cockatrice/src/game/board/abstract_counter.cpp
similarity index 97%
rename from cockatrice/src/abstractcounter.cpp
rename to cockatrice/src/game/board/abstract_counter.cpp
index 17057c969..10c51a638 100644
--- a/cockatrice/src/abstractcounter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@@ -1,11 +1,11 @@
-#include "abstractcounter.h"
+#include "abstract_counter.h"
 
+#include "../../client/translate_counter_name.h"
+#include "../../settings/cache_settings.h"
+#include "../player/player.h"
 #include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "translatecountername.h"
 
 #include <QAction>
 #include <QApplication>
diff --git a/cockatrice/src/abstractcounter.h b/cockatrice/src/game/board/abstract_counter.h
similarity index 98%
rename from cockatrice/src/abstractcounter.h
rename to cockatrice/src/game/board/abstract_counter.h
index 374e292b3..24d2f1243 100644
--- a/cockatrice/src/abstractcounter.h
+++ b/cockatrice/src/game/board/abstract_counter.h
@@ -1,7 +1,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "tearoffmenu.h"
+#include "../../client/tearoff_menu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
diff --git a/cockatrice/src/abstractgraphicsitem.cpp b/cockatrice/src/game/board/abstract_graphics_item.cpp
similarity index 98%
rename from cockatrice/src/abstractgraphicsitem.cpp
rename to cockatrice/src/game/board/abstract_graphics_item.cpp
index e6a646465..8ced8d5bc 100644
--- a/cockatrice/src/abstractgraphicsitem.cpp
+++ b/cockatrice/src/game/board/abstract_graphics_item.cpp
@@ -1,4 +1,4 @@
-#include "abstractgraphicsitem.h"
+#include "abstract_graphics_item.h"
 
 #include <QPainter>
 
diff --git a/cockatrice/src/abstractgraphicsitem.h b/cockatrice/src/game/board/abstract_graphics_item.h
similarity index 100%
rename from cockatrice/src/abstractgraphicsitem.h
rename to cockatrice/src/game/board/abstract_graphics_item.h
diff --git a/cockatrice/src/arrowitem.cpp b/cockatrice/src/game/board/arrow_item.cpp
similarity index 97%
rename from cockatrice/src/arrowitem.cpp
rename to cockatrice/src/game/board/arrow_item.cpp
index 5d0bc70ba..430ea6adc 100644
--- a/cockatrice/src/arrowitem.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -1,16 +1,16 @@
 #define _USE_MATH_DEFINES
-#include "arrowitem.h"
+#include "arrow_item.h"
 
-#include "carddatabase.h"
-#include "carditem.h"
-#include "cardzone.h"
+#include "../../settings/cache_settings.h"
+#include "../cards/card_database.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
+#include "../player/player_target.h"
+#include "../zones/card_zone.h"
 #include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_create_arrow.pb.h"
 #include "pb/command_delete_arrow.pb.h"
-#include "player.h"
-#include "playertarget.h"
-#include "settingscache.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
diff --git a/cockatrice/src/arrowitem.h b/cockatrice/src/game/board/arrow_item.h
similarity index 100%
rename from cockatrice/src/arrowitem.h
rename to cockatrice/src/game/board/arrow_item.h
diff --git a/cockatrice/src/arrowtarget.cpp b/cockatrice/src/game/board/arrow_target.cpp
similarity index 87%
rename from cockatrice/src/arrowtarget.cpp
rename to cockatrice/src/game/board/arrow_target.cpp
index f0123f847..e844757dd 100644
--- a/cockatrice/src/arrowtarget.cpp
+++ b/cockatrice/src/game/board/arrow_target.cpp
@@ -1,7 +1,7 @@
-#include "arrowtarget.h"
+#include "arrow_target.h"
 
-#include "arrowitem.h"
-#include "player.h"
+#include "../player/player.h"
+#include "arrow_item.h"
 
 ArrowTarget::ArrowTarget(Player *_owner, QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), owner(_owner), beingPointedAt(false)
diff --git a/cockatrice/src/arrowtarget.h b/cockatrice/src/game/board/arrow_target.h
similarity index 96%
rename from cockatrice/src/arrowtarget.h
rename to cockatrice/src/game/board/arrow_target.h
index 43852db11..3f8f2135f 100644
--- a/cockatrice/src/arrowtarget.h
+++ b/cockatrice/src/game/board/arrow_target.h
@@ -1,7 +1,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "abstractgraphicsitem.h"
+#include "abstract_graphics_item.h"
 
 #include <QList>
 
diff --git a/cockatrice/src/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp
similarity index 94%
rename from cockatrice/src/counter_general.cpp
rename to cockatrice/src/game/board/counter_general.cpp
index e33ce58aa..3089dc3f1 100644
--- a/cockatrice/src/counter_general.cpp
+++ b/cockatrice/src/game/board/counter_general.cpp
@@ -1,7 +1,7 @@
 #include "counter_general.h"
 
-#include "abstractgraphicsitem.h"
-#include "pixmapgenerator.h"
+#include "../../client/ui/pixel_map_generator.h"
+#include "abstract_graphics_item.h"
 
 #include <QPainter>
 
diff --git a/cockatrice/src/counter_general.h b/cockatrice/src/game/board/counter_general.h
similarity index 95%
rename from cockatrice/src/counter_general.h
rename to cockatrice/src/game/board/counter_general.h
index 409c97fe2..150ce2659 100644
--- a/cockatrice/src/counter_general.h
+++ b/cockatrice/src/game/board/counter_general.h
@@ -1,7 +1,7 @@
 #ifndef COUNTER_GENERAL_H
 #define COUNTER_GENERAL_H
 
-#include "abstractcounter.h"
+#include "abstract_counter.h"
 
 class GeneralCounter : public AbstractCounter
 {
diff --git a/cockatrice/src/abstractcarddragitem.cpp b/cockatrice/src/game/cards/abstract_card_drag_item.cpp
similarity index 96%
rename from cockatrice/src/abstractcarddragitem.cpp
rename to cockatrice/src/game/cards/abstract_card_drag_item.cpp
index a52879ed5..e9fe30c50 100644
--- a/cockatrice/src/abstractcarddragitem.cpp
+++ b/cockatrice/src/game/cards/abstract_card_drag_item.cpp
@@ -1,6 +1,6 @@
-#include "abstractcarddragitem.h"
+#include "abstract_card_drag_item.h"
 
-#include "carddatabase.h"
+#include "card_database.h"
 
 #include <QCursor>
 #include <QDebug>
diff --git a/cockatrice/src/abstractcarddragitem.h b/cockatrice/src/game/cards/abstract_card_drag_item.h
similarity index 97%
rename from cockatrice/src/abstractcarddragitem.h
rename to cockatrice/src/game/cards/abstract_card_drag_item.h
index 682c2a6b9..491a7043c 100644
--- a/cockatrice/src/abstractcarddragitem.h
+++ b/cockatrice/src/game/cards/abstract_card_drag_item.h
@@ -1,7 +1,7 @@
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
-#include "abstractcarditem.h"
+#include "abstract_card_item.h"
 
 class QGraphicsScene;
 class CardZone;
diff --git a/cockatrice/src/abstractcarditem.cpp b/cockatrice/src/game/cards/abstract_card_item.cpp
similarity index 97%
rename from cockatrice/src/abstractcarditem.cpp
rename to cockatrice/src/game/cards/abstract_card_item.cpp
index dcbbcd030..e7d902b31 100644
--- a/cockatrice/src/abstractcarditem.cpp
+++ b/cockatrice/src/game/cards/abstract_card_item.cpp
@@ -1,10 +1,10 @@
-#include "abstractcarditem.h"
+#include "abstract_card_item.h"
 
-#include "carddatabase.h"
-#include "gamescene.h"
-#include "main.h"
-#include "pictureloader.h"
-#include "settingscache.h"
+#include "../../client/ui/picture_loader.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../game_scene.h"
+#include "card_database.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
diff --git a/cockatrice/src/abstractcarditem.h b/cockatrice/src/game/cards/abstract_card_item.h
similarity index 97%
rename from cockatrice/src/abstractcarditem.h
rename to cockatrice/src/game/cards/abstract_card_item.h
index 98ef4d1aa..864783bbc 100644
--- a/cockatrice/src/abstractcarditem.h
+++ b/cockatrice/src/game/cards/abstract_card_item.h
@@ -1,8 +1,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "arrowtarget.h"
-#include "carddatabase.h"
+#include "../board/arrow_target.h"
+#include "card_database.h"
 
 class Player;
 
diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/game/cards/card_database.cpp
similarity index 98%
rename from cockatrice/src/carddatabase.cpp
rename to cockatrice/src/game/cards/card_database.cpp
index 5adf8c505..480645f44 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/game/cards/card_database.cpp
@@ -1,11 +1,11 @@
-#include "carddatabase.h"
+#include "card_database.h"
 
-#include "carddbparser/cockatricexml3.h"
-#include "carddbparser/cockatricexml4.h"
-#include "game_specific_terms.h"
-#include "pictureloader.h"
-#include "settingscache.h"
-#include "spoilerbackgroundupdater.h"
+#include "../../client/network/spoiler_background_updater.h"
+#include "../../client/ui/picture_loader.h"
+#include "../../settings/cache_settings.h"
+#include "../game_specific_terms.h"
+#include "./card_database_parser/cockatrice_xml_3.h"
+#include "./card_database_parser/cockatrice_xml_4.h"
 
 #include <QCryptographicHash>
 #include <QDebug>
diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/game/cards/card_database.h
similarity index 100%
rename from cockatrice/src/carddatabase.h
rename to cockatrice/src/game/cards/card_database.h
diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/game/cards/card_database_model.cpp
similarity index 99%
rename from cockatrice/src/carddatabasemodel.cpp
rename to cockatrice/src/game/cards/card_database_model.cpp
index e9e1de8b8..81af0f2ae 100644
--- a/cockatrice/src/carddatabasemodel.cpp
+++ b/cockatrice/src/game/cards/card_database_model.cpp
@@ -1,6 +1,6 @@
-#include "carddatabasemodel.h"
+#include "card_database_model.h"
 
-#include "filtertree.h"
+#include "../filters/filter_tree.h"
 
 #include <QMap>
 
diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/game/cards/card_database_model.h
similarity index 98%
rename from cockatrice/src/carddatabasemodel.h
rename to cockatrice/src/game/cards/card_database_model.h
index ab890e6b8..403713c98 100644
--- a/cockatrice/src/carddatabasemodel.h
+++ b/cockatrice/src/game/cards/card_database_model.h
@@ -1,8 +1,8 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "carddatabase.h"
-#include "filter_string.h"
+#include "../filters/filter_string.h"
+#include "card_database.h"
 
 #include <QAbstractListModel>
 #include <QList>
diff --git a/cockatrice/src/carddbparser/carddatabaseparser.cpp b/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
similarity index 95%
rename from cockatrice/src/carddbparser/carddatabaseparser.cpp
rename to cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
index 0048c9584..67dcce748 100644
--- a/cockatrice/src/carddbparser/carddatabaseparser.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
@@ -1,4 +1,4 @@
-#include "carddatabaseparser.h"
+#include "card_database_parser.h"
 
 SetNameMap ICardDatabaseParser::sets;
 
diff --git a/cockatrice/src/carddbparser/carddatabaseparser.h b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
similarity index 97%
rename from cockatrice/src/carddbparser/carddatabaseparser.h
rename to cockatrice/src/game/cards/card_database_parser/card_database_parser.h
index 5b232123b..0bc2b9d98 100644
--- a/cockatrice/src/carddbparser/carddatabaseparser.h
+++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
@@ -1,7 +1,7 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H
 
-#include "../carddatabase.h"
+#include "../card_database.h"
 
 #include <QIODevice>
 #include <QString>
diff --git a/cockatrice/src/carddbparser/cockatricexml3.cpp b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
similarity index 99%
rename from cockatrice/src/carddbparser/cockatricexml3.cpp
rename to cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
index 8646debb1..24106a3f4 100644
--- a/cockatrice/src/carddbparser/cockatricexml3.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
@@ -1,4 +1,4 @@
-#include "cockatricexml3.h"
+#include "cockatrice_xml_3.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/cockatrice/src/carddbparser/cockatricexml3.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
similarity index 95%
rename from cockatrice/src/carddbparser/cockatricexml3.h
rename to cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
index 413803ff4..2006d2203 100644
--- a/cockatrice/src/carddbparser/cockatricexml3.h
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_XML3_H
 #define COCKATRICE_XML3_H
 
-#include "carddatabaseparser.h"
+#include "card_database_parser.h"
 
 #include <QXmlStreamReader>
 
diff --git a/cockatrice/src/carddbparser/cockatricexml4.cpp b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
similarity index 99%
rename from cockatrice/src/carddbparser/cockatricexml4.cpp
rename to cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
index d21f8715f..7b6fb75e7 100644
--- a/cockatrice/src/carddbparser/cockatricexml4.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
@@ -1,4 +1,4 @@
-#include "cockatricexml4.h"
+#include "cockatrice_xml_4.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/cockatrice/src/carddbparser/cockatricexml4.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
similarity index 95%
rename from cockatrice/src/carddbparser/cockatricexml4.h
rename to cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
index a2e19f201..59de582a3 100644
--- a/cockatrice/src/carddbparser/cockatricexml4.h
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_XML4_H
 #define COCKATRICE_XML4_H
 
-#include "carddatabaseparser.h"
+#include "card_database_parser.h"
 
 #include <QXmlStreamReader>
 
diff --git a/cockatrice/src/carddragitem.cpp b/cockatrice/src/game/cards/card_drag_item.cpp
similarity index 95%
rename from cockatrice/src/carddragitem.cpp
rename to cockatrice/src/game/cards/card_drag_item.cpp
index 22af1f21e..bf7db01dd 100644
--- a/cockatrice/src/carddragitem.cpp
+++ b/cockatrice/src/game/cards/card_drag_item.cpp
@@ -1,10 +1,10 @@
-#include "carddragitem.h"
+#include "card_drag_item.h"
 
-#include "carditem.h"
-#include "cardzone.h"
-#include "gamescene.h"
-#include "tablezone.h"
-#include "zoneviewzone.h"
+#include "../game_scene.h"
+#include "../zones/card_zone.h"
+#include "../zones/table_zone.h"
+#include "../zones/view_zone.h"
+#include "card_item.h"
 
 #include <QCursor>
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/carddragitem.h b/cockatrice/src/game/cards/card_drag_item.h
similarity index 95%
rename from cockatrice/src/carddragitem.h
rename to cockatrice/src/game/cards/card_drag_item.h
index 2c7b2b8c6..96c8eca50 100644
--- a/cockatrice/src/carddragitem.h
+++ b/cockatrice/src/game/cards/card_drag_item.h
@@ -1,7 +1,7 @@
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H
 
-#include "abstractcarddragitem.h"
+#include "abstract_card_drag_item.h"
 
 class CardItem;
 
diff --git a/cockatrice/src/cardframe.cpp b/cockatrice/src/game/cards/card_frame.cpp
similarity index 94%
rename from cockatrice/src/cardframe.cpp
rename to cockatrice/src/game/cards/card_frame.cpp
index a9044652f..c8efb5643 100644
--- a/cockatrice/src/cardframe.cpp
+++ b/cockatrice/src/game/cards/card_frame.cpp
@@ -1,10 +1,10 @@
-#include "cardframe.h"
+#include "card_frame.h"
 
-#include "cardinfopicture.h"
-#include "cardinfotext.h"
-#include "carditem.h"
-#include "main.h"
-#include "settingscache.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "card_info_picture.h"
+#include "card_info_text.h"
+#include "card_item.h"
 
 #include <QSplitter>
 #include <QVBoxLayout>
diff --git a/cockatrice/src/cardframe.h b/cockatrice/src/game/cards/card_frame.h
similarity index 96%
rename from cockatrice/src/cardframe.h
rename to cockatrice/src/game/cards/card_frame.h
index 6e11c912b..8af2eb461 100644
--- a/cockatrice/src/cardframe.h
+++ b/cockatrice/src/game/cards/card_frame.h
@@ -1,7 +1,7 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include "carddatabase.h"
+#include "card_database.h"
 
 #include <QTabWidget>
 
diff --git a/cockatrice/src/cardinfopicture.cpp b/cockatrice/src/game/cards/card_info_picture.cpp
similarity index 92%
rename from cockatrice/src/cardinfopicture.cpp
rename to cockatrice/src/game/cards/card_info_picture.cpp
index 1e712c3aa..e3ee5bab8 100644
--- a/cockatrice/src/cardinfopicture.cpp
+++ b/cockatrice/src/game/cards/card_info_picture.cpp
@@ -1,8 +1,8 @@
-#include "cardinfopicture.h"
+#include "card_info_picture.h"
 
-#include "carditem.h"
-#include "main.h"
-#include "pictureloader.h"
+#include "../../client/ui/picture_loader.h"
+#include "../../main.h"
+#include "card_item.h"
 
 #include <QStylePainter>
 #include <QWidget>
diff --git a/cockatrice/src/cardinfopicture.h b/cockatrice/src/game/cards/card_info_picture.h
similarity index 94%
rename from cockatrice/src/cardinfopicture.h
rename to cockatrice/src/game/cards/card_info_picture.h
index f81f889af..70bc6d576 100644
--- a/cockatrice/src/cardinfopicture.h
+++ b/cockatrice/src/game/cards/card_info_picture.h
@@ -1,7 +1,7 @@
 #ifndef CARDINFOPICTURE_H
 #define CARDINFOPICTURE_H
 
-#include "carddatabase.h"
+#include "card_database.h"
 
 #include <QWidget>
 
diff --git a/cockatrice/src/cardinfotext.cpp b/cockatrice/src/game/cards/card_info_text.cpp
similarity index 95%
rename from cockatrice/src/cardinfotext.cpp
rename to cockatrice/src/game/cards/card_info_text.cpp
index faf5da9f8..795b08ecd 100644
--- a/cockatrice/src/cardinfotext.cpp
+++ b/cockatrice/src/game/cards/card_info_text.cpp
@@ -1,8 +1,8 @@
-#include "cardinfotext.h"
+#include "card_info_text.h"
 
-#include "carditem.h"
-#include "game_specific_terms.h"
-#include "main.h"
+#include "../../game/game_specific_terms.h"
+#include "../../main.h"
+#include "card_item.h"
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/cockatrice/src/cardinfotext.h b/cockatrice/src/game/cards/card_info_text.h
similarity index 94%
rename from cockatrice/src/cardinfotext.h
rename to cockatrice/src/game/cards/card_info_text.h
index bdeb05694..082c7cdfe 100644
--- a/cockatrice/src/cardinfotext.h
+++ b/cockatrice/src/game/cards/card_info_text.h
@@ -1,7 +1,7 @@
 #ifndef CARDINFOTEXT_H
 #define CARDINFOTEXT_H
 
-#include "carddatabase.h"
+#include "card_database.h"
 
 #include <QFrame>
 class QLabel;
diff --git a/cockatrice/src/cardinfowidget.cpp b/cockatrice/src/game/cards/card_info_widget.cpp
similarity index 93%
rename from cockatrice/src/cardinfowidget.cpp
rename to cockatrice/src/game/cards/card_info_widget.cpp
index 4578c8b66..2dbea8d65 100644
--- a/cockatrice/src/cardinfowidget.cpp
+++ b/cockatrice/src/game/cards/card_info_widget.cpp
@@ -1,9 +1,9 @@
-#include "cardinfowidget.h"
+#include "card_info_widget.h"
 
-#include "cardinfopicture.h"
-#include "cardinfotext.h"
-#include "carditem.h"
-#include "main.h"
+#include "../../main.h"
+#include "card_info_picture.h"
+#include "card_info_text.h"
+#include "card_item.h"
 
 #include <QApplication>
 #include <QScreen>
diff --git a/cockatrice/src/cardinfowidget.h b/cockatrice/src/game/cards/card_info_widget.h
similarity index 95%
rename from cockatrice/src/cardinfowidget.h
rename to cockatrice/src/game/cards/card_info_widget.h
index fd1ec4a44..f69c1b92c 100644
--- a/cockatrice/src/cardinfowidget.h
+++ b/cockatrice/src/game/cards/card_info_widget.h
@@ -1,7 +1,7 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
-#include "carddatabase.h"
+#include "card_database.h"
 
 #include <QComboBox>
 #include <QFrame>
diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/game/cards/card_item.cpp
similarity index 97%
rename from cockatrice/src/carditem.cpp
rename to cockatrice/src/game/cards/card_item.cpp
index 6a3bb86c9..dd78aee04 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/game/cards/card_item.cpp
@@ -1,17 +1,17 @@
-#include "carditem.h"
+#include "card_item.h"
 
-#include "arrowitem.h"
-#include "carddatabase.h"
-#include "carddragitem.h"
-#include "cardzone.h"
-#include "gamescene.h"
-#include "main.h"
+#include "../../client/tabs/tab_game.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../board/arrow_item.h"
+#include "../game_scene.h"
+#include "../player/player.h"
+#include "../zones/card_zone.h"
+#include "../zones/table_zone.h"
+#include "../zones/view_zone.h"
+#include "card_database.h"
+#include "card_drag_item.h"
 #include "pb/serverinfo_card.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "tab_game.h"
-#include "tablezone.h"
-#include "zoneviewzone.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/carditem.h b/cockatrice/src/game/cards/card_item.h
similarity index 99%
rename from cockatrice/src/carditem.h
rename to cockatrice/src/game/cards/card_item.h
index bb6dc6463..21224878f 100644
--- a/cockatrice/src/carditem.h
+++ b/cockatrice/src/game/cards/card_item.h
@@ -1,7 +1,7 @@
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "abstractcarditem.h"
+#include "abstract_card_item.h"
 #include "server_card.h"
 
 class CardDatabase;
diff --git a/cockatrice/src/cardlist.cpp b/cockatrice/src/game/cards/card_list.cpp
similarity index 95%
rename from cockatrice/src/cardlist.cpp
rename to cockatrice/src/game/cards/card_list.cpp
index d0347df54..e2866e5d8 100644
--- a/cockatrice/src/cardlist.cpp
+++ b/cockatrice/src/game/cards/card_list.cpp
@@ -1,7 +1,7 @@
-#include "cardlist.h"
+#include "card_list.h"
 
-#include "carddatabase.h"
-#include "carditem.h"
+#include "card_database.h"
+#include "card_item.h"
 
 #include <algorithm>
 
diff --git a/cockatrice/src/cardlist.h b/cockatrice/src/game/cards/card_list.h
similarity index 100%
rename from cockatrice/src/cardlist.h
rename to cockatrice/src/game/cards/card_list.h
diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/game/filters/filter_builder.cpp
similarity index 95%
rename from cockatrice/src/filterbuilder.cpp
rename to cockatrice/src/game/filters/filter_builder.cpp
index 68e739689..fafb8a910 100644
--- a/cockatrice/src/filterbuilder.cpp
+++ b/cockatrice/src/game/filters/filter_builder.cpp
@@ -1,7 +1,7 @@
-#include "filterbuilder.h"
+#include "filter_builder.h"
 
-#include "cardfilter.h"
-#include "customlineedit.h"
+#include "../../deck/custom_line_edit.h"
+#include "filter_card.h"
 
 #include <QComboBox>
 #include <QGridLayout>
diff --git a/cockatrice/src/filterbuilder.h b/cockatrice/src/game/filters/filter_builder.h
similarity index 100%
rename from cockatrice/src/filterbuilder.h
rename to cockatrice/src/game/filters/filter_builder.h
diff --git a/cockatrice/src/cardfilter.cpp b/cockatrice/src/game/filters/filter_card.cpp
similarity index 98%
rename from cockatrice/src/cardfilter.cpp
rename to cockatrice/src/game/filters/filter_card.cpp
index f2d705d49..d91129147 100644
--- a/cockatrice/src/cardfilter.cpp
+++ b/cockatrice/src/game/filters/filter_card.cpp
@@ -1,4 +1,4 @@
-#include "cardfilter.h"
+#include "filter_card.h"
 
 const QString CardFilter::typeName(Type t)
 {
diff --git a/cockatrice/src/cardfilter.h b/cockatrice/src/game/filters/filter_card.h
similarity index 100%
rename from cockatrice/src/cardfilter.h
rename to cockatrice/src/game/filters/filter_card.h
diff --git a/cockatrice/src/filter_string.cpp b/cockatrice/src/game/filters/filter_string.cpp
similarity index 99%
rename from cockatrice/src/filter_string.cpp
rename to cockatrice/src/game/filters/filter_string.cpp
index ea07dede4..7705ef8b0 100644
--- a/cockatrice/src/filter_string.cpp
+++ b/cockatrice/src/game/filters/filter_string.cpp
@@ -1,6 +1,6 @@
 #include "filter_string.h"
 
-#include "../../common/lib/peglib.h"
+#include "../../../../common/lib/peglib.h"
 
 #include <QByteArray>
 #include <QDebug>
diff --git a/cockatrice/src/filter_string.h b/cockatrice/src/game/filters/filter_string.h
similarity index 92%
rename from cockatrice/src/filter_string.h
rename to cockatrice/src/game/filters/filter_string.h
index 2a29ed2a4..4ef9f3ae0 100644
--- a/cockatrice/src/filter_string.h
+++ b/cockatrice/src/game/filters/filter_string.h
@@ -1,8 +1,8 @@
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
 
-#include "carddatabase.h"
-#include "filtertree.h"
+#include "../cards/card_database.h"
+#include "filter_tree.h"
 
 #include <QMap>
 #include <QString>
diff --git a/cockatrice/src/filtertree.cpp b/cockatrice/src/game/filters/filter_tree.cpp
similarity index 99%
rename from cockatrice/src/filtertree.cpp
rename to cockatrice/src/game/filters/filter_tree.cpp
index bf5a91e98..1ed61f1e3 100644
--- a/cockatrice/src/filtertree.cpp
+++ b/cockatrice/src/game/filters/filter_tree.cpp
@@ -1,6 +1,6 @@
-#include "filtertree.h"
+#include "filter_tree.h"
 
-#include "cardfilter.h"
+#include "filter_card.h"
 
 #include <QList>
 
diff --git a/cockatrice/src/filtertree.h b/cockatrice/src/game/filters/filter_tree.h
similarity index 99%
rename from cockatrice/src/filtertree.h
rename to cockatrice/src/game/filters/filter_tree.h
index ad651e7c8..08e76584f 100644
--- a/cockatrice/src/filtertree.h
+++ b/cockatrice/src/game/filters/filter_tree.h
@@ -1,10 +1,8 @@
-
-
 #ifndef FILTERTREE_H
 #define FILTERTREE_H
 
-#include "carddatabase.h"
-#include "cardfilter.h"
+#include "../cards/card_database.h"
+#include "filter_card.h"
 
 #include <QList>
 #include <QMap>
diff --git a/cockatrice/src/filtertreemodel.cpp b/cockatrice/src/game/filters/filter_tree_model.cpp
similarity index 98%
rename from cockatrice/src/filtertreemodel.cpp
rename to cockatrice/src/game/filters/filter_tree_model.cpp
index ee7779f60..e3dcaec2f 100644
--- a/cockatrice/src/filtertreemodel.cpp
+++ b/cockatrice/src/game/filters/filter_tree_model.cpp
@@ -1,7 +1,7 @@
-#include "filtertreemodel.h"
+#include "filter_tree_model.h"
 
-#include "cardfilter.h"
-#include "filtertree.h"
+#include "filter_card.h"
+#include "filter_tree.h"
 
 #include <QFont>
 
diff --git a/cockatrice/src/filtertreemodel.h b/cockatrice/src/game/filters/filter_tree_model.h
similarity index 100%
rename from cockatrice/src/filtertreemodel.h
rename to cockatrice/src/game/filters/filter_tree_model.h
diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/game/game_scene.cpp
similarity index 97%
rename from cockatrice/src/gamescene.cpp
rename to cockatrice/src/game/game_scene.cpp
index cc5b050c4..f8217305e 100644
--- a/cockatrice/src/gamescene.cpp
+++ b/cockatrice/src/game/game_scene.cpp
@@ -1,11 +1,11 @@
-#include "gamescene.h"
+#include "game_scene.h"
 
-#include "carditem.h"
-#include "phasestoolbar.h"
-#include "player.h"
-#include "settingscache.h"
-#include "zoneviewwidget.h"
-#include "zoneviewzone.h"
+#include "../client/ui/phases_toolbar.h"
+#include "../settings/cache_settings.h"
+#include "cards/card_item.h"
+#include "player/player.h"
+#include "zones/view_zone.h"
+#include "zones/view_zone_widget.h"
 
 #include <QAction>
 #include <QBasicTimer>
diff --git a/cockatrice/src/gamescene.h b/cockatrice/src/game/game_scene.h
similarity index 100%
rename from cockatrice/src/gamescene.h
rename to cockatrice/src/game/game_scene.h
diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/game/game_selector.cpp
similarity index 96%
rename from cockatrice/src/gameselector.cpp
rename to cockatrice/src/game/game_selector.cpp
index a6bb5c154..fe534cf12 100644
--- a/cockatrice/src/gameselector.cpp
+++ b/cockatrice/src/game/game_selector.cpp
@@ -1,18 +1,18 @@
-#include "gameselector.h"
+#include "game_selector.h"
 
-#include "abstractclient.h"
-#include "dlg_creategame.h"
-#include "dlg_filter_games.h"
-#include "gamesmodel.h"
-#include "gettextwithmax.h"
+#include "../client/game_logic/abstract_client.h"
+#include "../client/get_text_with_max.h"
+#include "../client/tabs/tab_account.h"
+#include "../client/tabs/tab_game.h"
+#include "../client/tabs/tab_room.h"
+#include "../client/tabs/tab_supervisor.h"
+#include "../dialogs/dlg_create_game.h"
+#include "../dialogs/dlg_filter_games.h"
+#include "../server/pending_command.h"
+#include "games_model.h"
 #include "pb/response.pb.h"
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_game.pb.h"
-#include "pending_command.h"
-#include "tab_account.h"
-#include "tab_game.h"
-#include "tab_room.h"
-#include "tab_supervisor.h"
 
 #include <QApplication>
 #include <QCheckBox>
diff --git a/cockatrice/src/gameselector.h b/cockatrice/src/game/game_selector.h
similarity index 98%
rename from cockatrice/src/gameselector.h
rename to cockatrice/src/game/game_selector.h
index b37ff24d7..57e204a01 100644
--- a/cockatrice/src/gameselector.h
+++ b/cockatrice/src/game/game_selector.h
@@ -1,7 +1,7 @@
 #ifndef GAMESELECTOR_H
 #define GAMESELECTOR_H
 
-#include "gametypemap.h"
+#include "game_type_map.h"
 
 #include <QGroupBox>
 #include <common/pb/event_add_to_list.pb.h>
diff --git a/cockatrice/src/game_specific_terms.h b/cockatrice/src/game/game_specific_terms.h
similarity index 100%
rename from cockatrice/src/game_specific_terms.h
rename to cockatrice/src/game/game_specific_terms.h
diff --git a/cockatrice/src/gametypemap.h b/cockatrice/src/game/game_type_map.h
similarity index 100%
rename from cockatrice/src/gametypemap.h
rename to cockatrice/src/game/game_type_map.h
diff --git a/cockatrice/src/gameview.cpp b/cockatrice/src/game/game_view.cpp
similarity index 96%
rename from cockatrice/src/gameview.cpp
rename to cockatrice/src/game/game_view.cpp
index 665762537..a17a903a4 100644
--- a/cockatrice/src/gameview.cpp
+++ b/cockatrice/src/game/game_view.cpp
@@ -1,7 +1,7 @@
-#include "gameview.h"
+#include "game_view.h"
 
-#include "gamescene.h"
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
+#include "game_scene.h"
 
 #include <QAction>
 #include <QResizeEvent>
diff --git a/cockatrice/src/gameview.h b/cockatrice/src/game/game_view.h
similarity index 100%
rename from cockatrice/src/gameview.h
rename to cockatrice/src/game/game_view.h
diff --git a/cockatrice/src/gamesmodel.cpp b/cockatrice/src/game/games_model.cpp
similarity index 99%
rename from cockatrice/src/gamesmodel.cpp
rename to cockatrice/src/game/games_model.cpp
index 6d8e9dafc..e65be140e 100644
--- a/cockatrice/src/gamesmodel.cpp
+++ b/cockatrice/src/game/games_model.cpp
@@ -1,10 +1,10 @@
-#include "gamesmodel.h"
+#include "games_model.h"
 
+#include "../client/tabs/tab_account.h"
+#include "../client/ui/pixel_map_generator.h"
+#include "../server/user/user_list.h"
+#include "../settings/cache_settings.h"
 #include "pb/serverinfo_game.pb.h"
-#include "pixmapgenerator.h"
-#include "settingscache.h"
-#include "tab_account.h"
-#include "userlist.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/cockatrice/src/gamesmodel.h b/cockatrice/src/game/games_model.h
similarity index 98%
rename from cockatrice/src/gamesmodel.h
rename to cockatrice/src/game/games_model.h
index eb14fcbda..655608d26 100644
--- a/cockatrice/src/gamesmodel.h
+++ b/cockatrice/src/game/games_model.h
@@ -1,9 +1,9 @@
 #ifndef GAMESMODEL_H
 #define GAMESMODEL_H
 
-#include "gametypemap.h"
+#include "../client/tabs/tab_supervisor.h"
+#include "game_type_map.h"
 #include "pb/serverinfo_game.pb.h"
-#include "tab_supervisor.h"
 
 #include <QAbstractTableModel>
 #include <QList>
diff --git a/cockatrice/src/handcounter.cpp b/cockatrice/src/game/hand_counter.cpp
similarity index 96%
rename from cockatrice/src/handcounter.cpp
rename to cockatrice/src/game/hand_counter.cpp
index 3da337eae..a5c1f1a77 100644
--- a/cockatrice/src/handcounter.cpp
+++ b/cockatrice/src/game/hand_counter.cpp
@@ -1,6 +1,6 @@
-#include "handcounter.h"
+#include "hand_counter.h"
 
-#include "cardzone.h"
+#include "zones/card_zone.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
diff --git a/cockatrice/src/handcounter.h b/cockatrice/src/game/hand_counter.h
similarity index 93%
rename from cockatrice/src/handcounter.h
rename to cockatrice/src/game/hand_counter.h
index b4646e4a3..71b1a95a4 100644
--- a/cockatrice/src/handcounter.h
+++ b/cockatrice/src/game/hand_counter.h
@@ -1,7 +1,7 @@
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "abstractgraphicsitem.h"
+#include "../game/board/abstract_graphics_item.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/phase.cpp b/cockatrice/src/game/phase.cpp
similarity index 100%
rename from cockatrice/src/phase.cpp
rename to cockatrice/src/game/phase.cpp
diff --git a/cockatrice/src/phase.h b/cockatrice/src/game/phase.h
similarity index 100%
rename from cockatrice/src/phase.h
rename to cockatrice/src/game/phase.h
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/game/player/player.cpp
similarity index 99%
rename from cockatrice/src/player.cpp
rename to cockatrice/src/game/player/player.cpp
index ea76b95ba..5cdfe7629 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -1,20 +1,28 @@
 #include "player.h"
 
-#include "arrowitem.h"
-#include "carddatabase.h"
-#include "carditem.h"
-#include "cardlist.h"
-#include "cardzone.h"
+#include "../../client/get_text_with_max.h"
+#include "../../client/tabs/tab_game.h"
+#include "../../client/ui/theme_manager.h"
+#include "../../deck/deck_loader.h"
+#include "../../dialogs/dlg_create_token.h"
+#include "../../dialogs/dlg_roll_dice.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../board/arrow_item.h"
+#include "../board/counter_general.h"
+#include "../cards/card_database.h"
+#include "../cards/card_item.h"
+#include "../cards/card_list.h"
+#include "../game_scene.h"
+#include "../hand_counter.h"
+#include "../zones/card_zone.h"
+#include "../zones/hand_zone.h"
+#include "../zones/pile_zone.h"
+#include "../zones/stack_zone.h"
+#include "../zones/table_zone.h"
+#include "../zones/view_zone.h"
+#include "../zones/view_zone_widget.h"
 #include "color.h"
-#include "counter_general.h"
-#include "deck_loader.h"
-#include "dlg_create_token.h"
-#include "dlg_roll_dice.h"
-#include "gamescene.h"
-#include "gettextwithmax.h"
-#include "handcounter.h"
-#include "handzone.h"
-#include "main.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -54,16 +62,8 @@
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/serverinfo_zone.pb.h"
-#include "pilezone.h"
-#include "playertarget.h"
-#include "settingscache.h"
-#include "stackzone.h"
-#include "tab_game.h"
-#include "tablezone.h"
-#include "thememanager.h"
+#include "player_target.h"
 #include "trice_limits.h"
-#include "zoneviewwidget.h"
-#include "zoneviewzone.h"
 
 #include <QDebug>
 #include <QMenu>
diff --git a/cockatrice/src/player.h b/cockatrice/src/game/player/player.h
similarity index 99%
rename from cockatrice/src/player.h
rename to cockatrice/src/game/player/player.h
index d2ff34118..5c655add1 100644
--- a/cockatrice/src/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -1,12 +1,12 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "abstractgraphicsitem.h"
-#include "carddatabase.h"
-#include "filter_string.h"
+#include "../../client/tearoff_menu.h"
+#include "../board/abstract_graphics_item.h"
+#include "../cards/card_database.h"
+#include "../filters/filter_string.h"
 #include "pb/card_attributes.pb.h"
 #include "pb/game_event.pb.h"
-#include "tearoffmenu.h"
 
 #include <QInputDialog>
 #include <QMap>
diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
similarity index 95%
rename from cockatrice/src/playerlistwidget.cpp
rename to cockatrice/src/game/player/player_list_widget.cpp
index 4388679f2..951f00afb 100644
--- a/cockatrice/src/playerlistwidget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,15 +1,15 @@
-#include "playerlistwidget.h"
+#include "player_list_widget.h"
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/tabs/tab_account.h"
+#include "../../client/tabs/tab_game.h"
+#include "../../client/tabs/tab_supervisor.h"
+#include "../../client/ui/pixel_map_generator.h"
+#include "../../server/user/user_context_menu.h"
+#include "../../server/user/user_list.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/serverinfo_playerproperties.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pixmapgenerator.h"
-#include "tab_account.h"
-#include "tab_game.h"
-#include "tab_supervisor.h"
-#include "user_context_menu.h"
-#include "userlist.h"
 
 #include <QAction>
 #include <QHeaderView>
diff --git a/cockatrice/src/playerlistwidget.h b/cockatrice/src/game/player/player_list_widget.h
similarity index 100%
rename from cockatrice/src/playerlistwidget.h
rename to cockatrice/src/game/player/player_list_widget.h
diff --git a/cockatrice/src/playertarget.cpp b/cockatrice/src/game/player/player_target.cpp
similarity index 98%
rename from cockatrice/src/playertarget.cpp
rename to cockatrice/src/game/player/player_target.cpp
index 257c35a45..699097c38 100644
--- a/cockatrice/src/playertarget.cpp
+++ b/cockatrice/src/game/player/player_target.cpp
@@ -1,7 +1,7 @@
-#include "playertarget.h"
+#include "player_target.h"
 
+#include "../../client/ui/pixel_map_generator.h"
 #include "pb/serverinfo_user.pb.h"
-#include "pixmapgenerator.h"
 #include "player.h"
 
 #include <QDebug>
diff --git a/cockatrice/src/playertarget.h b/cockatrice/src/game/player/player_target.h
similarity index 94%
rename from cockatrice/src/playertarget.h
rename to cockatrice/src/game/player/player_target.h
index e68b34367..7adcf5d80 100644
--- a/cockatrice/src/playertarget.h
+++ b/cockatrice/src/game/player/player_target.h
@@ -1,8 +1,8 @@
 #ifndef PLAYERTARGET_H
 #define PLAYERTARGET_H
 
-#include "abstractcounter.h"
-#include "arrowtarget.h"
+#include "../board/abstract_counter.h"
+#include "../board/arrow_target.h"
 
 #include <QFont>
 #include <QPixmap>
diff --git a/cockatrice/src/cardzone.cpp b/cockatrice/src/game/zones/card_zone.cpp
similarity index 98%
rename from cockatrice/src/cardzone.cpp
rename to cockatrice/src/game/zones/card_zone.cpp
index ad655f61f..b0e06f323 100644
--- a/cockatrice/src/cardzone.cpp
+++ b/cockatrice/src/game/zones/card_zone.cpp
@@ -1,10 +1,10 @@
-#include "cardzone.h"
+#include "card_zone.h"
 
-#include "carditem.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/serverinfo_user.pb.h"
-#include "player.h"
-#include "zoneviewzone.h"
+#include "view_zone.h"
 
 #include <QAction>
 #include <QDebug>
@@ -214,4 +214,4 @@ void CardZone::moveAllToZone()
 QPointF CardZone::closestGridPoint(const QPointF &point)
 {
     return point;
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/cardzone.h b/cockatrice/src/game/zones/card_zone.h
similarity index 96%
rename from cockatrice/src/cardzone.h
rename to cockatrice/src/game/zones/card_zone.h
index 5585663a8..c0ad27bc3 100644
--- a/cockatrice/src/cardzone.h
+++ b/cockatrice/src/game/zones/card_zone.h
@@ -1,9 +1,9 @@
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "abstractgraphicsitem.h"
-#include "cardlist.h"
-#include "translation.h"
+#include "../../client/translation.h"
+#include "../board/abstract_graphics_item.h"
+#include "../cards/card_list.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/handzone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
similarity index 95%
rename from cockatrice/src/handzone.cpp
rename to cockatrice/src/game/zones/hand_zone.cpp
index e7afb9632..5b6932902 100644
--- a/cockatrice/src/handzone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -1,11 +1,11 @@
-#include "handzone.h"
+#include "hand_zone.h"
 
-#include "carddragitem.h"
-#include "carditem.h"
+#include "../../client/ui/theme_manager.h"
+#include "../../settings/cache_settings.h"
+#include "../cards/card_drag_item.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_move_card.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "thememanager.h"
 
 #include <QPainter>
 
diff --git a/cockatrice/src/handzone.h b/cockatrice/src/game/zones/hand_zone.h
similarity index 96%
rename from cockatrice/src/handzone.h
rename to cockatrice/src/game/zones/hand_zone.h
index 24fdc36fc..004847f7f 100644
--- a/cockatrice/src/handzone.h
+++ b/cockatrice/src/game/zones/hand_zone.h
@@ -1,7 +1,7 @@
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "selectzone.h"
+#include "select_zone.h"
 
 class HandZone : public SelectZone
 {
diff --git a/cockatrice/src/pilezone.cpp b/cockatrice/src/game/zones/pile_zone.cpp
similarity index 96%
rename from cockatrice/src/pilezone.cpp
rename to cockatrice/src/game/zones/pile_zone.cpp
index fcd8bb8bc..244e137d7 100644
--- a/cockatrice/src/pilezone.cpp
+++ b/cockatrice/src/game/zones/pile_zone.cpp
@@ -1,10 +1,10 @@
-#include "pilezone.h"
+#include "pile_zone.h"
 
-#include "carddragitem.h"
-#include "carditem.h"
+#include "../cards/card_drag_item.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_move_card.pb.h"
-#include "player.h"
-#include "zoneviewzone.h"
+#include "view_zone.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/pilezone.h b/cockatrice/src/game/zones/pile_zone.h
similarity index 97%
rename from cockatrice/src/pilezone.h
rename to cockatrice/src/game/zones/pile_zone.h
index 6e405b6b8..5d28b3816 100644
--- a/cockatrice/src/pilezone.h
+++ b/cockatrice/src/game/zones/pile_zone.h
@@ -1,7 +1,7 @@
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
-#include "cardzone.h"
+#include "card_zone.h"
 
 class PileZone : public CardZone
 {
diff --git a/cockatrice/src/selectzone.cpp b/cockatrice/src/game/zones/select_zone.cpp
similarity index 95%
rename from cockatrice/src/selectzone.cpp
rename to cockatrice/src/game/zones/select_zone.cpp
index 7eba8bacb..9947bc405 100644
--- a/cockatrice/src/selectzone.cpp
+++ b/cockatrice/src/game/zones/select_zone.cpp
@@ -1,8 +1,8 @@
-#include "selectzone.h"
+#include "select_zone.h"
 
-#include "carditem.h"
-#include "gamescene.h"
-#include "settingscache.h"
+#include "../../settings/cache_settings.h"
+#include "../cards/card_item.h"
+#include "../game_scene.h"
 
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/selectzone.h b/cockatrice/src/game/zones/select_zone.h
similarity index 96%
rename from cockatrice/src/selectzone.h
rename to cockatrice/src/game/zones/select_zone.h
index 77f9eead7..efec4bb02 100644
--- a/cockatrice/src/selectzone.h
+++ b/cockatrice/src/game/zones/select_zone.h
@@ -1,7 +1,7 @@
 #ifndef SELECTZONE_H
 #define SELECTZONE_H
 
-#include "cardzone.h"
+#include "card_zone.h"
 
 class SelectZone : public CardZone
 {
diff --git a/cockatrice/src/stackzone.cpp b/cockatrice/src/game/zones/stack_zone.cpp
similarity index 93%
rename from cockatrice/src/stackzone.cpp
rename to cockatrice/src/game/zones/stack_zone.cpp
index fb3664b99..3a6d8d0f2 100644
--- a/cockatrice/src/stackzone.cpp
+++ b/cockatrice/src/game/zones/stack_zone.cpp
@@ -1,12 +1,12 @@
-#include "stackzone.h"
+#include "stack_zone.h"
 
-#include "arrowitem.h"
-#include "carddragitem.h"
-#include "carditem.h"
+#include "../../client/ui/theme_manager.h"
+#include "../../settings/cache_settings.h"
+#include "../board/arrow_item.h"
+#include "../cards/card_drag_item.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_move_card.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "thememanager.h"
 
 #include <QPainter>
 #include <QSet>
diff --git a/cockatrice/src/stackzone.h b/cockatrice/src/game/zones/stack_zone.h
similarity index 95%
rename from cockatrice/src/stackzone.h
rename to cockatrice/src/game/zones/stack_zone.h
index 5d83ef593..f45ec0e9d 100644
--- a/cockatrice/src/stackzone.h
+++ b/cockatrice/src/game/zones/stack_zone.h
@@ -1,7 +1,7 @@
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
-#include "selectzone.h"
+#include "select_zone.h"
 
 class StackZone : public SelectZone
 {
diff --git a/cockatrice/src/tablezone.cpp b/cockatrice/src/game/zones/table_zone.cpp
similarity index 97%
rename from cockatrice/src/tablezone.cpp
rename to cockatrice/src/game/zones/table_zone.cpp
index a21e99dbe..af4b82e18 100644
--- a/cockatrice/src/tablezone.cpp
+++ b/cockatrice/src/game/zones/table_zone.cpp
@@ -1,14 +1,14 @@
-#include "tablezone.h"
+#include "table_zone.h"
 
-#include "arrowitem.h"
-#include "carddatabase.h"
-#include "carddragitem.h"
-#include "carditem.h"
+#include "../../client/ui/theme_manager.h"
+#include "../../settings/cache_settings.h"
+#include "../board/arrow_item.h"
+#include "../cards/card_database.h"
+#include "../cards/card_drag_item.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/command_set_card_attr.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "thememanager.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
diff --git a/cockatrice/src/tablezone.h b/cockatrice/src/game/zones/table_zone.h
similarity index 98%
rename from cockatrice/src/tablezone.h
rename to cockatrice/src/game/zones/table_zone.h
index aced9c436..3e93ef781 100644
--- a/cockatrice/src/tablezone.h
+++ b/cockatrice/src/game/zones/table_zone.h
@@ -1,8 +1,8 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "abstractcarditem.h"
-#include "selectzone.h"
+#include "../cards/abstract_card_item.h"
+#include "select_zone.h"
 
 /*
  * TableZone is the grid based rect where CardItems may be placed.
diff --git a/cockatrice/src/zoneviewzone.cpp b/cockatrice/src/game/zones/view_zone.cpp
similarity index 97%
rename from cockatrice/src/zoneviewzone.cpp
rename to cockatrice/src/game/zones/view_zone.cpp
index 299ed9efa..6cf6ad52e 100644
--- a/cockatrice/src/zoneviewzone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -1,14 +1,14 @@
-#include "zoneviewzone.h"
+#include "view_zone.h"
 
-#include "carddatabase.h"
-#include "carddragitem.h"
-#include "carditem.h"
+#include "../../server/pending_command.h"
+#include "../cards/card_database.h"
+#include "../cards/card_drag_item.h"
+#include "../cards/card_item.h"
+#include "../player/player.h"
 #include "pb/command_dump_zone.pb.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_card.pb.h"
-#include "pending_command.h"
-#include "player.h"
 
 #include <QBrush>
 #include <QDebug>
diff --git a/cockatrice/src/zoneviewzone.h b/cockatrice/src/game/zones/view_zone.h
similarity index 98%
rename from cockatrice/src/zoneviewzone.h
rename to cockatrice/src/game/zones/view_zone.h
index 416de5853..a0e17b6c3 100644
--- a/cockatrice/src/zoneviewzone.h
+++ b/cockatrice/src/game/zones/view_zone.h
@@ -1,7 +1,7 @@
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "selectzone.h"
+#include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
 
diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
similarity index 97%
rename from cockatrice/src/zoneviewwidget.cpp
rename to cockatrice/src/game/zones/view_zone_widget.cpp
index 87348cbab..4cb8d9b83 100644
--- a/cockatrice/src/zoneviewwidget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -1,11 +1,11 @@
-#include "zoneviewwidget.h"
+#include "view_zone_widget.h"
 
-#include "carditem.h"
-#include "gamescene.h"
+#include "../../settings/cache_settings.h"
+#include "../cards/card_item.h"
+#include "../game_scene.h"
+#include "../player/player.h"
 #include "pb/command_shuffle.pb.h"
-#include "player.h"
-#include "settingscache.h"
-#include "zoneviewzone.h"
+#include "view_zone.h"
 
 #include <QCheckBox>
 #include <QGraphicsLinearLayout>
diff --git a/cockatrice/src/zoneviewwidget.h b/cockatrice/src/game/zones/view_zone_widget.h
similarity index 100%
rename from cockatrice/src/zoneviewwidget.h
rename to cockatrice/src/game/zones/view_zone_widget.h
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index b036b2405..cc5bc5967 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -21,18 +21,18 @@
 #include "main.h"
 
 #include "QtNetwork/QNetworkInterface"
-#include "carddatabase.h"
-#include "dlg_settings.h"
+#include "client/network/spoiler_background_updater.h"
+#include "client/sound_engine.h"
+#include "client/ui/pixel_map_generator.h"
+#include "client/ui/theme_manager.h"
+#include "client/ui/window_main.h"
+#include "dialogs/dlg_settings.h"
 #include "featureset.h"
-#include "logger.h"
-#include "pixmapgenerator.h"
+#include "game/cards/card_database.h"
 #include "rng_sfmt.h"
-#include "settingscache.h"
-#include "soundengine.h"
-#include "spoilerbackgroundupdater.h"
-#include "thememanager.h"
+#include "settings/cache_settings.h"
+#include "utility/logger.h"
 #include "version_string.h"
-#include "window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
diff --git a/cockatrice/src/chatview/chatview.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
similarity index 98%
rename from cockatrice/src/chatview/chatview.cpp
rename to cockatrice/src/server/chat_view/chat_view.cpp
index a7967d95b..d1ea91de9 100644
--- a/cockatrice/src/chatview/chatview.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -1,10 +1,10 @@
-#include "chatview.h"
+#include "chat_view.h"
 
-#include "../pixmapgenerator.h"
-#include "../settingscache.h"
-#include "../soundengine.h"
-#include "../tab_account.h"
-#include "../user_context_menu.h"
+#include "../../client/sound_engine.h"
+#include "../../client/tabs/tab_account.h"
+#include "../../client/ui/pixel_map_generator.h"
+#include "../../settings/cache_settings.h"
+#include "../user/user_context_menu.h"
 #include "user_level.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/chatview/chatview.h b/cockatrice/src/server/chat_view/chat_view.h
similarity index 97%
rename from cockatrice/src/chatview/chatview.h
rename to cockatrice/src/server/chat_view/chat_view.h
index b6b9ce819..e99e1388a 100644
--- a/cockatrice/src/chatview/chatview.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -1,11 +1,11 @@
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "../tab_supervisor.h"
-#include "../userlist.h"
+#include "../../client/tabs/tab_supervisor.h"
+#include "../user/user_list.h"
 #include "room_message_type.h"
 #include "user_level.h"
-#include "userlistProxy.h"
+#include "user_list_proxy.h"
 
 #include <QAction>
 #include <QColor>
diff --git a/cockatrice/src/chatview/userlistProxy.h b/cockatrice/src/server/chat_view/user_list_proxy.h
similarity index 100%
rename from cockatrice/src/chatview/userlistProxy.h
rename to cockatrice/src/server/chat_view/user_list_proxy.h
diff --git a/cockatrice/src/handle_public_servers.cpp b/cockatrice/src/server/handle_public_servers.cpp
similarity index 98%
rename from cockatrice/src/handle_public_servers.cpp
rename to cockatrice/src/server/handle_public_servers.cpp
index 6429c088b..e54cc0cf0 100644
--- a/cockatrice/src/handle_public_servers.cpp
+++ b/cockatrice/src/server/handle_public_servers.cpp
@@ -1,6 +1,6 @@
 #include "handle_public_servers.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QJsonDocument>
 #include <QMessageBox>
diff --git a/cockatrice/src/handle_public_servers.h b/cockatrice/src/server/handle_public_servers.h
similarity index 96%
rename from cockatrice/src/handle_public_servers.h
rename to cockatrice/src/server/handle_public_servers.h
index 177b9032f..430043de1 100644
--- a/cockatrice/src/handle_public_servers.h
+++ b/cockatrice/src/server/handle_public_servers.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 #define COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 
-#include "userconnection_information.h"
+#include "user/user_info_connection.h"
 
 class QNetworkReply;
 class QNetworkAccessManager;
diff --git a/cockatrice/src/localclient.cpp b/cockatrice/src/server/local_client.cpp
similarity index 93%
rename from cockatrice/src/localclient.cpp
rename to cockatrice/src/server/local_client.cpp
index 0abb3deb7..b4c1f41ee 100644
--- a/cockatrice/src/localclient.cpp
+++ b/cockatrice/src/server/local_client.cpp
@@ -1,6 +1,6 @@
-#include "localclient.h"
+#include "local_client.h"
 
-#include "localserverinterface.h"
+#include "local_server_interface.h"
 #include "pb/session_commands.pb.h"
 
 LocalClient::LocalClient(LocalServerInterface *_lsi,
diff --git a/cockatrice/src/localclient.h b/cockatrice/src/server/local_client.h
similarity index 91%
rename from cockatrice/src/localclient.h
rename to cockatrice/src/server/local_client.h
index 9418c37b7..ce33611ab 100644
--- a/cockatrice/src/localclient.h
+++ b/cockatrice/src/server/local_client.h
@@ -1,7 +1,7 @@
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
 
-#include "abstractclient.h"
+#include "../client/game_logic/abstract_client.h"
 
 class LocalServerInterface;
 
diff --git a/cockatrice/src/localserver.cpp b/cockatrice/src/server/local_server.cpp
similarity index 96%
rename from cockatrice/src/localserver.cpp
rename to cockatrice/src/server/local_server.cpp
index 0a338a6ac..c40247c72 100644
--- a/cockatrice/src/localserver.cpp
+++ b/cockatrice/src/server/local_server.cpp
@@ -1,6 +1,6 @@
-#include "localserver.h"
+#include "local_server.h"
 
-#include "localserverinterface.h"
+#include "local_server_interface.h"
 #include "server_room.h"
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
diff --git a/cockatrice/src/localserver.h b/cockatrice/src/server/local_server.h
similarity index 100%
rename from cockatrice/src/localserver.h
rename to cockatrice/src/server/local_server.h
diff --git a/cockatrice/src/localserverinterface.cpp b/cockatrice/src/server/local_server_interface.cpp
similarity index 88%
rename from cockatrice/src/localserverinterface.cpp
rename to cockatrice/src/server/local_server_interface.cpp
index e92e29d26..bb86198af 100644
--- a/cockatrice/src/localserverinterface.cpp
+++ b/cockatrice/src/server/local_server_interface.cpp
@@ -1,6 +1,6 @@
-#include "localserverinterface.h"
+#include "local_server_interface.h"
 
-#include "localserver.h"
+#include "local_server.h"
 
 #include <QDebug>
 
diff --git a/cockatrice/src/localserverinterface.h b/cockatrice/src/server/local_server_interface.h
similarity index 100%
rename from cockatrice/src/localserverinterface.h
rename to cockatrice/src/server/local_server_interface.h
diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/server/message_log_widget.cpp
similarity index 99%
rename from cockatrice/src/messagelogwidget.cpp
rename to cockatrice/src/server/message_log_widget.cpp
index 8df9cb1cd..0538517f5 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/server/message_log_widget.cpp
@@ -1,14 +1,14 @@
-#include "messagelogwidget.h"
+#include "message_log_widget.h"
 
-#include "carditem.h"
-#include "cardzone.h"
+#include "../client/sound_engine.h"
+#include "../client/translate_counter_name.h"
+#include "../game/cards/card_item.h"
+#include "../game/phase.h"
+#include "../game/player/player.h"
+#include "../game/zones/card_zone.h"
 #include "pb/context_move_card.pb.h"
 #include "pb/context_mulligan.pb.h"
 #include "pb/serverinfo_user.pb.h"
-#include "phase.h"
-#include "player.h"
-#include "soundengine.h"
-#include "translatecountername.h"
 
 #include <utility>
 
diff --git a/cockatrice/src/messagelogwidget.h b/cockatrice/src/server/message_log_widget.h
similarity index 98%
rename from cockatrice/src/messagelogwidget.h
rename to cockatrice/src/server/message_log_widget.h
index 7bdbde699..8dc28b1b0 100644
--- a/cockatrice/src/messagelogwidget.h
+++ b/cockatrice/src/server/message_log_widget.h
@@ -1,8 +1,8 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
-#include "chatview/chatview.h"
-#include "translation.h"
+#include "../client/translation.h"
+#include "chat_view/chat_view.h"
 #include "user_level.h"
 
 class Player;
diff --git a/cockatrice/src/pending_command.cpp b/cockatrice/src/server/pending_command.cpp
similarity index 100%
rename from cockatrice/src/pending_command.cpp
rename to cockatrice/src/server/pending_command.cpp
diff --git a/cockatrice/src/pending_command.h b/cockatrice/src/server/pending_command.h
similarity index 100%
rename from cockatrice/src/pending_command.h
rename to cockatrice/src/server/pending_command.h
diff --git a/cockatrice/src/remoteclient.cpp b/cockatrice/src/server/remote/remote_client.cpp
similarity index 99%
rename from cockatrice/src/remoteclient.cpp
rename to cockatrice/src/server/remote/remote_client.cpp
index cbb9a5d9a..c29d6440f 100644
--- a/cockatrice/src/remoteclient.cpp
+++ b/cockatrice/src/server/remote/remote_client.cpp
@@ -1,7 +1,9 @@
-#include "remoteclient.h"
+#include "remote_client.h"
 
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../pending_command.h"
 #include "debug_pb_message.h"
-#include "main.h"
 #include "passwordhasher.h"
 #include "pb/event_server_identification.pb.h"
 #include "pb/response_activate.pb.h"
@@ -11,8 +13,6 @@
 #include "pb/response_register.pb.h"
 #include "pb/server_message.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
diff --git a/cockatrice/src/remoteclient.h b/cockatrice/src/server/remote/remote_client.h
similarity index 99%
rename from cockatrice/src/remoteclient.h
rename to cockatrice/src/server/remote/remote_client.h
index 3ce893149..f1f64d4c2 100644
--- a/cockatrice/src/remoteclient.h
+++ b/cockatrice/src/server/remote/remote_client.h
@@ -1,7 +1,7 @@
 #ifndef REMOTECLIENT_H
 #define REMOTECLIENT_H
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
 #include "pb/commands.pb.h"
 
 #include <QTcpSocket>
diff --git a/cockatrice/src/remotedecklist_treewidget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
similarity index 98%
rename from cockatrice/src/remotedecklist_treewidget.cpp
rename to cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
index d681d0a0a..63b6a1ad8 100644
--- a/cockatrice/src/remotedecklist_treewidget.cpp
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
@@ -1,10 +1,10 @@
-#include "remotedecklist_treewidget.h"
+#include "remote_decklist_tree_widget.h"
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../pending_command.h"
 #include "pb/command_deck_list.pb.h"
 #include "pb/response_deck_list.pb.h"
 #include "pb/serverinfo_deckstorage.pb.h"
-#include "pending_command.h"
 
 #include <QFileIconProvider>
 #include <QHeaderView>
diff --git a/cockatrice/src/remotedecklist_treewidget.h b/cockatrice/src/server/remote/remote_decklist_tree_widget.h
similarity index 100%
rename from cockatrice/src/remotedecklist_treewidget.h
rename to cockatrice/src/server/remote/remote_decklist_tree_widget.h
diff --git a/cockatrice/src/remotereplaylist_treewidget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
similarity index 98%
rename from cockatrice/src/remotereplaylist_treewidget.cpp
rename to cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
index c6e5dc19b..437959949 100644
--- a/cockatrice/src/remotereplaylist_treewidget.cpp
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,10 +1,10 @@
-#include "remotereplaylist_treewidget.h"
+#include "remote_replay_list_tree_widget.h"
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../pending_command.h"
 #include "pb/command_replay_list.pb.h"
 #include "pb/response_replay_list.pb.h"
 #include "pb/serverinfo_replay.pb.h"
-#include "pending_command.h"
 
 #include <QFileIconProvider>
 #include <QHeaderView>
diff --git a/cockatrice/src/remotereplaylist_treewidget.h b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h
similarity index 100%
rename from cockatrice/src/remotereplaylist_treewidget.h
rename to cockatrice/src/server/remote/remote_replay_list_tree_widget.h
diff --git a/cockatrice/src/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
similarity index 98%
rename from cockatrice/src/user_context_menu.cpp
rename to cockatrice/src/server/user/user_context_menu.cpp
index 902ec8c01..944796319 100644
--- a/cockatrice/src/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -1,8 +1,12 @@
 #include "user_context_menu.h"
 
-#include "abstractclient.h"
-#include "chatview/chatview.h"
-#include "gameselector.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/tabs/tab_account.h"
+#include "../../client/tabs/tab_game.h"
+#include "../../client/tabs/tab_supervisor.h"
+#include "../../game/game_selector.h"
+#include "../chat_view/chat_view.h"
+#include "../pending_command.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/commands.pb.h"
 #include "pb/moderator_commands.pb.h"
@@ -12,12 +16,8 @@
 #include "pb/response_warn_history.pb.h"
 #include "pb/response_warn_list.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "tab_account.h"
-#include "tab_game.h"
-#include "tab_supervisor.h"
-#include "userinfobox.h"
-#include "userlist.h"
+#include "user_info_box.h"
+#include "user_list.h"
 
 #include <QAction>
 #include <QMenu>
diff --git a/cockatrice/src/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h
similarity index 100%
rename from cockatrice/src/user_context_menu.h
rename to cockatrice/src/server/user/user_context_menu.h
diff --git a/cockatrice/src/userinfobox.cpp b/cockatrice/src/server/user/user_info_box.cpp
similarity index 97%
rename from cockatrice/src/userinfobox.cpp
rename to cockatrice/src/server/user/user_info_box.cpp
index 65290c6de..b291f62ff 100644
--- a/cockatrice/src/userinfobox.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,15 +1,15 @@
-#include "userinfobox.h"
+#include "user_info_box.h"
 
-#include "abstractclient.h"
-#include "dlg_edit_avatar.h"
-#include "dlg_edit_password.h"
-#include "dlg_edit_user.h"
-#include "gettextwithmax.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/get_text_with_max.h"
+#include "../../client/ui/pixel_map_generator.h"
+#include "../../dialogs/dlg_edit_avatar.h"
+#include "../../dialogs/dlg_edit_password.h"
+#include "../../dialogs/dlg_edit_user.h"
+#include "../pending_command.h"
 #include "passwordhasher.h"
 #include "pb/response_get_user_info.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "pixmapgenerator.h"
 
 #include <QDateTime>
 #include <QGridLayout>
diff --git a/cockatrice/src/userinfobox.h b/cockatrice/src/server/user/user_info_box.h
similarity index 100%
rename from cockatrice/src/userinfobox.h
rename to cockatrice/src/server/user/user_info_box.h
diff --git a/cockatrice/src/userconnection_information.cpp b/cockatrice/src/server/user/user_info_connection.cpp
similarity index 97%
rename from cockatrice/src/userconnection_information.cpp
rename to cockatrice/src/server/user/user_info_connection.cpp
index bebe25b40..db08f2f78 100644
--- a/cockatrice/src/userconnection_information.cpp
+++ b/cockatrice/src/server/user/user_info_connection.cpp
@@ -1,6 +1,6 @@
-#include "userconnection_information.h"
+#include "user_info_connection.h"
 
-#include "settingscache.h"
+#include "../../settings/cache_settings.h"
 
 #include <QDebug>
 #include <utility>
diff --git a/cockatrice/src/userconnection_information.h b/cockatrice/src/server/user/user_info_connection.h
similarity index 100%
rename from cockatrice/src/userconnection_information.h
rename to cockatrice/src/server/user/user_info_connection.h
diff --git a/cockatrice/src/userlist.cpp b/cockatrice/src/server/user/user_list.cpp
similarity index 98%
rename from cockatrice/src/userlist.cpp
rename to cockatrice/src/server/user/user_list.cpp
index deaff2aca..8ea6f341f 100644
--- a/cockatrice/src/userlist.cpp
+++ b/cockatrice/src/server/user/user_list.cpp
@@ -1,15 +1,15 @@
-#include "userlist.h"
+#include "user_list.h"
 
-#include "abstractclient.h"
-#include "gameselector.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/tabs/tab_account.h"
+#include "../../client/tabs/tab_supervisor.h"
+#include "../../client/ui/pixel_map_generator.h"
+#include "../../game/game_selector.h"
+#include "../pending_command.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_get_games_of_user.pb.h"
 #include "pb/response_get_user_info.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "pixmapgenerator.h"
-#include "tab_account.h"
-#include "tab_supervisor.h"
 #include "trice_limits.h"
 #include "user_context_menu.h"
 
diff --git a/cockatrice/src/userlist.h b/cockatrice/src/server/user/user_list.h
similarity index 100%
rename from cockatrice/src/userlist.h
rename to cockatrice/src/server/user/user_list.h
diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settings/cache_settings.cpp
similarity index 99%
rename from cockatrice/src/settingscache.cpp
rename to cockatrice/src/settings/cache_settings.cpp
index d3185c853..7ec09740d 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -1,6 +1,6 @@
-#include "settingscache.h"
+#include "cache_settings.h"
 
-#include "releasechannel.h"
+#include "../client/network/release_channel.h"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settings/cache_settings.h
similarity index 98%
rename from cockatrice/src/settingscache.h
rename to cockatrice/src/settings/cache_settings.h
index d3d53a9d4..3c7dd8e37 100644
--- a/cockatrice/src/settingscache.h
+++ b/cockatrice/src/settings/cache_settings.h
@@ -1,13 +1,13 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "settings/carddatabasesettings.h"
-#include "settings/downloadsettings.h"
-#include "settings/gamefilterssettings.h"
-#include "settings/layoutssettings.h"
-#include "settings/messagesettings.h"
-#include "settings/serverssettings.h"
-#include "shortcutssettings.h"
+#include "card_database_settings.h"
+#include "download_settings.h"
+#include "game_filters_settings.h"
+#include "layouts_settings.h"
+#include "message_settings.h"
+#include "servers_settings.h"
+#include "shortcuts_settings.h"
 
 #include <QObject>
 #include <QSize>
diff --git a/cockatrice/src/settings/carddatabasesettings.cpp b/cockatrice/src/settings/card_database_settings.cpp
similarity index 96%
rename from cockatrice/src/settings/carddatabasesettings.cpp
rename to cockatrice/src/settings/card_database_settings.cpp
index 5c04eafd3..777d7b568 100644
--- a/cockatrice/src/settings/carddatabasesettings.cpp
+++ b/cockatrice/src/settings/card_database_settings.cpp
@@ -1,4 +1,4 @@
-#include "carddatabasesettings.h"
+#include "card_database_settings.h"
 
 CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardDatabase.ini", parent)
diff --git a/cockatrice/src/settings/carddatabasesettings.h b/cockatrice/src/settings/card_database_settings.h
similarity index 96%
rename from cockatrice/src/settings/carddatabasesettings.h
rename to cockatrice/src/settings/card_database_settings.h
index cd6f8e4ae..9923a8003 100644
--- a/cockatrice/src/settings/carddatabasesettings.h
+++ b/cockatrice/src/settings/card_database_settings.h
@@ -1,7 +1,7 @@
 #ifndef CARDDATABASESETTINGS_H
 #define CARDDATABASESETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 #include <QObject>
 #include <QSettings>
diff --git a/cockatrice/src/settings/downloadsettings.cpp b/cockatrice/src/settings/download_settings.cpp
similarity index 96%
rename from cockatrice/src/settings/downloadsettings.cpp
rename to cockatrice/src/settings/download_settings.cpp
index f24b157d2..1af9d4f71 100644
--- a/cockatrice/src/settings/downloadsettings.cpp
+++ b/cockatrice/src/settings/download_settings.cpp
@@ -1,6 +1,6 @@
-#include "downloadsettings.h"
+#include "download_settings.h"
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr)
     : SettingsManager(settingPath + "downloads.ini", parent)
diff --git a/cockatrice/src/settings/downloadsettings.h b/cockatrice/src/settings/download_settings.h
similarity index 94%
rename from cockatrice/src/settings/downloadsettings.h
rename to cockatrice/src/settings/download_settings.h
index cee4d94bd..5916b0083 100644
--- a/cockatrice/src/settings/downloadsettings.h
+++ b/cockatrice/src/settings/download_settings.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_DOWNLOADSETTINGS_H
 #define COCKATRICE_DOWNLOADSETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 #include <QObject>
 
diff --git a/cockatrice/src/settings/gamefilterssettings.cpp b/cockatrice/src/settings/game_filters_settings.cpp
similarity index 99%
rename from cockatrice/src/settings/gamefilterssettings.cpp
rename to cockatrice/src/settings/game_filters_settings.cpp
index 8bd2c8ff4..adb0e094f 100644
--- a/cockatrice/src/settings/gamefilterssettings.cpp
+++ b/cockatrice/src/settings/game_filters_settings.cpp
@@ -1,4 +1,4 @@
-#include "gamefilterssettings.h"
+#include "game_filters_settings.h"
 
 #include <QCryptographicHash>
 #include <QTime>
diff --git a/cockatrice/src/settings/gamefilterssettings.h b/cockatrice/src/settings/game_filters_settings.h
similarity index 98%
rename from cockatrice/src/settings/gamefilterssettings.h
rename to cockatrice/src/settings/game_filters_settings.h
index fe168f53d..6129f36ad 100644
--- a/cockatrice/src/settings/gamefilterssettings.h
+++ b/cockatrice/src/settings/game_filters_settings.h
@@ -1,7 +1,7 @@
 #ifndef GAMEFILTERSSETTINGS_H
 #define GAMEFILTERSSETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 class GameFiltersSettings : public SettingsManager
 {
diff --git a/cockatrice/src/settings/layoutssettings.cpp b/cockatrice/src/settings/layouts_settings.cpp
similarity index 99%
rename from cockatrice/src/settings/layoutssettings.cpp
rename to cockatrice/src/settings/layouts_settings.cpp
index 0f4814196..7e17451b9 100644
--- a/cockatrice/src/settings/layoutssettings.cpp
+++ b/cockatrice/src/settings/layouts_settings.cpp
@@ -1,4 +1,4 @@
-#include "layoutssettings.h"
+#include "layouts_settings.h"
 
 LayoutsSettings::LayoutsSettings(QString settingPath, QObject *parent)
     : SettingsManager(settingPath + "layouts.ini", parent)
diff --git a/cockatrice/src/settings/layoutssettings.h b/cockatrice/src/settings/layouts_settings.h
similarity index 98%
rename from cockatrice/src/settings/layoutssettings.h
rename to cockatrice/src/settings/layouts_settings.h
index 467f76ee3..80bd71fe8 100644
--- a/cockatrice/src/settings/layoutssettings.h
+++ b/cockatrice/src/settings/layouts_settings.h
@@ -1,7 +1,7 @@
 #ifndef LAYOUTSSETTINGS_H
 #define LAYOUTSSETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 #include <QSize>
 
diff --git a/cockatrice/src/settings/messagesettings.cpp b/cockatrice/src/settings/message_settings.cpp
similarity index 95%
rename from cockatrice/src/settings/messagesettings.cpp
rename to cockatrice/src/settings/message_settings.cpp
index 4f46c9626..75f43cc64 100644
--- a/cockatrice/src/settings/messagesettings.cpp
+++ b/cockatrice/src/settings/message_settings.cpp
@@ -1,4 +1,4 @@
-#include "messagesettings.h"
+#include "message_settings.h"
 
 MessageSettings::MessageSettings(QString settingPath, QObject *parent)
     : SettingsManager(settingPath + "messages.ini", parent)
diff --git a/cockatrice/src/settings/messagesettings.h b/cockatrice/src/settings/message_settings.h
similarity index 94%
rename from cockatrice/src/settings/messagesettings.h
rename to cockatrice/src/settings/message_settings.h
index f41c6a4a0..4c4dcc5fa 100644
--- a/cockatrice/src/settings/messagesettings.h
+++ b/cockatrice/src/settings/message_settings.h
@@ -1,7 +1,7 @@
 #ifndef MESSAGESETTINGS_H
 #define MESSAGESETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 class MessageSettings : public SettingsManager
 {
diff --git a/cockatrice/src/settings/serverssettings.cpp b/cockatrice/src/settings/servers_settings.cpp
similarity index 99%
rename from cockatrice/src/settings/serverssettings.cpp
rename to cockatrice/src/settings/servers_settings.cpp
index 8781cb34c..88ffac398 100644
--- a/cockatrice/src/settings/serverssettings.cpp
+++ b/cockatrice/src/settings/servers_settings.cpp
@@ -1,4 +1,4 @@
-#include "serverssettings.h"
+#include "servers_settings.h"
 
 #include <QDebug>
 #include <utility>
diff --git a/cockatrice/src/settings/serverssettings.h b/cockatrice/src/settings/servers_settings.h
similarity index 98%
rename from cockatrice/src/settings/serverssettings.h
rename to cockatrice/src/settings/servers_settings.h
index 72e6ce07e..ec9ad10fb 100644
--- a/cockatrice/src/settings/serverssettings.h
+++ b/cockatrice/src/settings/servers_settings.h
@@ -1,7 +1,7 @@
 #ifndef SERVERSSETTINGS_H
 #define SERVERSSETTINGS_H
 
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 #include <QObject>
 #define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us"
diff --git a/cockatrice/src/settings/settingsmanager.cpp b/cockatrice/src/settings/settings_manager.cpp
similarity index 97%
rename from cockatrice/src/settings/settingsmanager.cpp
rename to cockatrice/src/settings/settings_manager.cpp
index acd7664ce..211c8d3b3 100644
--- a/cockatrice/src/settings/settingsmanager.cpp
+++ b/cockatrice/src/settings/settings_manager.cpp
@@ -1,4 +1,4 @@
-#include "settingsmanager.h"
+#include "settings_manager.h"
 
 SettingsManager::SettingsManager(QString settingPath, QObject *parent)
     : QObject(parent), settings(settingPath, QSettings::IniFormat)
diff --git a/cockatrice/src/settings/settingsmanager.h b/cockatrice/src/settings/settings_manager.h
similarity index 100%
rename from cockatrice/src/settings/settingsmanager.h
rename to cockatrice/src/settings/settings_manager.h
diff --git a/cockatrice/src/shortcutssettings.cpp b/cockatrice/src/settings/shortcuts_settings.cpp
similarity index 99%
rename from cockatrice/src/shortcutssettings.cpp
rename to cockatrice/src/settings/shortcuts_settings.cpp
index b34afb3c6..910b44d4c 100644
--- a/cockatrice/src/shortcutssettings.cpp
+++ b/cockatrice/src/settings/shortcuts_settings.cpp
@@ -1,4 +1,4 @@
-#include "shortcutssettings.h"
+#include "shortcuts_settings.h"
 
 #include <QFile>
 #include <QMessageBox>
diff --git a/cockatrice/src/shortcutssettings.h b/cockatrice/src/settings/shortcuts_settings.h
similarity index 100%
rename from cockatrice/src/shortcutssettings.h
rename to cockatrice/src/settings/shortcuts_settings.h
diff --git a/cockatrice/src/logger.cpp b/cockatrice/src/utility/logger.cpp
similarity index 100%
rename from cockatrice/src/logger.cpp
rename to cockatrice/src/utility/logger.cpp
diff --git a/cockatrice/src/logger.h b/cockatrice/src/utility/logger.h
similarity index 100%
rename from cockatrice/src/logger.h
rename to cockatrice/src/utility/logger.h
diff --git a/cockatrice/src/sequenceEdit/sequenceedit.cpp b/cockatrice/src/utility/sequence_edit.cpp
similarity index 98%
rename from cockatrice/src/sequenceEdit/sequenceedit.cpp
rename to cockatrice/src/utility/sequence_edit.cpp
index ca3d24909..183e2096e 100644
--- a/cockatrice/src/sequenceEdit/sequenceedit.cpp
+++ b/cockatrice/src/utility/sequence_edit.cpp
@@ -1,6 +1,6 @@
-#include "sequenceedit.h"
+#include "sequence_edit.h"
 
-#include "../settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QHBoxLayout>
 #include <QKeyEvent>
diff --git a/cockatrice/src/sequenceEdit/sequenceedit.h b/cockatrice/src/utility/sequence_edit.h
similarity index 100%
rename from cockatrice/src/sequenceEdit/sequenceedit.h
rename to cockatrice/src/utility/sequence_edit.h
diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
index 3a4e533e1..78fe36350 100644
--- a/dbconverter/CMakeLists.txt
+++ b/dbconverter/CMakeLists.txt
@@ -5,20 +5,24 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$
 set(dbconverter_SOURCES
     src/main.cpp
     src/mocks.cpp
-    ../cockatrice/src/carddatabase.cpp
-    ../cockatrice/src/carddbparser/carddatabaseparser.cpp
-    ../cockatrice/src/carddbparser/cockatricexml3.cpp
-    ../cockatrice/src/carddbparser/cockatricexml4.cpp
-    ../cockatrice/src/settings/settingsmanager.cpp
+    ../cockatrice/src/game/cards/card_database.cpp
+    ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    ../cockatrice/src/settings/settings_manager.cpp
     ${VERSION_STRING_CPP}
 )
 
 set(QT_DONT_USE_QTGUI TRUE)
 
 if(Qt6_FOUND)
-  qt6_wrap_cpp(dbconverter_SOURCES ../cockatrice/src/settingscache.h ../cockatrice/src/settings/carddatabasesettings.h)
+  qt6_wrap_cpp(
+    dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h
+  )
 elseif(Qt5_FOUND)
-  qt5_wrap_cpp(dbconverter_SOURCES ../cockatrice/src/settingscache.h ../cockatrice/src/settings/carddatabasesettings.h)
+  qt5_wrap_cpp(
+    dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h
+  )
 endif()
 
 # Build servatrice binary and link it
diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h
index 32fcba9f5..67e64c14d 100644
--- a/dbconverter/src/main.h
+++ b/dbconverter/src/main.h
@@ -1,8 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include "../../cockatrice/src/carddatabase.h"
-#include "../../cockatrice/src/carddbparser/cockatricexml4.h"
+#include "../cockatrice/src/game/cards/card_database.h"
+#include "../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h"
 
 class CardDatabaseConverter : public CardDatabase
 {
diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h
index 4f8a722f8..d513ca03b 100644
--- a/dbconverter/src/mocks.h
+++ b/dbconverter/src/mocks.h
@@ -10,8 +10,8 @@
 
 #define PICTURELOADER_H
 
-#include "../../cockatrice/src/carddatabase.h"
-#include "../../cockatrice/src/settingscache.h"
+#include "../cockatrice/src/game/cards/card_database.h"
+#include "../cockatrice/src/settings/cache_settings.h"
 
 extern SettingsCache *settingsCache;
 
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 22942b4d6..155933308 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -16,22 +16,22 @@ set(oracle_SOURCES
     src/oracleimporter.cpp
     src/pagetemplates.cpp
     src/qt-json/json.cpp
-    ../cockatrice/src/carddatabase.cpp
-    ../cockatrice/src/pictureloader.cpp
-    ../cockatrice/src/carddbparser/carddatabaseparser.cpp
-    ../cockatrice/src/carddbparser/cockatricexml3.cpp
-    ../cockatrice/src/carddbparser/cockatricexml4.cpp
-    ../cockatrice/src/settingscache.cpp
-    ../cockatrice/src/shortcutssettings.cpp
-    ../cockatrice/src/settings/carddatabasesettings.cpp
-    ../cockatrice/src/settings/serverssettings.cpp
-    ../cockatrice/src/settings/settingsmanager.cpp
-    ../cockatrice/src/settings/messagesettings.cpp
-    ../cockatrice/src/settings/gamefilterssettings.cpp
-    ../cockatrice/src/settings/layoutssettings.cpp
-    ../cockatrice/src/settings/downloadsettings.cpp
-    ../cockatrice/src/thememanager.cpp
-    ../cockatrice/src/releasechannel.cpp
+    ../cockatrice/src/game/cards/card_database.cpp
+    ../cockatrice/src/client/ui/picture_loader.cpp
+    ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    ../cockatrice/src/settings/cache_settings.cpp
+    ../cockatrice/src/settings/shortcuts_settings.cpp
+    ../cockatrice/src/settings/card_database_settings.cpp
+    ../cockatrice/src/settings/servers_settings.cpp
+    ../cockatrice/src/settings/settings_manager.cpp
+    ../cockatrice/src/settings/message_settings.cpp
+    ../cockatrice/src/settings/game_filters_settings.cpp
+    ../cockatrice/src/settings/layouts_settings.cpp
+    ../cockatrice/src/settings/download_settings.cpp
+    ../cockatrice/src/client/ui/theme_manager.cpp
+    ../cockatrice/src/client/network/release_channel.cpp
     ${VERSION_STRING_CPP}
 )
 
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index a8b314985..009a099ac 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -1,8 +1,8 @@
 #include "main.h"
 
+#include "client/ui/theme_manager.h"
 #include "oraclewizard.h"
-#include "settingscache.h"
-#include "thememanager.h"
+#include "settings/cache_settings.h"
 
 #include <QApplication>
 #include <QCommandLineParser>
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index d48824cc0..c21ce72be 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -1,6 +1,6 @@
 #include "oracleimporter.h"
 
-#include "carddbparser/cockatricexml4.h"
+#include "game/cards/card_database_parser/cockatrice_xml_4.h"
 #include "qt-json/json.h"
 
 #include <QtWidgets>
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index d512ebb41..7c1c21bf8 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -3,7 +3,7 @@
 
 #include <QMap>
 #include <QVariant>
-#include <carddatabase.h>
+#include <game/cards/card_database.h>
 #include <utility>
 
 // many users prefer not to see these sets with non english arts
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index a85f1b775..902543c06 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -2,7 +2,7 @@
 
 #include "main.h"
 #include "oracleimporter.h"
-#include "settingscache.h"
+#include "settings/cache_settings.h"
 #include "version_string.h"
 
 #include <QAbstractButton>
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 2f3a7fa80..a54432f54 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -5,20 +5,24 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
 )
 
 if(Qt6_FOUND)
-  qt6_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
+  qt6_wrap_cpp(
+    MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
+  )
 elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
+  qt5_wrap_cpp(
+    MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
+  )
 endif()
 
 add_executable(
   carddatabase_test
   ${MOCKS_SOURCES}
   ${VERSION_STRING_CPP}
-  ../../cockatrice/src/carddatabase.cpp
-  ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
-  ../../cockatrice/src/carddbparser/cockatricexml3.cpp
-  ../../cockatrice/src/carddbparser/cockatricexml4.cpp
-  ../../cockatrice/src/settings/settingsmanager.cpp
+  ../../cockatrice/src/game/cards/card_database.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/settings/settings_manager.cpp
   carddatabase_test.cpp
   mocks.cpp
 )
@@ -26,14 +30,14 @@ add_executable(
   filter_string_test
   ${MOCKS_SOURCES}
   ${VERSION_STRING_CPP}
-  ../../cockatrice/src/carddatabase.cpp
-  ../../cockatrice/src/carddbparser/carddatabaseparser.cpp
-  ../../cockatrice/src/carddbparser/cockatricexml3.cpp
-  ../../cockatrice/src/carddbparser/cockatricexml4.cpp
-  ../../cockatrice/src/cardfilter.cpp
-  ../../cockatrice/src/filter_string.cpp
-  ../../cockatrice/src/filtertree.cpp
-  ../../cockatrice/src/settings/settingsmanager.cpp
+  ../../cockatrice/src/game/cards/card_database.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/game/filters/filter_card.cpp
+  ../../cockatrice/src/game/filters/filter_string.cpp
+  ../../cockatrice/src/game/filters/filter_tree.cpp
+  ../../cockatrice/src/settings/settings_manager.cpp
   filter_string_test.cpp
   mocks.cpp
 )
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index 07824087b..d8fa41ff1 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -1,4 +1,4 @@
-#include "../../cockatrice/src/filter_string.h"
+#include "../../cockatrice/src/game/filters/filter_string.h"
 #include "mocks.h"
 
 #include "gtest/gtest.h"
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index 4f8a722f8..50b8616e2 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -10,8 +10,8 @@
 
 #define PICTURELOADER_H
 
-#include "../../cockatrice/src/carddatabase.h"
-#include "../../cockatrice/src/settingscache.h"
+#include "../../cockatrice/src/game/cards/card_database.h"
+#include "../../cockatrice/src/settings/cache_settings.h"
 
 extern SettingsCache *settingsCache;
 
diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index 88968f252..4593a7b56 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,4 +1,4 @@
-#include "../cockatrice/src/userinfobox.h"
+#include "../cockatrice/src/server/user/user_info_box.h"
 
 #include "gtest/gtest.h"