diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
index 890516a58..f621fff7c 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -8,7 +8,7 @@
 #define DECKSTATS_INTERFACE_H
 
 #include <QObject>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
index 449bdc5bb..e4e9498a3 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -9,7 +9,7 @@
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
index 653d5c172..7dce6a65c 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
@@ -13,8 +13,8 @@
 #include <QNetworkReply>
 #include <QUrl>
 #include <QtConcurrent>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index f45115edd..ad0cdc336 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -2,7 +2,7 @@
 
 #include "filter_string.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
diff --git a/cockatrice/src/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h
index dc64f79fe..350fd2f14 100644
--- a/cockatrice/src/filters/filter_tree.h
+++ b/cockatrice/src/filters/filter_tree.h
@@ -12,7 +12,7 @@
 #include <QList>
 #include <QMap>
 #include <QObject>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <utility>
 
 class FilterTreeNode
diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp
index f5edf1d62..2b3811b53 100644
--- a/cockatrice/src/game/board/abstract_card_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_item.cpp
@@ -8,8 +8,8 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <algorithm>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h
index 8aa5a606b..a935c97b6 100644
--- a/cockatrice/src/game/board/abstract_card_item.h
+++ b/cockatrice/src/game/board/abstract_card_item.h
@@ -10,7 +10,7 @@
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
 
 class Player;
diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp
index 3b3a938b2..836438739 100644
--- a/cockatrice/src/game/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/deck_view_container.cpp
@@ -13,8 +13,8 @@
 #include <QMouseEvent>
 #include <QToolButton>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
index aeb9be453..736b5e55f 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -16,9 +16,9 @@
 #include <QRadioButton>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
-#include <libcockatrice/card/card_database/model/token/token_display_model.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/token/token_display_model.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
index f73968d7a..3ea164f1e 100644
--- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
@@ -10,8 +10,8 @@
 #include <QString>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
     : QDialog(parent)
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp
index 30d976993..84f55b9f0 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game/player/menu/card_menu.cpp
@@ -9,8 +9,8 @@
 #include "move_menu.h"
 #include "pt_menu.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/card_counter_settings.h>
 
 CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
index 7e4592616..f1c461435 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -8,7 +8,7 @@
 #include "card_menu.h"
 #include "hand_menu.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
 
 PlayerMenu::PlayerMenu(Player *_player) : player(_player)
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 08309c07f..e37b34604 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -8,8 +8,8 @@
 #include "../zones/logic/view_zone_logic.h"
 #include "card_menu_action_type.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index ffa02385a..aba3726e8 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -12,7 +12,7 @@
 
 #include <QMenu>
 #include <QObject>
-#include <libcockatrice/card/card_relation/card_relation_type.h>
+#include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/protocol/pb/card_attributes.pb.h>
 
 namespace google
diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
index 8147a0ddf..b5869489a 100644
--- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
@@ -8,7 +8,7 @@
 
 #include <QAction>
 #include <QDebug>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
index 0f95f03ad..a2058b0ed 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
@@ -4,7 +4,7 @@
 
 #include <QDirIterator>
 #include <QMovie>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
index 1954e1698..1d4325412 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
@@ -10,7 +10,7 @@
 #include <QLoggingCategory>
 #include <QObject>
 #include <QTimer>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
index 301b0d4fb..f92848b22 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
@@ -8,7 +8,7 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
index 028ffbf85..cdee37db3 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
@@ -18,8 +18,8 @@
 #include <QObject>
 #include <QQueue>
 #include <QTimer>
-#include <libcockatrice/card/card_database/card_database.h>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/card/database/card_database.h>
 
 #define REDIRECT_HEADER_NAME "redirects"
 #define REDIRECT_ORIGINAL_URL "original"
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
index ba0e6e7e1..eae93d46f 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
@@ -10,7 +10,7 @@
 #include <QNetworkReply>
 #include <QThread>
 #include <QThreadPool>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 // Card back returned by gatherer when card is not found
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
index 69b18a5fd..c7ccf7566 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
@@ -15,7 +15,7 @@
 #include <QNetworkAccessManager>
 #include <QObject>
 #include <QThread>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 
 #define REDIRECT_HEADER_NAME "redirects"
 #define REDIRECT_ORIGINAL_URL "original"
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
index 1908a6b80..4f1a27a98 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
@@ -5,7 +5,7 @@
 #include <QRegularExpression>
 #include <QUrl>
 #include <algorithm>
