diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 110c99697..2b9a10113 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -168,13 +168,16 @@ set(cockatrice_SOURCES
     src/dialogs/dlg_tip_of_the_day.cpp
     src/dialogs/dlg_update.cpp
     src/dialogs/dlg_view_log.cpp
+    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
+    src/game/board/card_item.cpp
+    src/game/board/card_list.cpp
     src/game/board/counter_general.cpp
-    src/game/cards/abstract_card_drag_item.cpp
-    src/game/cards/abstract_card_item.cpp
     src/game/cards/card_completer_proxy_model.cpp
     src/game/cards/card_database.cpp
     src/game/cards/card_database_manager.cpp
@@ -182,10 +185,7 @@ set(cockatrice_SOURCES
     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/cards/card_info.cpp
-    src/game/cards/card_item.cpp
-    src/game/cards/card_list.cpp
     src/game/cards/card_search_model.cpp
     src/game/deckview/deck_view.cpp
     src/game/deckview/deck_view_container.cpp
diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index e01153d00..999b5b164 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -3,9 +3,9 @@
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../dialogs/dlg_create_game.h"
 #include "../../game/board/arrow_item.h"
+#include "../../game/board/card_item.h"
 #include "../../game/cards/card_database.h"
 #include "../../game/cards/card_database_manager.h"
-#include "../../game/cards/card_item.h"
 #include "../../game/deckview/deck_view_container.h"
 #include "../../game/game_scene.h"
 #include "../../game/game_view.h"
diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
index d967c8477..ab6a9eb31 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_display_widget.h"
 
+#include "../../../../game/board/card_item.h"
 #include "../../../../game/cards/card_database_manager.h"
-#include "../../../../game/cards/card_item.h"
 #include "../../../../main.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
index 4d85f38a0..08eafbf87 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_frame_widget.h"
 
+#include "../../../../game/board/card_item.h"
 #include "../../../../game/cards/card_database_manager.h"
-#include "../../../../game/cards/card_item.h"
 #include "../../../../settings/cache_settings.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
index 4d76989b1..4ee3de5eb 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_picture_widget.h"
 
+#include "../../../../game/board/card_item.h"
 #include "../../../../game/cards/card_database_manager.h"
-#include "../../../../game/cards/card_item.h"
 #include "../../../../settings/cache_settings.h"
 #include "../../../tabs/tab_supervisor.h"
 #include "../../picture_loader/picture_loader.h"
diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
index 82944205f..5201bea2c 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_text_widget.h"
 
-#include "../../../../game/cards/card_item.h"
+#include "../../../../game/board/card_item.h"
 #include "../../../../game/game_specific_terms.h"
 
 #include <QGridLayout>
diff --git a/cockatrice/src/game/cards/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp
similarity index 100%
rename from cockatrice/src/game/cards/abstract_card_drag_item.cpp
rename to cockatrice/src/game/board/abstract_card_drag_item.cpp
diff --git a/cockatrice/src/game/cards/abstract_card_drag_item.h b/cockatrice/src/game/board/abstract_card_drag_item.h
similarity index 100%
rename from cockatrice/src/game/cards/abstract_card_drag_item.h
rename to cockatrice/src/game/board/abstract_card_drag_item.h
diff --git a/cockatrice/src/game/cards/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp
similarity index 99%
rename from cockatrice/src/game/cards/abstract_card_item.cpp
rename to cockatrice/src/game/board/abstract_card_item.cpp
index dc00aae66..0623afb07 100644
--- a/cockatrice/src/game/cards/abstract_card_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_item.cpp
@@ -2,9 +2,9 @@
 
 #include "../../client/ui/picture_loader/picture_loader.h"
 #include "../../settings/cache_settings.h"
+#include "../cards/card_database.h"
+#include "../cards/card_database_manager.h"
 #include "../game_scene.h"
-#include "card_database.h"
-#include "card_database_manager.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
diff --git a/cockatrice/src/game/cards/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h
similarity index 98%
rename from cockatrice/src/game/cards/abstract_card_item.h
rename to cockatrice/src/game/board/abstract_card_item.h
index 48f890701..94de7596a 100644
--- a/cockatrice/src/game/cards/abstract_card_item.h
+++ b/cockatrice/src/game/board/abstract_card_item.h
@@ -1,8 +1,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../board/arrow_target.h"
-#include "card_info.h"
+#include "../cards/card_info.h"
+#include "arrow_target.h"
 
 class Player;
 
diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
index 2be8fbdd8..4caebdda0 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -3,10 +3,10 @@
 
 #include "../../settings/cache_settings.h"
 #include "../cards/card_info.h"
-#include "../cards/card_item.h"
 #include "../player/player.h"
 #include "../player/player_target.h"
 #include "../zones/card_zone.h"
+#include "card_item.h"
 #include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_create_arrow.pb.h"
diff --git a/cockatrice/src/game/cards/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp
similarity index 100%
rename from cockatrice/src/game/cards/card_drag_item.cpp
rename to cockatrice/src/game/board/card_drag_item.cpp
diff --git a/cockatrice/src/game/cards/card_drag_item.h b/cockatrice/src/game/board/card_drag_item.h
similarity index 100%
rename from cockatrice/src/game/cards/card_drag_item.h
rename to cockatrice/src/game/board/card_drag_item.h
diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
similarity index 99%
rename from cockatrice/src/game/cards/card_item.cpp
rename to cockatrice/src/game/board/card_item.cpp
index 40fa8d119..e9a345e86 100644
--- a/cockatrice/src/game/cards/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -2,14 +2,14 @@
 
 #include "../../client/tabs/tab_game.h"
 #include "../../settings/cache_settings.h"
-#include "../board/arrow_item.h"
+#include "../cards/card_info.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 "arrow_item.h"
 #include "card_drag_item.h"
-#include "card_info.h"
 #include "pb/serverinfo_card.pb.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/game/cards/card_item.h b/cockatrice/src/game/board/card_item.h
similarity index 100%
rename from cockatrice/src/game/cards/card_item.h
rename to cockatrice/src/game/board/card_item.h
diff --git a/cockatrice/src/game/cards/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
similarity index 99%
rename from cockatrice/src/game/cards/card_list.cpp
rename to cockatrice/src/game/board/card_list.cpp
index 0eda14626..0355bf6bd 100644
--- a/cockatrice/src/game/cards/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,6 +1,6 @@
 #include "card_list.h"
 
-#include "card_info.h"
+#include "../cards/card_info.h"
 #include "card_item.h"
 
 #include <QDebug>
diff --git a/cockatrice/src/game/cards/card_list.h b/cockatrice/src/game/board/card_list.h
similarity index 100%
rename from cockatrice/src/game/cards/card_list.h
rename to cockatrice/src/game/board/card_list.h
diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h
index 777298714..6fa47766f 100644
--- a/cockatrice/src/game/deckview/deck_view.h
+++ b/cockatrice/src/game/deckview/deck_view.h
@@ -1,7 +1,7 @@
 #ifndef DECKVIEW_H
 #define DECKVIEW_H
 
-#include "../../game/cards/abstract_card_drag_item.h"
+#include "../board/abstract_card_drag_item.h"
 #include "pb/move_card_to_zone.pb.h"
 
 #include <QGraphicsScene>
diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp
index afd6cc815..ba54d5b0c 100644
--- a/cockatrice/src/game/game_scene.cpp
+++ b/cockatrice/src/game/game_scene.cpp
@@ -2,7 +2,7 @@
 
 #include "../client/ui/phases_toolbar.h"
 #include "../settings/cache_settings.h"
-#include "cards/card_item.h"
+#include "board/card_item.h"
 #include "player/player.h"
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index 26f34e977..e4d319633 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -9,11 +9,11 @@
 #include "../../main.h"
 #include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
+#include "../board/card_item.h"
+#include "../board/card_list.h"
 #include "../board/counter_general.h"
 #include "../cards/card_database.h"
 #include "../cards/card_database_manager.h"
-#include "../cards/card_item.h"
-#include "../cards/card_list.h"
 #include "../game_scene.h"
 #include "../hand_counter.h"
 #include "../zones/card_zone.h"
diff --git a/cockatrice/src/game/zones/card_zone.cpp b/cockatrice/src/game/zones/card_zone.cpp
index 7516923b0..24eaa4f52 100644
--- a/cockatrice/src/game/zones/card_zone.cpp
+++ b/cockatrice/src/game/zones/card_zone.cpp
@@ -1,7 +1,7 @@
 #include "card_zone.h"
 
+#include "../board/card_item.h"
 #include "../cards/card_database_manager.h"
-#include "../cards/card_item.h"
 #include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/serverinfo_user.pb.h"
diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h
index 91cad179c..2b9114a6d 100644
--- a/cockatrice/src/game/zones/card_zone.h
+++ b/cockatrice/src/game/zones/card_zone.h
@@ -3,7 +3,7 @@
 
 #include "../../client/translation.h"
 #include "../board/abstract_graphics_item.h"
-#include "../cards/card_list.h"
+#include "../board/card_list.h"
 
 #include <QLoggingCategory>
 #include <QString>
diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
index 31f0515d4..1bc029432 100644
--- a/cockatrice/src/game/zones/hand_zone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -2,8 +2,8 @@
 
 #include "../../client/ui/theme_manager.h"
 #include "../../settings/cache_settings.h"
-#include "../cards/card_drag_item.h"
-#include "../cards/card_item.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 
diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp
index ba23560c9..a26499781 100644
--- a/cockatrice/src/game/zones/pile_zone.cpp
+++ b/cockatrice/src/game/zones/pile_zone.cpp
@@ -1,7 +1,7 @@
 #include "pile_zone.h"
 
-#include "../cards/card_drag_item.h"
-#include "../cards/card_item.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 #include "view_zone.h"
diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp
index 949b3fba2..bb6c40683 100644
--- a/cockatrice/src/game/zones/select_zone.cpp
+++ b/cockatrice/src/game/zones/select_zone.cpp
@@ -1,7 +1,7 @@
 #include "select_zone.h"
 
 #include "../../settings/cache_settings.h"
-#include "../cards/card_item.h"
+#include "../board/card_item.h"
 #include "../game_scene.h"
 
 #include <QDebug>
diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp
index b597a9e81..324ef55fb 100644
--- a/cockatrice/src/game/zones/stack_zone.cpp
+++ b/cockatrice/src/game/zones/stack_zone.cpp
@@ -3,8 +3,8 @@
 #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 "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "../player/player.h"
 #include "pb/command_move_card.pb.h"
 
diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp
index 02a06ed2e..e214b2e09 100644
--- a/cockatrice/src/game/zones/table_zone.cpp
+++ b/cockatrice/src/game/zones/table_zone.cpp
@@ -3,9 +3,9 @@
 #include "../../client/ui/theme_manager.h"
 #include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
-#include "../cards/card_drag_item.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "../cards/card_info.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"
diff --git a/cockatrice/src/game/zones/table_zone.h b/cockatrice/src/game/zones/table_zone.h
index 271276967..f3fbdccb6 100644
--- a/cockatrice/src/game/zones/table_zone.h
+++ b/cockatrice/src/game/zones/table_zone.h
@@ -1,7 +1,7 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "../cards/abstract_card_item.h"
+#include "../board/abstract_card_item.h"
 #include "select_zone.h"
 
 /*
diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
index 9aec01db3..1c35b6613 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -1,9 +1,9 @@
 #include "view_zone.h"
 
 #include "../../server/pending_command.h"
-#include "../cards/card_drag_item.h"
+#include "../board/card_drag_item.h"
+#include "../board/card_item.h"
 #include "../cards/card_info.h"
-#include "../cards/card_item.h"
 #include "../player/player.h"
 #include "pb/command_dump_zone.pb.h"
 #include "pb/command_move_card.pb.h"
diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
index 85a91afdf..1721831ac 100644
--- a/cockatrice/src/game/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -2,7 +2,7 @@
 
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
-#include "../cards/card_item.h"
+#include "../board/card_item.h"
 #include "../filters/syntax_help.h"
 #include "../game_scene.h"
 #include "../player/player.h"
diff --git a/cockatrice/src/server/message_log_widget.cpp b/cockatrice/src/server/message_log_widget.cpp
index 2c0174673..7ee275377 100644
--- a/cockatrice/src/server/message_log_widget.cpp
+++ b/cockatrice/src/server/message_log_widget.cpp
@@ -2,7 +2,7 @@
 
 #include "../client/sound_engine.h"
 #include "../client/translate_counter_name.h"
-#include "../game/cards/card_item.h"
+#include "../game/board/card_item.h"
 #include "../game/phase.h"
 #include "../game/player/player.h"
 #include "../game/zones/card_zone.h"