diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index d77d70d36..03a64ba3a 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -53,7 +53,6 @@ set(cockatrice_SOURCES
     src/game/board/abstract_card_drag_item.cpp
     src/game/board/abstract_card_item.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/board/card_drag_item.cpp
@@ -113,6 +112,7 @@ set(cockatrice_SOURCES
     src/game/zones/table_zone.cpp
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
+    src/game_graphics/board/abstract_graphics_item.cpp
     src/interface/card_picture_loader/card_picture_loader.cpp
     src/interface/card_picture_loader/card_picture_loader_local.cpp
     src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h
index a935c97b6..dad73dc14 100644
--- a/cockatrice/src/game/board/abstract_card_item.h
+++ b/cockatrice/src/game/board/abstract_card_item.h
@@ -7,8 +7,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
+#include "../../game_graphics/board/graphics_item_type.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/arrow_target.h b/cockatrice/src/game/board/arrow_target.h
index 8cc5d55dc..55f4ef678 100644
--- a/cockatrice/src/game/board/arrow_target.h
+++ b/cockatrice/src/game/board/arrow_target.h
@@ -7,7 +7,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "abstract_graphics_item.h"
+#include "../../game_graphics/board/abstract_graphics_item.h"
 
 #include <QList>
 
diff --git a/cockatrice/src/game/board/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp
index c71077324..d68486a1b 100644
--- a/cockatrice/src/game/board/counter_general.cpp
+++ b/cockatrice/src/game/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/hand_counter.h b/cockatrice/src/game/hand_counter.h
index cd2b0fe81..2c0175ecc 100644
--- a/cockatrice/src/game/hand_counter.h
+++ b/cockatrice/src/game/hand_counter.h
@@ -7,8 +7,8 @@
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "board/abstract_graphics_item.h"
-#include "board/graphics_item_type.h"
+#include "../game_graphics/board/abstract_graphics_item.h"
+#include "../game_graphics/board/graphics_item_type.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/game/phases_toolbar.h b/cockatrice/src/game/phases_toolbar.h
index 57ab6de66..215a97dd1 100644
--- a/cockatrice/src/game/phases_toolbar.h
+++ b/cockatrice/src/game/phases_toolbar.h
@@ -8,7 +8,7 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "board/abstract_graphics_item.h"
+#include "../game_graphics/board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 92125530a..151a7d30c 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -7,8 +7,8 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../board/abstract_graphics_item.h"
 #include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"
 #include "player_actions.h"
diff --git a/cockatrice/src/game/player/player_area.h b/cockatrice/src/game/player/player_area.h
index ec065fb4b..ec0d23cb6 100644
--- a/cockatrice/src/game/player/player_area.h
+++ b/cockatrice/src/game/player/player_area.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_PLAYER_AREA_H
 #define COCKATRICE_PLAYER_AREA_H
 
-#include "../board/graphics_item_type.h"
+#include "../../game_graphics/board/graphics_item_type.h"
 #include "QGraphicsItem"
 
 /**
diff --git a/cockatrice/src/game/player/player_target.h b/cockatrice/src/game/player/player_target.h
index bf26838c3..aaa0f0610 100644
--- a/cockatrice/src/game/player/player_target.h
+++ b/cockatrice/src/game/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 <QFont>
 #include <QPixmap>
diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h
index f489915e2..6fe8157e4 100644
--- a/cockatrice/src/game/zones/card_zone.h
+++ b/cockatrice/src/game/zones/card_zone.h
@@ -7,8 +7,8 @@
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../board/abstract_graphics_item.h"
-#include "../board/graphics_item_type.h"
+#include "../../game_graphics/board/abstract_graphics_item.h"
+#include "../../game_graphics/board/graphics_item_type.h"
 #include "logic/card_zone_logic.h"
 
 #include <QLoggingCategory>
diff --git a/cockatrice/src/game/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
similarity index 100%
rename from cockatrice/src/game/board/abstract_graphics_item.cpp
rename to cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
diff --git a/cockatrice/src/game/board/abstract_graphics_item.h b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
similarity index 100%
rename from cockatrice/src/game/board/abstract_graphics_item.h
rename to cockatrice/src/game_graphics/board/abstract_graphics_item.h
diff --git a/cockatrice/src/game/board/graphics_item_type.h b/cockatrice/src/game_graphics/board/graphics_item_type.h
similarity index 100%
rename from cockatrice/src/game/board/graphics_item_type.h
rename to cockatrice/src/game_graphics/board/graphics_item_type.h