-#include <libcockatrice/card/card_set/card_set_comparator.h>
+#include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
index c91296ab4..b7c0e6a53 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
@@ -8,7 +8,7 @@
 #define PICTURE_TO_LOAD_H
 
 #include <QLoggingCategory>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");
 
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
index da45686ad..94f0e84bd 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
@@ -5,8 +5,8 @@
 #include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h"
 
 #include <QResizeEvent>
-#include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
index 4f723b224..6d3e841ec 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
@@ -4,8 +4,8 @@
 #include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
 
 #include <QResizeEvent>
-#include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <utility>
 
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
index 78b864fc6..82b5ec57b 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -3,8 +3,8 @@
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>
-#include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_model.h>
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
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 f6533e3ca..c08e0ed3c 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -8,7 +8,7 @@
 #include <QApplication>
 #include <QScreen>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <utility>
 
 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
index f5b2ea2f2..d44c4c205 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -10,7 +10,7 @@
 #include <QComboBox>
 #include <QFrame>
 #include <QStringList>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
 
 class CardInfoPictureWidget;
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 fe9385a23..6dad6424b 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -7,8 +7,8 @@
 
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
index f534ab956..11b991e87 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -9,7 +9,7 @@
 
 #include <QPushButton>
 #include <QTabWidget>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
 
 class AbstractCardItem;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
