diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index f0e363e18..bd99d08bf 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -57,57 +57,57 @@ set(cockatrice_SOURCES
     src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
     src/game/arrow_registry.cpp
-    src/game/board/abstract_card_drag_item.cpp
-    src/game/board/abstract_card_item.cpp
-    src/game/board/abstract_counter.cpp
+    src/game_graphics/board/abstract_card_drag_item.cpp
+    src/game_graphics/board/abstract_card_item.cpp
+    src/game_graphics/board/abstract_counter.cpp
     src/game/board/arrow_data.cpp
-    src/game/board/arrow_item.cpp
-    src/game/board/arrow_target.cpp
-    src/game/board/card_drag_item.cpp
-    src/game/board/card_item.cpp
+    src/game_graphics/board/arrow_item.cpp
+    src/game_graphics/board/arrow_target.cpp
+    src/game_graphics/board/card_drag_item.cpp
+    src/game_graphics/board/card_item.cpp
     src/game/board/card_list.cpp
     src/game/board/card_state.cpp
-    src/game/board/counter_general.cpp
+    src/game_graphics/board/counter_general.cpp
     src/game/board/counter_state.cpp
-    src/game/board/translate_counter_name.cpp
-    src/game/deckview/deck_view.cpp
-    src/game/deckview/deck_view_container.cpp
-    src/game/deckview/tabbed_deck_view_container.cpp
-    src/game/dialogs/dlg_create_token.cpp
-    src/game/dialogs/dlg_move_top_cards_until.cpp
-    src/game/dialogs/dlg_roll_dice.cpp
+    src/game_graphics/board/translate_counter_name.cpp
+    src/game_graphics/deckview/deck_view.cpp
+    src/game_graphics/deckview/deck_view_container.cpp
+    src/game_graphics/deckview/tabbed_deck_view_container.cpp
+    src/game_graphics/dialogs/dlg_create_token.cpp
+    src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+    src/game_graphics/dialogs/dlg_roll_dice.cpp
     src/game/game.cpp
     src/game/game_event_handler.cpp
     src/game/game_meta_info.cpp
-    src/game/game_scene.cpp
+    src/game_graphics/game_scene.cpp
     src/game/game_state.cpp
-    src/game/game_view.cpp
-    src/game/hand_counter.cpp
-    src/game/log/message_log_widget.cpp
+    src/game_graphics/game_view.cpp
+    src/game_graphics/hand_counter.cpp
+    src/game_graphics/log/message_log_widget.cpp
     src/game/phase.cpp
-    src/game/phases_toolbar.cpp
-    src/game/player/menu/card_menu.cpp
-    src/game/player/menu/custom_zone_menu.cpp
-    src/game/player/menu/grave_menu.cpp
-    src/game/player/menu/hand_menu.cpp
-    src/game/player/menu/library_menu.cpp
-    src/game/player/menu/move_menu.cpp
-    src/game/player/menu/player_menu.cpp
-    src/game/player/menu/pt_menu.cpp
-    src/game/player/menu/rfg_menu.cpp
-    src/game/player/menu/say_menu.cpp
-    src/game/player/menu/sideboard_menu.cpp
-    src/game/player/menu/utility_menu.cpp
+    src/game_graphics/phases_toolbar.cpp
+    src/game_graphics/player/menu/card_menu.cpp
+    src/game_graphics/player/menu/custom_zone_menu.cpp
+    src/game_graphics/player/menu/grave_menu.cpp
+    src/game_graphics/player/menu/hand_menu.cpp
+    src/game_graphics/player/menu/library_menu.cpp
+    src/game_graphics/player/menu/move_menu.cpp
+    src/game_graphics/player/menu/player_menu.cpp
+    src/game_graphics/player/menu/pt_menu.cpp
+    src/game_graphics/player/menu/rfg_menu.cpp
+    src/game_graphics/player/menu/say_menu.cpp
+    src/game_graphics/player/menu/sideboard_menu.cpp
+    src/game_graphics/player/menu/utility_menu.cpp
     src/game/player/player_actions.cpp
-    src/game/player/player_area.cpp
-    src/game/player/player_dialogs.cpp
+    src/game_graphics/player/player_area.cpp
+    src/game_graphics/player/player_dialogs.cpp
     src/game/player/player_event_handler.cpp
-    src/game/player/player_graphics_item.cpp
+    src/game_graphics/player/player_graphics_item.cpp
     src/game/player/player_info.cpp
-    src/game/player/player_list_widget.cpp
+    src/game_graphics/player/player_list_widget.cpp
     src/game/player/player_logic.cpp
     src/game/player/player_manager.cpp
-    src/game/player/player_target.cpp
+    src/game_graphics/player/player_target.cpp
     src/game/replay.cpp
     src/game/zones/card_zone_logic.cpp
     src/game/zones/hand_zone_logic.cpp
diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp
index 5b1b4bff2..c20003ece 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/cockatrice/src/game/abstract_game.cpp
@@ -3,7 +3,7 @@
 #include "../interface/widgets/tabs/tab_game.h"
 #include "player/player_logic.h"
 
-AbstractGame::AbstractGame(TabGame *_tab) : QObject(_tab), tab(_tab)
+AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);
diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index 2441bac2d..5115ed5ca 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -16,26 +16,19 @@
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
-class TabGame;
 class AbstractGame : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AbstractGame(TabGame *tab);
+    explicit AbstractGame(QObject *parent);
 
-    TabGame *tab;
     GameMetaInfo *gameMetaInfo;
     GameState *gameState;
     GameEventHandler *gameEventHandler;
     PlayerManager *playerManager;
     CardItem *activeCard;
 
