Move models to lib (#6274)

* Move models to own library. Took 35 minutes Took 22 minutes * Adjust CMakeLists Took 20 seconds * Reformat CMakeLists. Took 2 minutes * Revert "Reformat CMakeLists." This reverts commit db5982ad1c. Took 55 seconds * Lint an include Took 17 minutes Took 9 seconds --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-06-10 00:04:48 -07:00 · 2025-11-05 18:33:40 +01:00 · 2025-11-05 18:33:40 +01:00 · adff828415
commit adff828415
parent d914667238
74 changed files with 127 additions and 105 deletions
--- 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
@ -1,12 +1,12 @@
 #include "card_group_display_widget.h"

 #include "../card_info_picture_with_text_overlay_widget.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h"

 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>

 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                               DeckListModel *_deckListModel,
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
@ -15,7 +15,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class CardGroupDisplayWidget : public QWidget
 {
--- 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
@ -1,11 +1,11 @@
 #include "flat_card_group_display_widget.h"

 #include "../card_info_picture_with_text_overlay_widget.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"

 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>

 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
--- 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
@ -5,7 +5,7 @@
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                   DeckListModel *_deckListModel,
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@ -5,7 +5,7 @@

 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                     DeckListModel *_deckListModel,
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
@ -17,7 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class DeckCardZoneDisplayWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@ -17,7 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class DeckAnalyticsWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
@ -8,7 +8,7 @@
 #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 <libcockatrice/models/deck_list/deck_loader.h>

 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
    : QWidget(parent), deckListModel(_deckListModel)
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
@ -12,7 +12,7 @@
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>

 class ManaBaseWidget : public QWidget
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
@ -7,7 +7,7 @@
 #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 <libcockatrice/models/deck_list/deck_loader.h>
 #include <unordered_map>

 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
@ -11,7 +11,7 @@

 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <unordered_map>

 class ManaCurveWidget : public QWidget
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@ -8,7 +8,7 @@
 #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 <libcockatrice/models/deck_list/deck_loader.h>
 #include <regex>
 #include <string>
 #include <unordered_map>
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
@ -12,7 +12,7 @@
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>

 class ManaDevotionWidget : public QWidget
--- 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/database/model/card_database_display_model.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/utility/key_signals.h>

 class AbstractTabDeckEditor;
--- 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/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/settings/cache_settings.h>

 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@ -19,8 +19,8 @@
 #include <QVBoxLayout>
 #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/models/database/card_database_model.h>
+#include <libcockatrice/models/database/token/token_edit_model.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@ -1,6 +1,6 @@
 #include "dlg_load_deck.h"

-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>

 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
@ -11,7 +11,7 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>

 /**
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@ -20,7 +20,7 @@
 #include <QTreeView>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_set/card_sets_model.h>
+#include <libcockatrice/models/database/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cache_settings.h>

 #define SORT_RESET -1
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@ -16,7 +16,7 @@
 #include <QVBoxLayout>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qdrag.h>
 #include <qevent.h>

--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
@ -16,7 +16,7 @@
 #include <QMap>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class SetEntryWidget; // Forward declaration

--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
@ -3,7 +3,7 @@
 #include "../../../layouts/flow_layout.h"

 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 /**
 * @class OverlapWidget
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
@ -11,8 +11,8 @@

 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 class AllZonesCardAmountWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@ -17,8 +17,8 @@
 #include <QTreeView>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 class CardAmountWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@ -18,7 +18,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 #define BATCH_SIZE 10

--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
@ -14,7 +14,7 @@
 #include <QPainter>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class PrintingSelectorCardDisplayWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
@ -14,7 +14,7 @@
 #include "set_name_and_collectors_number_display_widget.h"

 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class PrintingSelectorCardOverlayWidget : public QWidget
 {
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@ -32,7 +32,7 @@
 #include <QTreeView>
 #include <QUrl>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/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>
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@ -5,7 +5,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QMainWindow>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
@ -12,7 +12,7 @@
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 class EdhrecDeckApiResponse
 {
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@ -23,8 +23,8 @@
 #include <QRegularExpression>
 #include <QResizeEvent>
 #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/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card/card_search_model.h>

 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@ -33,7 +33,7 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@ -18,7 +18,7 @@
 #include <QUrl>
 #include <QVBoxLayout>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@ -23,7 +23,7 @@
 #include <QMap>
 #include <QProxyStyle>
 #include <QTabWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");

--- 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,8 +27,8 @@
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>
--- 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/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>

 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
--- 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
@ -28,8 +28,8 @@
 #include <QWheelEvent>
 #include <QWidget>
 #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/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/utility/key_signals.h>
 #include <qscrollarea.h>

--- 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
@ -3,7 +3,7 @@
 #include "../cards/card_info_picture_widget.h"

 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <random>

--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
@ -13,7 +13,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class VisualDeckEditorSampleHandWidget : public QWidget
 {
--- 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
@ -16,11 +16,11 @@
 #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 <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qscrollarea.h>

 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel)
--- 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
@ -18,10 +18,10 @@
 #include <QPushButton>
 #include <QWidget>
 #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 <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qscrollarea.h>

 class DeckCardZoneDisplayWidget;
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
@ -10,7 +10,7 @@
 #include "deck_preview_widget.h"

 #include <QWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);

--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
@ -18,7 +18,7 @@
 #include <QEvent>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>

 class QMenu;
 class VisualDeckStorageWidget;
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@ -20,7 +20,7 @@

 #include <QCheckBox>
 #include <QFileSystemModel>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>

 class QSpinBox;
 class VisualDeckStorageSearchWidget;