index cc37f2f0b..ec1de166b 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
@@ -10,7 +10,7 @@
 
 #include <QPixmap>
 #include <QWidget>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 
 class CardInfoPictureEnlargedWidget final : public QWidget
 {
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 bf7b72ca3..8b744dc73 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -10,8 +10,8 @@
 #include <QScreen>
 #include <QStylePainter>
 #include <QWidget>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 3cbdd46db..b628e6982 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -12,7 +12,7 @@
 #include <QPropertyAnimation>
 #include <QTimer>
 #include <QWidget>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");
 
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 0a040ff29..f11be533a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -8,8 +8,8 @@
 #include <QScrollBar>
 #include <QSizePolicy>
 #include <QTextEdit>
-#include <libcockatrice/card/card_relation/card_relation.h>
 #include <libcockatrice/card/game_specific_terms.h>
+#include <libcockatrice/card/relation/card_relation.h>
 
 CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
index d1338e2ae..f3bbb33fb 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
@@ -5,8 +5,8 @@
 
 #include <QHash>
 #include <QRegularExpression>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
index 235e7fe7b..74a368496 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
@@ -4,8 +4,8 @@
 #include "../general/display/banner_widget.h"
 #include "../general/display/bar_widget.h"
 
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <unordered_map>
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
index 01104e20d..09042b8f9 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@@ -5,8 +5,8 @@
 #include "../general/display/bar_widget.h"
 
 #include <iostream>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <regex>
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
index e14308056..4695eda0b 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -12,8 +12,8 @@
 #include <QTextBrowser>
 #include <QToolButton>
 #include <QTreeView>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 static bool canBeCommander(const CardInfo &cardInfo)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
index 1a1ee438d..542b2cb35 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -13,8 +13,8 @@
 
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_database/model/card_database_display_model.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/card_database_display_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/utility/key_signals.h>
 
 class AbstractTabDeckEditor;
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 66ee2e34d..f5970c1e6 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -6,7 +6,7 @@
 #include <QLabel>
 #include <QSplitter>
 #include <QTextEdit>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index 89e93d376..b68ec36eb 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -6,7 +6,7 @@
 #include <QGridLayout>
 #include <QMenu>
 #include <QToolButton>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index a54692778..5b18ad3bf 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -17,10 +17,10 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
-#include <libcockatrice/card/card_database/model/token/token_edit_model.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/token/token_edit_model.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index 2c95fed83..564381496 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -19,8 +19,8 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <algorithm>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card_set/card_sets_model.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 #define SORT_RESET -1
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
index 22805d1a2..7c1e33eea 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@@ -15,7 +15,7 @@
 #include <QSplitter>
 #include <QVBoxLayout>
 #include <algorithm>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <qdrag.h>
 #include <qevent.h>
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index 71e9349bd..0c4b7797e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -43,8 +43,8 @@
 #include <QToolBar>
 #include <QTranslator>
 #include <QVariant>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/settings/card_counter_settings.h>
 #include <libcockatrice/settings/shortcut_treeview.h>
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index 13539af28..f36f1831a 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -9,7 +9,7 @@
 #include <QPainterPath>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/cache_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index ccda1ba34..56e5d1aab 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -5,8 +5,8 @@
 #include <QMenu>
 #include <QMouseEvent>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
index 312bae9a1..d95019e80 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -1,6 +1,6 @@
 #include "printing_selector_card_sorting_widget.h"
 
-#include <libcockatrice/card/card_set/card_set_comparator.h>
+#include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index ebc0e0dee..bee9edcb3 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -31,8 +31,8 @@
 #include <QTextStream>
 #include <QTreeView>
 #include <QUrl>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index 79880b9ee..108694d8d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -2,7 +2,7 @@
 
 #include "../../tab_edhrec_main.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
index cbf525b79..b15d559f5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
@@ -4,7 +4,7 @@
 #include "../../tab_edhrec_main.h"
 #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
index 89f17ba64..97da51cc8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@@ -22,9 +22,9 @@
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QResizeEvent>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/card_database/model/card/card_search_model.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
+#include <libcockatrice/card/database/model/card/card_search_model.h>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
index ba5e3d201..2cca18504 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
@@ -17,7 +17,7 @@
 #include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QPushButton>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 
 class TabEdhRecMain : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index ec746a89d..517254f80 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -32,8 +32,8 @@
 #include <QToolButton>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index f7c24e22b..0e7207c8d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -37,8 +37,8 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QWidget>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index a0073c047..5be62a94c 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -27,7 +27,7 @@
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index f918f61ad..9dcb5500f 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -6,7 +6,7 @@
 
 #include <QMessageBox>
 #include <QMouseEvent>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
index 47c00ac48..8ffb29eca 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
@@ -6,7 +6,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QTimer>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
index 17c26b544..5a9c1029c 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@@ -7,7 +7,7 @@
 #include <QPushButton>
 #include <QTimer>
 #include <algorithm>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
index 02047723f..ece3fca3b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
@@ -7,7 +7,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QTimer>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent,
                                                                                    FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index 3676707f2..673a2ec1a 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
@@ -15,9 +15,9 @@
 
 #include <QHeaderView>
 #include <QScrollBar>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <qpropertyanimation.h>
 #include <utility>
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
index 01143d939..0e7c89bab 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
@@ -27,8 +27,8 @@
 #include <QVBoxLayout>
 #include <QWheelEvent>
 #include <QWidget>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/deck_list/deck_list_model.h>
 #include <libcockatrice/utility/key_signals.h>
 #include <qscrollarea.h>
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
index b9f3914d5..ccf4a10ab 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
@@ -2,7 +2,7 @@
 
 #include "../cards/card_info_picture_widget.h"
 
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <random>
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
index 634830fa6..d7efab3a7 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
@@ -13,12 +13,12 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QResizeEvent>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
-#include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/card_database/model/card/card_search_model.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
 #include <libcockatrice/card/card_info_comparator.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
+#include <libcockatrice/card/database/model/card/card_search_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/deck_list/deck_list_model.h>
 #include <libcockatrice/deck_list/deck_loader.h>
 #include <qscrollarea.h>
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
index afb8cde91..80e41c4f0 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
@@ -17,10 +17,10 @@
 #include <QListWidget>
 #include <QPushButton>
 #include <QWidget>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/card_database/model/card_database_display_model.h>
-#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
+#include <libcockatrice/card/database/model/card_database_display_model.h>
+#include <libcockatrice/card/database/model/card_database_model.h>
 #include <libcockatrice/deck_list/deck_list_model.h>
 #include <qscrollarea.h>
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
index 6a240020f..afa6b6d72 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -13,7 +13,7 @@
 #include <QSet>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index 847846c53..164aff8bc 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -12,7 +12,7 @@
 #include <QMouseEvent>
 #include <QSpinBox>
 #include <QVBoxLayout>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr)
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 2e9ea18c3..de6c90a98 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -60,8 +60,8 @@
 #include <QWindow>
 #include <QtConcurrent>
 #include <QtNetwork>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/local/local_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/network/server/local/local_server.h>
diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h
index b7b9350b5..1fa1335d0 100644
--- a/dbconverter/src/main.h
+++ b/dbconverter/src/main.h
@@ -1,8 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/parser/cockatrice_xml_4.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
 
 class CardDatabaseConverter : public CardDatabase
 {
diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h
index 3a8495fb9..497f76e72 100644
--- a/dbconverter/src/mocks.h
+++ b/dbconverter/src/mocks.h
@@ -10,7 +10,7 @@
 
 #define PICTURELOADER_H
 
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/macros.h>
 
diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt
index 32cf042d6..7da560431 100644
--- a/libcockatrice_card/CMakeLists.txt
+++ b/libcockatrice_card/CMakeLists.txt
@@ -5,24 +5,24 @@ set(CMAKE_AUTORCC ON)
 set(HEADERS
     libcockatrice/card/card_info.h
     libcockatrice/card/card_info_comparator.h
-    libcockatrice/card/card_database/card_database.h
-    libcockatrice/card/card_database/card_database_loader.h
-    libcockatrice/card/card_database/card_database_manager.h
-    libcockatrice/card/card_database/card_database_querier.h
-    libcockatrice/card/card_database/model/card_database_model.h
-    libcockatrice/card/card_database/model/card_database_display_model.h
-    libcockatrice/card/card_database/model/card/card_completer_proxy_model.h
-    libcockatrice/card/card_database/model/card/card_search_model.h
-    libcockatrice/card/card_database/model/card_set/card_sets_model.h
-    libcockatrice/card/card_database/model/token/token_display_model.h
-    libcockatrice/card/card_database/model/token/token_edit_model.h
-    libcockatrice/card/card_database/parser/card_database_parser.h
-    libcockatrice/card/card_database/parser/cockatrice_xml_3.h
-    libcockatrice/card/card_database/parser/cockatrice_xml_4.h
-    libcockatrice/card/card_printing/exact_card.h
-    libcockatrice/card/card_printing/printing_info.h
-    libcockatrice/card/card_set/card_set.h
-    libcockatrice/card/card_relation/card_relation.h
+    libcockatrice/card/database/card_database.h
+    libcockatrice/card/database/card_database_loader.h
+    libcockatrice/card/database/card_database_manager.h
+    libcockatrice/card/database/card_database_querier.h
+    libcockatrice/card/database/model/card_database_model.h
+    libcockatrice/card/database/model/card_database_display_model.h
+    libcockatrice/card/database/model/card/card_completer_proxy_model.h
+    libcockatrice/card/database/model/card/card_search_model.h
+    libcockatrice/card/database/model/card_set/card_sets_model.h
+    libcockatrice/card/database/model/token/token_display_model.h
+    libcockatrice/card/database/model/token/token_edit_model.h
+    libcockatrice/card/database/parser/card_database_parser.h
+    libcockatrice/card/database/parser/cockatrice_xml_3.h
+    libcockatrice/card/database/parser/cockatrice_xml_4.h
+    libcockatrice/card/printing/exact_card.h
+    libcockatrice/card/printing/printing_info.h
+    libcockatrice/card/set/card_set.h
+    libcockatrice/card/relation/card_relation.h
 )
 
 if(Qt6_FOUND)
@@ -34,27 +34,27 @@ endif()
 add_library(
   libcockatrice_card STATIC
   ${MOC_SOURCES}
-  libcockatrice/card/card_database/card_database.cpp
-  libcockatrice/card/card_database/card_database_loader.cpp
-  libcockatrice/card/card_database/card_database_manager.cpp
-  libcockatrice/card/card_database/card_database_querier.cpp
-  libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp
-  libcockatrice/card/card_database/model/card/card_search_model.cpp
-  libcockatrice/card/card_database/model/card_set/card_sets_model.cpp
-  libcockatrice/card/card_database/model/card_database_display_model.cpp
-  libcockatrice/card/card_database/model/card_database_model.cpp
-  libcockatrice/card/card_database/model/token/token_display_model.cpp
-  libcockatrice/card/card_database/model/token/token_edit_model.cpp
-  libcockatrice/card/card_database/parser/card_database_parser.cpp
-  libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp
-  libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp
   libcockatrice/card/card_info.cpp
   libcockatrice/card/card_info_comparator.cpp
-  libcockatrice/card/card_printing/exact_card.cpp
-  libcockatrice/card/card_printing/printing_info.cpp
-  libcockatrice/card/card_relation/card_relation.cpp
-  libcockatrice/card/card_set/card_set.cpp
-  libcockatrice/card/card_set/card_set_list.cpp
+  libcockatrice/card/database/card_database.cpp
+  libcockatrice/card/database/card_database_loader.cpp
+  libcockatrice/card/database/card_database_manager.cpp
+  libcockatrice/card/database/card_database_querier.cpp
+  libcockatrice/card/database/model/card/card_completer_proxy_model.cpp
+  libcockatrice/card/database/model/card/card_search_model.cpp
+  libcockatrice/card/database/model/card_set/card_sets_model.cpp
+  libcockatrice/card/database/model/card_database_display_model.cpp
+  libcockatrice/card/database/model/card_database_model.cpp
+  libcockatrice/card/database/model/token/token_display_model.cpp
+  libcockatrice/card/database/model/token/token_edit_model.cpp
+  libcockatrice/card/database/parser/card_database_parser.cpp
+  libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+  libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+  libcockatrice/card/printing/exact_card.cpp
+  libcockatrice/card/printing/printing_info.cpp
+  libcockatrice/card/relation/card_relation.cpp
+  libcockatrice/card/set/card_set.cpp
+  libcockatrice/card/set/card_set_list.cpp
 )
 
 target_include_directories(
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index 0434bcf00..4646b3890 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -1,9 +1,9 @@
 #include "card_info.h"
 
-#include "card_printing/printing_info.h"
-#include "card_relation/card_relation.h"
-#include "card_set/card_set.h"
 #include "game_specific_terms.h"
+#include "printing/printing_info.h"
+#include "relation/card_relation.h"
+#include "set/card_set.h"
 
 #include <QDir>
 #include <QRegularExpression>
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
index 771f07464..c2a8453d9 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -7,7 +7,7 @@
 #ifndef CARD_INFO_H
 #define CARD_INFO_H
 
-#include "card_printing/printing_info.h"
+#include "printing/printing_info.h"
 
 #include <QDate>
 #include <QHash>
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
similarity index 99%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database.cpp
rename to libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 212397c17..6ff5fe02c 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -1,6 +1,6 @@
 #include "card_database.h"
 
-#include "../card_relation/card_relation.h"
+#include "../relation/card_relation.h"
 #include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
 
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
similarity index 98%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database.h
rename to libcockatrice_card/libcockatrice/card/database/card_database.h
index 01d1c61e4..8c7a78ffe 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -7,7 +7,7 @@
 #ifndef CARDDATABASE_H
 #define CARDDATABASE_H
 
-#include "../card_set/card_set_list.h"
+#include "../set/card_set_list.h"
 #include "card_database_loader.h"
 #include "card_database_querier.h"
 
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp
rename to libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h
rename to libcockatrice_card/libcockatrice/card/database/card_database_loader.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp
rename to libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h
rename to libcockatrice_card/libcockatrice/card/database/card_database_manager.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
similarity index 99%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp
rename to libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index 2eb6c6e92..f422c51f9 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -1,8 +1,8 @@
 #include "card_database_querier.h"
 
 #include "../card_info.h"
-#include "../card_printing/exact_card.h"
-#include "../card_set/card_set_comparator.h"
+#include "../printing/exact_card.h"
+#include "../set/card_set_comparator.h"
 #include "card_database.h"
 
 #include <qrandom.h>
diff --git a/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
similarity index 98%
rename from libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h
rename to libcockatrice_card/libcockatrice/card/database/card_database_querier.h
index 11e485695..cb440706b 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
@@ -8,7 +8,7 @@
 #define COCKATRICE_CARD_DATABASE_QUERIER_H
 
 #include "../card_info.h"
-#include "../card_printing/exact_card.h"
+#include "../printing/exact_card.h"
 
 #include <QObject>
 #include <libcockatrice/utility/card_ref.h>
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h b/libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h b/libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h b/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h b/libcockatrice_card/libcockatrice/card/database/model/card_database_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/card_database_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.h b/libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h
similarity index 97%
rename from libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h
index b024ccd49..6f5911b6e 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/model/card_set/card_sets_model.h
+++ b/libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h
@@ -11,7 +11,7 @@
 #include <QMimeData>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 
 class SetsProxyModel;
 
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h b/libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp
rename to libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h b/libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h
rename to libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp
rename to libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h
rename to libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
similarity index 99%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp
rename to libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
index 295d307b6..c56f24480 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
@@ -1,7 +1,7 @@
 #include "cockatrice_xml_3.h"
 
-#include "../../card_relation/card_relation.h"
-#include "../../card_relation/card_relation_type.h"
+#include "../../relation/card_relation.h"
+#include "../../relation/card_relation_type.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h
rename to libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
similarity index 99%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp
rename to libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
index d4870f3b3..9c80014bf 100644
--- a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -1,6 +1,6 @@
 #include "cockatrice_xml_4.h"
 
-#include "../../card_relation/card_relation.h"
+#include "../../relation/card_relation.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h
rename to libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
diff --git a/libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp
rename to libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_printing/exact_card.h b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_printing/exact_card.h
rename to libcockatrice_card/libcockatrice/card/printing/exact_card.h
diff --git a/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
similarity index 89%
rename from libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp
rename to libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
index 17a0d6317..9de563d78 100644
--- a/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
@@ -1,6 +1,6 @@
 #include "printing_info.h"
 
-#include "../card_set/card_set.h"
+#include "../set/card_set.h"
 
 PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
similarity index 97%
rename from libcockatrice_card/libcockatrice/card/card_printing/printing_info.h
rename to libcockatrice_card/libcockatrice/card/printing/printing_info.h
index 0b5a14a0a..c2afe983a 100644
--- a/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_PRINTING_INFO_H
 #define COCKATRICE_PRINTING_INFO_H
 
-#include "../card_set/card_set.h"
+#include "../set/card_set.h"
 
 #include <QList>
 #include <QMap>
diff --git a/libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp
rename to libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_relation/card_relation.h
rename to libcockatrice_card/libcockatrice/card/relation/card_relation.h
diff --git a/libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h b/libcockatrice_card/libcockatrice/card/relation/card_relation_type.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h
rename to libcockatrice_card/libcockatrice/card/relation/card_relation_type.h
diff --git a/libcockatrice_card/libcockatrice/card/card_set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_set/card_set.cpp
rename to libcockatrice_card/libcockatrice/card/set/card_set.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_set/card_set.h
rename to libcockatrice_card/libcockatrice/card/set/card_set.h
diff --git a/libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h
rename to libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
diff --git a/libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp
rename to libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_set/card_set_list.h b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_set/card_set_list.h
rename to libcockatrice_card/libcockatrice/card/set/card_set_list.h
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp
index dfaba91c0..01ae68a71 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp
@@ -10,7 +10,7 @@
 #include <QTextDocument>
 #include <QTextStream>
 #include <QTextTable>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DeckListModel::DeckListModel(QObject *parent)
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h
index a3e448de4..e169af395 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h
@@ -3,7 +3,7 @@
 
 #include <QAbstractItemModel>
 #include <QList>
-#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/deck_list/abstract_deck_list_card_node.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_list_card_node.h>
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h
index 0ea6d7495..0603beace 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h
@@ -8,7 +8,7 @@
 #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 class DeckListSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp
index bfc1fc62c..95f4d9224 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp
@@ -10,8 +10,8 @@
 #include <QRegularExpression>
 #include <QStringList>
 #include <QtConcurrentRun>
-#include <libcockatrice/card/card_database/card_database.h>
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_list_card_node.h>
 
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 6669238ae..204772857 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -7,8 +7,8 @@
 #include <QRegularExpression>
 #include <algorithm>
 #include <climits>
-#include <libcockatrice/card/card_database/parser/cockatrice_xml_4.h>
-#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
+#include <libcockatrice/card/relation/card_relation.h>
 
 SplitCardPart::SplitCardPart(const QString &_name,
                              const QString &_text,
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index f18e96d0e..f0c7d9768 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -2,7 +2,7 @@
 #include "mocks.h"
 
 #include "gtest/gtest.h"
-#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 #define QUERY(name, card, query, match)                                                                                \
     TEST_F(CardQuery, name)                                                                                            \
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index 3a8495fb9..497f76e72 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -10,7 +10,7 @@
 
 #define PICTURELOADER_H
 
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/macros.h>