-    TabGame *getTab() const
-    {
-        return tab;
-    }
-
     GameMetaInfo *getGameMetaInfo()
     {
         return gameMetaInfo;
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
index e679d2972..286764b3b 100644
--- a/cockatrice/src/game/arrow_registry.cpp
+++ b/cockatrice/src/game/arrow_registry.cpp
@@ -1,6 +1,6 @@
 #include "arrow_registry.h"
 
-#include "board/arrow_item.h"
+#include "../game_graphics/board/arrow_item.h"
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {
diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index c324ca10a..0080b5ae6 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,6 +1,6 @@
 #include "card_list.h"
 
-#include "card_item.h"
+#include "../../game_graphics/board/card_item.h"
 
 #include <QDebug>
 #include <algorithm>
diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp
index 38477f7f7..4c8b109c2 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -4,16 +4,16 @@
 
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
-Game::Game(TabGame *_tab,
+Game::Game(QObject *_parent,
+           bool isLocalGame,
            QList<AbstractClient *> &_clients,
            const Event_GameJoined &event,
            const QMap<int, QString> &_roomGameTypes)
-    : AbstractGame(_tab)
+    : AbstractGame(_parent)
 {
     gameMetaInfo->setFromProto(event.game_info());
     gameMetaInfo->setRoomGameTypes(_roomGameTypes);
-    gameState = new GameState(this, 0, event.host_id(), tab->getTabSupervisor()->getIsLocalGame(), _clients, false,
-                              event.resuming(), -1, false);
+    gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
     playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator());
     gameMetaInfo->setStarted(false);
diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h
index ccdb679df..4f912664c 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -16,7 +16,8 @@ class Game : public AbstractGame
     Q_OBJECT
 
 public:
-    Game(TabGame *tab,
+    Game(QObject *parent,
+         bool isLocalGame,
          QList<AbstractClient *> &_clients,
          const Event_GameJoined &event,
          const QMap<int, QString> &_roomGameTypes);
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 629e2f6a1..4a96eebdb 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,8 +1,8 @@
 #include "game_event_handler.h"
 
+#include "../game_graphics/log/message_log_widget.h"
 #include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
-#include "log/message_log_widget.h"
 
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 2b0428dd8..de909ca5e 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,14 +1,13 @@
 #include "player_actions.h"
 
+#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
+#include "../../game_graphics/dialogs/dlg_roll_dice.h"
+#include "../../game_graphics/player/card_menu_action_type.h"
 #include "../../game_graphics/zones/hand_zone.h"
 #include "../../game_graphics/zones/table_zone.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
-#include "../board/card_item.h"
-#include "../dialogs/dlg_move_top_cards_until.h"
-#include "../dialogs/dlg_roll_dice.h"
 #include "../zones/view_zone_logic.h"
-#include "card_menu_action_type.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index 2779fa5aa..3f1960892 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -7,9 +7,11 @@
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../dialogs/dlg_create_token.h"
-#include "../dialogs/dlg_move_top_cards_until.h"
-#include "card_menu_action_type.h"
+
+#include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/dialogs/dlg_create_token.h"
+#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
+#include "../../game_graphics/player/card_menu_action_type.h"
 #include "event_processing_options.h"
 #include "player_logic.h"
 
@@ -26,7 +28,6 @@ class Message;
 }
 } // namespace google
 
-class CardItem;
 class Command_MoveCard;
 class GameEventContext;
 class PendingCommand;
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index aa751170b..bc48298f7 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,10 +1,10 @@
 #include "player_event_handler.h"
 
+#include "../../game_graphics/board/arrow_item.h"
+#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/zones/view_zone.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/arrow_data.h"
-#include "../board/arrow_item.h"
-#include "../board/card_item.h"
 #include "../board/card_list.h"
 #include "player_actions.h"
 #include "player_logic.h"
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index e67131ceb..4ec39edbd 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "player_target.h"
+#include "../../game_graphics/player/player_target.h"
 
 #include <QObject>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp
index b748eb19a..485e2fc5c 100644
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/cockatrice/src/game/player/player_logic.cpp
@@ -1,18 +1,18 @@
 #include "player_logic.h"
 
+#include "../../game_graphics/board/arrow_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/board/counter_general.h"
+#include "../../game_graphics/game_scene.h"
+#include "../../game_graphics/player/player_target.h"
 #include "../../game_graphics/zones/hand_zone.h"
 #include "../../game_graphics/zones/pile_zone.h"
 #include "../../game_graphics/zones/stack_zone.h"
 #include "../../game_graphics/zones/table_zone.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/arrow_item.h"
-#include "../board/card_item.h"
 #include "../board/card_list.h"
-#include "../board/counter_general.h"
-#include "../game_scene.h"
 #include "player_actions.h"
-#include "player_target.h"
 
 #include <QDebug>
 #include <QMenu>
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
index c83892dea..a89cb6eed 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@@ -7,6 +7,7 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "../../game_graphics/player/player_area.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 #include "../board/arrow_data.h"
 #include "../interface/deck_loader/loaded_deck.h"
@@ -14,10 +15,7 @@
 #include "../zones/pile_zone_logic.h"
 #include "../zones/stack_zone_logic.h"
 #include "../zones/table_zone_logic.h"
-#include "menu/player_menu.h"
-#include "player_area.h"
 #include "player_event_handler.h"
-#include "player_graphics_item.h"
 #include "player_info.h"
 
 #include <QInputDialog>
@@ -54,6 +52,7 @@ class PlayerMenu;
 class QAction;
 class QMenu;
 class ServerInfo_Arrow;
+class ServerInfo_Card;
 class ServerInfo_Counter;
 class ServerInfo_Player;
 class ServerInfo_User;
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index 6886f817a..69f9d8b20 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -2,9 +2,9 @@
 
 #include "../interface/widgets/tabs/tab_game.h"
 
-Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
+Replay::Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
 {
-    gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, false, false, -1, false);
+    gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
     playerManager = new PlayerManager(this, -1, false, true);
     loadReplay(_replay);
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
index b837e4b8c..ecb3a10d0 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -15,7 +15,7 @@ class Replay : public AbstractGame
     Q_OBJECT
 
 public:
-    explicit Replay(TabGame *_tab, GameReplay *_replay);
+    explicit Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame);
 };
 
 #endif // COCKATRICE_REPLAY_H
diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp
index aace7097e..7e0585f4e 100644
--- a/cockatrice/src/game/zones/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/card_zone_logic.cpp
@@ -1,7 +1,7 @@
 #include "card_zone_logic.h"
 
+#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../board/card_item.h"
 #include "../player/player_actions.h"
 #include "../player/player_logic.h"
 #include "view_zone_logic.h"
diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp
index 36af11131..3bdd15902 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/hand_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "hand_zone_logic.h"
 
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
 HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp
index 66edde4b7..0f374fb84 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.cpp
+++ b/cockatrice/src/game/zones/pile_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "pile_zone_logic.h"
 
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
 
 PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,
diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp
index 2120b9a1d..341d4b0e4 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/stack_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "stack_zone_logic.h"
 
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
 StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp
index 3d7ac4297..a4f033819 100644
--- a/cockatrice/src/game/zones/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/table_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "table_zone_logic.h"
 
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
 
 TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
                                const QString &_name,
diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp
index fa4a73d38..8782a1762 100644
--- a/cockatrice/src/game/zones/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/view_zone_logic.cpp
@@ -1,7 +1,7 @@
 #include "view_zone_logic.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
 
 /**
  * @param _player the player that the cards are revealed to.
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
similarity index 100%
rename from cockatrice/src/game/board/abstract_card_drag_item.cpp
rename to cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
similarity index 100%
rename from cockatrice/src/game/board/abstract_card_drag_item.h
rename to cockatrice/src/game_graphics/board/abstract_card_drag_item.h
diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
similarity index 100%
rename from cockatrice/src/game/board/abstract_card_item.cpp
rename to cockatrice/src/game_graphics/board/abstract_card_item.cpp
diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h
similarity index 98%
rename from cockatrice/src/game/board/abstract_card_item.h
rename to cockatrice/src/game_graphics/board/abstract_card_item.h
index 863954b73..bdb5f7cf1 100644
--- a/cockatrice/src/game/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@@ -7,9 +7,9 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
 #include "../card_dimensions.h"
 #include "arrow_target.h"
+#include "graphics_item_type.h"
 
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
similarity index 97%
rename from cockatrice/src/game/board/abstract_counter.cpp
rename to cockatrice/src/game_graphics/board/abstract_counter.cpp
index 18787a0bc..219dd456e 100644
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -1,10 +1,10 @@
 #include "abstract_counter.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../../game_graphics/board/translate_counter_name.h"
 #include "../../interface/widgets/tabs/tab_game.h"
-#include "../player/player_actions.h"
-#include "../player/player_logic.h"
-#include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
diff --git a/cockatrice/src/game/board/abstract_counter.h b/cockatrice/src/game_graphics/board/abstract_counter.h
similarity index 98%
rename from cockatrice/src/game/board/abstract_counter.h
rename to cockatrice/src/game_graphics/board/abstract_counter.h
index b31bd1aa3..b319a722d 100644
--- a/cockatrice/src/game/board/abstract_counter.h
+++ b/cockatrice/src/game_graphics/board/abstract_counter.h
@@ -7,9 +7,9 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
+#include "../../game/board/counter_state.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 #include "../player/menu/abstract_player_component.h"
-#include "counter_state.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game_graphics/board/arrow_item.cpp
similarity index 99%
rename from cockatrice/src/game/board/arrow_item.cpp
rename to cockatrice/src/game_graphics/board/arrow_item.cpp
index 0b740bc70..af6a6bf36 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@@ -2,11 +2,11 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/zones/card_zone.h"
-#include "../player/player_actions.h"
-#include "../player/player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
+#include "../zones/card_zone.h"
 #include "card_item.h"
 
 #include <QDebug>
diff --git a/cockatrice/src/game/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
similarity index 98%
rename from cockatrice/src/game/board/arrow_item.h
rename to cockatrice/src/game_graphics/board/arrow_item.h
index 0c04c27f8..1c306e065 100644
--- a/cockatrice/src/game/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -1,7 +1,7 @@
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
-#include "arrow_data.h"
+#include "../../game/board/arrow_data.h"
 #include "arrow_target.h"
 
 #include <QGraphicsItem>
diff --git a/cockatrice/src/game/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp
similarity index 92%
rename from cockatrice/src/game/board/arrow_target.cpp
rename to cockatrice/src/game_graphics/board/arrow_target.cpp
index edf526e4e..79b21d921 100644
--- a/cockatrice/src/game/board/arrow_target.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_target.cpp
@@ -1,6 +1,6 @@
 #include "arrow_target.h"
 
-#include "../player/player_logic.h"
+#include "../../game/player/player_logic.h"
 #include "arrow_item.h"
 
 ArrowTarget::ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent) : AbstractGraphicsItem(parent), owner(_owner)
diff --git a/cockatrice/src/game/board/arrow_target.h b/cockatrice/src/game_graphics/board/arrow_target.h
similarity index 93%
rename from cockatrice/src/game/board/arrow_target.h
rename to cockatrice/src/game_graphics/board/arrow_target.h
index 664572705..bf89c5456 100644
--- a/cockatrice/src/game/board/arrow_target.h
+++ b/cockatrice/src/game_graphics/board/arrow_target.h
@@ -7,7 +7,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
+#include "abstract_graphics_item.h"
 
 #include <QList>
 
diff --git a/cockatrice/src/game/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp
similarity index 96%
rename from cockatrice/src/game/board/card_drag_item.cpp
rename to cockatrice/src/game_graphics/board/card_drag_item.cpp
index 39fb9a390..49467c5c9 100644
--- a/cockatrice/src/game/board/card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp
@@ -1,9 +1,9 @@
 #include "card_drag_item.h"
 
-#include "../../game_graphics/zones/card_zone.h"
-#include "../../game_graphics/zones/table_zone.h"
-#include "../../game_graphics/zones/view_zone.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>
diff --git a/cockatrice/src/game/board/card_drag_item.h b/cockatrice/src/game_graphics/board/card_drag_item.h
similarity index 100%
rename from cockatrice/src/game/board/card_drag_item.h
rename to cockatrice/src/game_graphics/board/card_drag_item.h
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp
similarity index 98%
rename from cockatrice/src/game/board/card_item.cpp
rename to cockatrice/src/game_graphics/board/card_item.cpp
index 029822805..cabe988c2 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@@ -1,14 +1,14 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/zones/table_zone.h"
-#include "../../game_graphics/zones/view_zone.h"
+#include "../../game/phase.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../game_scene.h"
-#include "../phase.h"
-#include "../player/player_actions.h"
-#include "../player/player_logic.h"
-#include "../zones/view_zone_logic.h"
+#include "../zones/table_zone.h"
+#include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
 
@@ -482,8 +482,7 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         (!SettingsCache::instance().getDoubleClickToPlay())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
-
-    if (owner != nullptr) { // cards without owner will be deleted
+    if (owner != nullptr) {
         setCursor(Qt::OpenHandCursor);
     }
     AbstractCardItem::mouseReleaseEvent(event);
@@ -539,4 +538,4 @@ QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
     }
 
     return AbstractCardItem::itemChange(change, value);
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h
similarity index 98%
rename from cockatrice/src/game/board/card_item.h
rename to cockatrice/src/game_graphics/board/card_item.h
index 87f9667de..8efcd085d 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@@ -7,9 +7,9 @@
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "../zones/card_zone_logic.h"
+#include "../../game/board/card_state.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "abstract_card_item.h"
-#include "card_state.h"
 
 #include <libcockatrice/network/server/remote/game/server_card.h>
 #include <libcockatrice/utility/trice_limits.h>
diff --git a/cockatrice/src/game/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp
similarity index 95%
rename from cockatrice/src/game/board/counter_general.cpp
rename to cockatrice/src/game_graphics/board/counter_general.cpp
index 5147ede6b..379c6f837 100644
--- a/cockatrice/src/game/board/counter_general.cpp
+++ b/cockatrice/src/game_graphics/board/counter_general.cpp
@@ -1,7 +1,7 @@
 #include "counter_general.h"
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/pixel_map_generator.h"
+#include "abstract_graphics_item.h"
 
 #include <QPainter>
 
diff --git a/cockatrice/src/game/board/counter_general.h b/cockatrice/src/game_graphics/board/counter_general.h
similarity index 100%
rename from cockatrice/src/game/board/counter_general.h
rename to cockatrice/src/game_graphics/board/counter_general.h
diff --git a/cockatrice/src/game/board/translate_counter_name.cpp b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
similarity index 100%
rename from cockatrice/src/game/board/translate_counter_name.cpp
rename to cockatrice/src/game_graphics/board/translate_counter_name.cpp
diff --git a/cockatrice/src/game/board/translate_counter_name.h b/cockatrice/src/game_graphics/board/translate_counter_name.h
similarity index 100%
rename from cockatrice/src/game/board/translate_counter_name.h
rename to cockatrice/src/game_graphics/board/translate_counter_name.h
diff --git a/cockatrice/src/game/card_dimensions.h b/cockatrice/src/game_graphics/card_dimensions.h
similarity index 100%
rename from cockatrice/src/game/card_dimensions.h
rename to cockatrice/src/game_graphics/card_dimensions.h
diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp
similarity index 100%
rename from cockatrice/src/game/deckview/deck_view.cpp
rename to cockatrice/src/game_graphics/deckview/deck_view.cpp
diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game_graphics/deckview/deck_view.h
similarity index 100%
rename from cockatrice/src/game/deckview/deck_view.h
rename to cockatrice/src/game_graphics/deckview/deck_view.h
diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
similarity index 100%
rename from cockatrice/src/game/deckview/deck_view_container.cpp
rename to cockatrice/src/game_graphics/deckview/deck_view_container.cpp
diff --git a/cockatrice/src/game/deckview/deck_view_container.h b/cockatrice/src/game_graphics/deckview/deck_view_container.h
similarity index 100%
rename from cockatrice/src/game/deckview/deck_view_container.h
rename to cockatrice/src/game_graphics/deckview/deck_view_container.h
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
similarity index 100%
rename from cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
rename to cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.h b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
similarity index 100%
rename from cockatrice/src/game/deckview/tabbed_deck_view_container.h
rename to cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_create_token.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_create_token.h
rename to cockatrice/src/game_graphics/dialogs/dlg_create_token.h
diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
rename to cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_roll_dice.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.h b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
similarity index 100%
rename from cockatrice/src/game/dialogs/dlg_roll_dice.h
rename to cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp
similarity index 98%
rename from cockatrice/src/game/game_scene.cpp
rename to cockatrice/src/game_graphics/game_scene.cpp
index dc55ecfe9..b9816a602 100644
--- a/cockatrice/src/game/game_scene.cpp
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@@ -1,15 +1,17 @@
 #include "game_scene.h"
 
 #include "../client/settings/cache_settings.h"
-#include "../game_graphics/zones/select_zone.h"
-#include "../game_graphics/zones/view_zone.h"
-#include "../game_graphics/zones/view_zone_widget.h"
-#include "abstract_game.h"
+#include "../game/abstract_game.h"
+#include "../game/player/player_actions.h"
+#include "../game/player/player_logic.h"
+#include "../game_graphics/player/player_graphics_item.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
-#include "player/player_actions.h"
+#include "player/menu/player_menu.h"
 #include "player/player_graphics_item.h"
-#include "player/player_logic.h"
+#include "zones/select_zone.h"
+#include "zones/view_zone.h"
+#include "zones/view_zone_widget.h"
 
 #include <QBasicTimer>
 #include <QDebug>
diff --git a/cockatrice/src/game/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
similarity index 98%
rename from cockatrice/src/game/game_scene.h
rename to cockatrice/src/game_graphics/game_scene.h
index 0587566d0..74e979556 100644
--- a/cockatrice/src/game/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -1,10 +1,10 @@
 #ifndef GAMESCENE_H
 #define GAMESCENE_H
 
-#include "arrow_registry.h"
-#include "board/arrow_data.h"
+#include "../game/arrow_registry.h"
+#include "../game/board/arrow_data.h"
+#include "../game/zones/card_zone_logic.h"
 #include "board/arrow_item.h"
-#include "zones/card_zone_logic.h"
 
 #include <QGraphicsScene>
 #include <QList>
diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp
similarity index 100%
rename from cockatrice/src/game/game_view.cpp
rename to cockatrice/src/game_graphics/game_view.cpp
diff --git a/cockatrice/src/game/game_view.h b/cockatrice/src/game_graphics/game_view.h
similarity index 100%
rename from cockatrice/src/game/game_view.h
rename to cockatrice/src/game_graphics/game_view.h
diff --git a/cockatrice/src/game/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp
similarity index 96%
rename from cockatrice/src/game/hand_counter.cpp
rename to cockatrice/src/game_graphics/hand_counter.cpp
index a853ae2de..35989ff38 100644
--- a/cockatrice/src/game/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@@ -1,6 +1,6 @@
 #include "hand_counter.h"
 
-#include "../game_graphics/zones/card_zone.h"
+#include "zones/card_zone.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
diff --git a/cockatrice/src/game/hand_counter.h b/cockatrice/src/game_graphics/hand_counter.h
similarity index 87%
rename from cockatrice/src/game/hand_counter.h
rename to cockatrice/src/game_graphics/hand_counter.h
index 41ab3b5b2..9aa65d514 100644
--- a/cockatrice/src/game/hand_counter.h
+++ b/cockatrice/src/game_graphics/hand_counter.h
@@ -7,8 +7,8 @@
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
-#include "../game_graphics/board/graphics_item_type.h"
+#include "board/abstract_graphics_item.h"
+#include "board/graphics_item_type.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
similarity index 99%
rename from cockatrice/src/game/log/message_log_widget.cpp
rename to cockatrice/src/game_graphics/log/message_log_widget.cpp
index 906f15c2e..ccd903b04 100644
--- a/cockatrice/src/game/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -1,13 +1,13 @@
 #include "message_log_widget.h"
 
+#include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
+#include "../../game/phase.h"
+#include "../../game/player/player_logic.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
-#include "../phase.h"
-#include "../player/player_logic.h"
 
-#include <../../client/settings/card_counter_settings.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/utility/zone_names.h>
diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
similarity index 99%
rename from cockatrice/src/game/log/message_log_widget.h
rename to cockatrice/src/game_graphics/log/message_log_widget.h
index 9f1990ac4..a145d358d 100644
--- a/cockatrice/src/game/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -7,8 +7,8 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
+#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
-#include "../zones/card_zone_logic.h"
 
 class AbstractGame;
 class CardItem;
diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp
similarity index 100%
rename from cockatrice/src/game/phases_toolbar.cpp
rename to cockatrice/src/game_graphics/phases_toolbar.cpp
diff --git a/cockatrice/src/game/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h
similarity index 97%
rename from cockatrice/src/game/phases_toolbar.h
rename to cockatrice/src/game_graphics/phases_toolbar.h
index 6f0931d61..39884ef75 100644
--- a/cockatrice/src/game/phases_toolbar.h
+++ b/cockatrice/src/game_graphics/phases_toolbar.h
@@ -8,7 +8,7 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
+#include "board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>
diff --git a/cockatrice/src/game/player/card_menu_action_type.h b/cockatrice/src/game_graphics/player/card_menu_action_type.h
similarity index 100%
rename from cockatrice/src/game/player/card_menu_action_type.h
rename to cockatrice/src/game_graphics/player/card_menu_action_type.h
diff --git a/cockatrice/src/game/player/menu/abstract_player_component.h b/cockatrice/src/game_graphics/player/menu/abstract_player_component.h
similarity index 100%
rename from cockatrice/src/game/player/menu/abstract_player_component.h
rename to cockatrice/src/game_graphics/player/menu/abstract_player_component.h
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
similarity index 99%
rename from cockatrice/src/game/player/menu/card_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/card_menu.cpp
index c1c33e37d..aa94c3be7 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -3,11 +3,11 @@
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
-#include "../../zones/view_zone_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../../game/zones/view_zone_logic.h"
 #include "../card_menu_action_type.h"
-#include "../player_actions.h"
 #include "../player_graphics_item.h"
-#include "../player_logic.h"
 #include "move_menu.h"
 #include "pt_menu.h"
 
diff --git a/cockatrice/src/game/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/card_menu.h
rename to cockatrice/src/game_graphics/player/menu/card_menu.h
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
similarity index 93%
rename from cockatrice/src/game/player/menu/custom_zone_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
index 106e646d9..743746cc8 100644
--- a/cockatrice/src/game/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -1,6 +1,7 @@
 #include "custom_zone_menu.h"
 
-#include "../player_logic.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.h b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/custom_zone_menu.h
rename to cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
diff --git a/cockatrice/src/game/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
similarity index 96%
rename from cockatrice/src/game/player/menu/grave_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/grave_menu.cpp
index 45762e900..698481f7a 100644
--- a/cockatrice/src/game/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
@@ -1,8 +1,9 @@
 #include "grave_menu.h"
 
-#include "../../abstract_game.h"
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/abstract_game.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QMenu>
diff --git a/cockatrice/src/game/player/menu/grave_menu.h b/cockatrice/src/game_graphics/player/menu/grave_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/grave_menu.h
rename to cockatrice/src/game_graphics/player/menu/grave_menu.h
diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
similarity index 98%
rename from cockatrice/src/game/player/menu/hand_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/hand_menu.cpp
index 64a8c5754..ba0702f07 100644
--- a/cockatrice/src/game/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
@@ -3,10 +3,10 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../game_graphics/zones/hand_zone.h"
-#include "../../abstract_game.h"
-#include "../player_actions.h"
+#include "../../game/abstract_game.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
-#include "../player_logic.h"
 
 #include <QAction>
 #include <QMenu>
diff --git a/cockatrice/src/game/player/menu/hand_menu.h b/cockatrice/src/game_graphics/player/menu/hand_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/hand_menu.h
rename to cockatrice/src/game_graphics/player/menu/hand_menu.h
diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
similarity index 99%
rename from cockatrice/src/game/player/menu/library_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/library_menu.cpp
index 00ab4592f..4c15e09ec 100644
--- a/cockatrice/src/game/player/menu/library_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
@@ -3,9 +3,10 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
-#include "../../abstract_game.h"
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/abstract_game.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QGraphicsView>
diff --git a/cockatrice/src/game/player/menu/library_menu.h b/cockatrice/src/game_graphics/player/menu/library_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/library_menu.h
rename to cockatrice/src/game_graphics/player/menu/library_menu.h
diff --git a/cockatrice/src/game/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
similarity index 96%
rename from cockatrice/src/game/player/menu/move_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/move_menu.cpp
index 9997aecf3..5b7209a9f 100644
--- a/cockatrice/src/game/player/menu/move_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
@@ -1,8 +1,9 @@
 #include "move_menu.h"
 
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
 #include "../card_menu_action_type.h"
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../player_graphics_item.h"
 
 MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {
diff --git a/cockatrice/src/game/player/menu/move_menu.h b/cockatrice/src/game_graphics/player/menu/move_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/move_menu.h
rename to cockatrice/src/game_graphics/player/menu/move_menu.h
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
similarity index 99%
rename from cockatrice/src/game/player/menu/player_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 041b41052..17b791222 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -5,6 +5,7 @@
 #include "../../../game_graphics/zones/table_zone.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
+#include "../player_graphics_item.h"
 #include "card_menu.h"
 #include "hand_menu.h"
 
diff --git a/cockatrice/src/game/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/player_menu.h
rename to cockatrice/src/game_graphics/player/menu/player_menu.h
diff --git a/cockatrice/src/game/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
similarity index 96%
rename from cockatrice/src/game/player/menu/pt_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/pt_menu.cpp
index 011271385..a01be9424 100644
--- a/cockatrice/src/game/player/menu/pt_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
@@ -1,7 +1,8 @@
 #include "pt_menu.h"
 
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 {
diff --git a/cockatrice/src/game/player/menu/pt_menu.h b/cockatrice/src/game_graphics/player/menu/pt_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/pt_menu.h
rename to cockatrice/src/game_graphics/player/menu/pt_menu.h
diff --git a/cockatrice/src/game/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
similarity index 95%
rename from cockatrice/src/game/player/menu/rfg_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
index 79fdebf48..45abadbf7 100644
--- a/cockatrice/src/game/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
@@ -1,7 +1,8 @@
 #include "rfg_menu.h"
 
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 #include <libcockatrice/utility/zone_names.h>
 
diff --git a/cockatrice/src/game/player/menu/rfg_menu.h b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/rfg_menu.h
rename to cockatrice/src/game_graphics/player/menu/rfg_menu.h
diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
similarity index 91%
rename from cockatrice/src/game/player/menu/say_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/say_menu.cpp
index 58bbd33aa..336b70f0d 100644
--- a/cockatrice/src/game/player/menu/say_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
@@ -1,8 +1,9 @@
 #include "say_menu.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
 {
diff --git a/cockatrice/src/game/player/menu/say_menu.h b/cockatrice/src/game_graphics/player/menu/say_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/say_menu.h
rename to cockatrice/src/game_graphics/player/menu/say_menu.h
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
similarity index 87%
rename from cockatrice/src/game/player/menu/sideboard_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
index 27b50b570..0dd7894d2 100644
--- a/cockatrice/src/game/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
@@ -1,7 +1,8 @@
 #include "sideboard_menu.h"
 
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 
 SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.h b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/sideboard_menu.h
rename to cockatrice/src/game_graphics/player/menu/sideboard_menu.h
diff --git a/cockatrice/src/game/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
similarity index 97%
rename from cockatrice/src/game/player/menu/utility_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index 9769a029e..61a822b21 100644
--- a/cockatrice/src/game/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -1,8 +1,9 @@
 #include "utility_menu.h"
 
 #include "../../../interface/deck_loader/deck_loader.h"
-#include "../player_actions.h"
-#include "../player_logic.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
+#include "../player_graphics_item.h"
 #include "player_menu.h"
 
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/game/player/menu/utility_menu.h b/cockatrice/src/game_graphics/player/menu/utility_menu.h
similarity index 100%
rename from cockatrice/src/game/player/menu/utility_menu.h
rename to cockatrice/src/game_graphics/player/menu/utility_menu.h
diff --git a/cockatrice/src/game/player/player_area.cpp b/cockatrice/src/game_graphics/player/player_area.cpp
similarity index 100%
rename from cockatrice/src/game/player/player_area.cpp
rename to cockatrice/src/game_graphics/player/player_area.cpp
diff --git a/cockatrice/src/game/player/player_area.h b/cockatrice/src/game_graphics/player/player_area.h
similarity index 94%
rename from cockatrice/src/game/player/player_area.h
rename to cockatrice/src/game_graphics/player/player_area.h
index 6ffaf4958..d73547f81 100644
--- a/cockatrice/src/game/player/player_area.h
+++ b/cockatrice/src/game_graphics/player/player_area.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_PLAYER_AREA_H
 #define COCKATRICE_PLAYER_AREA_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
+#include "../board/graphics_item_type.h"
 #include "QGraphicsItem"
 
 /**
diff --git a/cockatrice/src/game/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
similarity index 100%
rename from cockatrice/src/game/player/player_dialogs.cpp
rename to cockatrice/src/game_graphics/player/player_dialogs.cpp
diff --git a/cockatrice/src/game/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
similarity index 96%
rename from cockatrice/src/game/player/player_dialogs.h
rename to cockatrice/src/game_graphics/player/player_dialogs.h
index a15c5174f..f87704f2d 100644
--- a/cockatrice/src/game/player/player_dialogs.h
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_PLAYER_DIALOGS_H
 #define COCKATRICE_PLAYER_DIALOGS_H
-#include "player_actions.h"
+#include "../../game/player/player_actions.h"
+#include "player_graphics_item.h"
 
 #include <QGraphicsView>
 #include <QObject>
diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
similarity index 97%
rename from cockatrice/src/game/player/player_graphics_item.cpp
rename to cockatrice/src/game_graphics/player/player_graphics_item.cpp
index b0a476d5a..07975ed5e 100644
--- a/cockatrice/src/game/player/player_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@@ -1,14 +1,15 @@
 #include "player_graphics_item.h"
 
-#include "../../game_graphics/zones/hand_zone.h"
-#include "../../game_graphics/zones/pile_zone.h"
-#include "../../game_graphics/zones/stack_zone.h"
-#include "../../game_graphics/zones/table_zone.h"
+#include "../../game/player/player_actions.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/abstract_card_item.h"
 #include "../board/counter_general.h"
 #include "../hand_counter.h"
-#include "player_actions.h"
+#include "../zones/hand_zone.h"
+#include "../zones/pile_zone.h"
+#include "../zones/stack_zone.h"
+#include "../zones/table_zone.h"
+#include "menu/player_menu.h"
 #include "player_dialogs.h"
 
 #include <QGraphicsView>
diff --git a/cockatrice/src/game/player/player_graphics_item.h b/cockatrice/src/game_graphics/player/player_graphics_item.h
similarity index 98%
rename from cockatrice/src/game/player/player_graphics_item.h
rename to cockatrice/src/game_graphics/player/player_graphics_item.h
index c1fcb4ed8..0dcc959bd 100644
--- a/cockatrice/src/game/player/player_graphics_item.h
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.h
@@ -6,15 +6,16 @@
 
 #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H
+#include "../../game/player/player_logic.h"
 #include "../board/abstract_counter.h"
 #include "../game_scene.h"
-#include "player_logic.h"
 
 #include <QGraphicsObject>
 
 class HandZone;
 class PileZone;
 class PlayerDialogs;
+class PlayerMenu;
 class PlayerTarget;
 class StackZone;
 class TableZone;
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
similarity index 100%
rename from cockatrice/src/game/player/player_list_widget.cpp
rename to cockatrice/src/game_graphics/player/player_list_widget.cpp
diff --git a/cockatrice/src/game/player/player_list_widget.h b/cockatrice/src/game_graphics/player/player_list_widget.h
similarity index 97%
rename from cockatrice/src/game/player/player_list_widget.h
rename to cockatrice/src/game_graphics/player/player_list_widget.h
index 842c45873..a53cfa989 100644
--- a/cockatrice/src/game/player/player_list_widget.h
+++ b/cockatrice/src/game_graphics/player/player_list_widget.h
@@ -7,7 +7,7 @@
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
-#include "player_logic.h"
+#include "../../game/player/player_logic.h"
 
 #include <QIcon>
 #include <QMap>
diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp
similarity index 99%
rename from cockatrice/src/game/player/player_target.cpp
rename to cockatrice/src/game_graphics/player/player_target.cpp
index 97fd51998..567f3d44d 100644
--- a/cockatrice/src/game/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@@ -1,7 +1,7 @@
 #include "player_target.h"
 
+#include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
-#include "player_logic.h"
 
 #include <QDebug>
 #include <QPainter>
diff --git a/cockatrice/src/game/player/player_target.h b/cockatrice/src/game_graphics/player/player_target.h
similarity index 95%
rename from cockatrice/src/game/player/player_target.h
rename to cockatrice/src/game_graphics/player/player_target.h
index d3facc60d..67e155660 100644
--- a/cockatrice/src/game/player/player_target.h
+++ b/cockatrice/src/game_graphics/player/player_target.h
@@ -7,9 +7,9 @@
 #ifndef PLAYERTARGET_H
 #define PLAYERTARGET_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
 #include "../board/abstract_counter.h"
 #include "../board/arrow_target.h"
+#include "../board/graphics_item_type.h"
 
 #include <QPixmap>
 
diff --git a/cockatrice/src/game/z_value_layer_manager.h b/cockatrice/src/game_graphics/z_value_layer_manager.h
similarity index 100%
rename from cockatrice/src/game/z_value_layer_manager.h
rename to cockatrice/src/game_graphics/z_value_layer_manager.h
diff --git a/cockatrice/src/game/z_values.h b/cockatrice/src/game_graphics/z_values.h
similarity index 100%
rename from cockatrice/src/game/z_values.h
rename to cockatrice/src/game_graphics/z_values.h
diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp
index 6ba8abe42..3457b681e 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/card_zone.cpp
@@ -1,6 +1,6 @@
 #include "card_zone.h"
 
-#include "../../game/board/card_item.h"
+#include "../board/card_item.h"
 #include "view_zone.h"
 
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp
index 09e9a5091..5885e3630 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@@ -1,11 +1,11 @@
 #include "hand_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_drag_item.h"
-#include "../../game/board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../interface/theme_manager.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 
 #include <QPainter>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp
index 302b983d8..7bb0e695a 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp
@@ -1,10 +1,10 @@
 #include "pile_zone.h"
 
-#include "../../game/board/card_drag_item.h"
-#include "../../game/board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/pile_zone_logic.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "view_zone.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
index 90d53b464..f2e720686 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@@ -1,8 +1,8 @@
 #include "select_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_item.h"
-#include "../../game/game_scene.h"
+#include "../board/card_item.h"
+#include "../game_scene.h"
 
 #include <QGraphicsRectItem>
 #include <QGraphicsSceneMouseEvent>
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp
index 9b0545b1d..46ff099ab 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@@ -1,12 +1,12 @@
 #include "stack_zone.h"
 
-#include "../../game/board/card_drag_item.h"
-#include "../../game/board/card_item.h"
-#include "../../game/card_dimensions.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/stack_zone_logic.h"
 #include "../../interface/theme_manager.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
+#include "../card_dimensions.h"
 
 #include <QPainter>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp
index 245de8281..e886f62e9 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@@ -1,14 +1,14 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/arrow_item.h"
-#include "../../game/board/card_drag_item.h"
-#include "../../game/board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/z_values.h"
 #include "../../game/zones/table_zone_logic.h"
 #include "../../interface/theme_manager.h"
+#include "../board/arrow_item.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
+#include "../z_values.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h
index 8a898173b..0d7e58206 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@@ -7,8 +7,8 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "../../game/board/abstract_card_item.h"
 #include "../../game/zones/table_zone_logic.h"
+#include "../board/abstract_card_item.h"
 #include "select_zone.h"
 
 /**
diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp
index 805c60638..baf7b8b30 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@@ -1,10 +1,10 @@
 #include "view_zone.h"
 
-#include "../../game/board/card_drag_item.h"
-#include "../../game/board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/view_zone_logic.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 
 #include <QBrush>
 #include <QDebug>
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index 03c6d8925..4a5d064d0 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -2,12 +2,12 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../filters/syntax_help.h"
-#include "../../game/board/card_item.h"
-#include "../../game/game_scene.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
-#include "../../game/z_values.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../board/card_item.h"
+#include "../game_scene.h"
+#include "../z_values.h"
 #include "view_zone.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
index 509a2d92f..577dafe0a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game/board/card_item.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
index 21bee8f54..2e7c62461 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/board/card_item.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 66ec1c197..3bfd9ce7d 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/board/card_item.h"
+#include "../../../game_graphics/board/card_item.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../window_main.h"
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
index 345eb9909..c6af5320b 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_text_widget.h"
 
-#include "../../../game/board/card_item.h"
+#include "../../../game_graphics/board/card_item.h"
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 1e2bebd15..a81161e83 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -1,19 +1,21 @@
 #include "tab_game.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/player/menu/card_menu.h"
-#include "../game/board/arrow_item.h"
-#include "../game/board/card_item.h"
-#include "../game/deckview/deck_view_container.h"
-#include "../game/deckview/tabbed_deck_view_container.h"
 #include "../game/game.h"
-#include "../game/game_scene.h"
-#include "../game/game_view.h"
-#include "../game/log/message_log_widget.h"
-#include "../game/phases_toolbar.h"
-#include "../game/player/player_list_widget.h"
 #include "../game/player/player_logic.h"
 #include "../game/replay.h"
+#include "../game_graphics/board/arrow_item.h"
+#include "../game_graphics/board/card_item.h"
+#include "../game_graphics/deckview/deck_view_container.h"
+#include "../game_graphics/deckview/tabbed_deck_view_container.h"
+#include "../game_graphics/game_scene.h"
+#include "../game_graphics/game_view.h"
+#include "../game_graphics/log/message_log_widget.h"
+#include "../game_graphics/phases_toolbar.h"
+#include "../game_graphics/player/menu/card_menu.h"
+#include "../game_graphics/player/menu/player_menu.h"
+#include "../game_graphics/player/player_graphics_item.h"
+#include "../game_graphics/player/player_list_widget.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
@@ -48,7 +50,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
 {
     // THIS CTOR IS USED ON REPLAY
-    game = new Replay(this, _replay);
+    game = new Replay(this, _replay, tabSupervisor->getIsLocalGame());
 
     createCardInfoDock(true);
     createPlayerListDock(true);
@@ -92,7 +94,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager())
 {
     // THIS CTOR IS USED ON GAMES
-    game = new Game(this, _clients, event, _roomGameTypes);
+    game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes);
 
     createCardInfoDock();
     createPlayerListDock();
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index ddda4d9b9..b9289432d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -10,8 +10,8 @@
 #define TAB_GAME_H
 
 #include "../game/abstract_game.h"
-#include "../game/log/message_log_widget.h"
 #include "../game/player/player_logic.h"
+#include "../game_graphics/log/message_log_widget.h"
 #include "../interface/widgets/menus/tearoff_menu.h"
 #include "../interface/widgets/replay/replay_manager.h"
 #include "tab.h"
@@ -20,6 +20,7 @@
 #include <QLoggingCategory>
 #include <QMap>
 
+class CardMenu;
 class ServerInfo_PlayerProperties;
 class TabbedDeckViewContainer;
 inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");