diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 5a5bce572..11b5275e6 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -23,10 +23,10 @@ set(cockatrice_SOURCES
     src/client/update_downloader.cpp
     src/database/card_database.cpp
     src/database/card_database_manager.cpp
+    src/database/model/card_database_model.cpp
+    src/database/model/card_database_display_model.cpp
     src/database/model/card/card_completer_proxy_model.cpp
     src/database/model/card/card_search_model.cpp
-    src/database/model/database/card_database_model.cpp
-    src/database/model/database/card_database_display_model.cpp
     src/database/model/token/token_display_model.cpp
     src/database/model/token/token_edit_model.cpp
     src/database/parser/card_database_parser.cpp
diff --git a/cockatrice/src/database/model/card/card_search_model.cpp b/cockatrice/src/database/model/card/card_search_model.cpp
index 9c6ca68eb..d39a2207d 100644
--- a/cockatrice/src/database/model/card/card_search_model.cpp
+++ b/cockatrice/src/database/model/card/card_search_model.cpp
@@ -1,7 +1,7 @@
 #include "card_search_model.h"
 
 #include "../../../utility/levenshtein.h"
-#include "../database/card_database_model.h"
+#include "../card_database_model.h"
 
 #include <algorithm>
 
diff --git a/cockatrice/src/database/model/card/card_search_model.h b/cockatrice/src/database/model/card/card_search_model.h
index ac0293cdc..aa9939662 100644
--- a/cockatrice/src/database/model/card/card_search_model.h
+++ b/cockatrice/src/database/model/card/card_search_model.h
@@ -1,7 +1,7 @@
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
-#include "../database/card_database_display_model.h"
+#include "../card_database_display_model.h"
 
 #include <QAbstractListModel>
 
diff --git a/cockatrice/src/database/model/database/card_database_display_model.cpp b/cockatrice/src/database/model/card_database_display_model.cpp
similarity index 100%
rename from cockatrice/src/database/model/database/card_database_display_model.cpp
rename to cockatrice/src/database/model/card_database_display_model.cpp
diff --git a/cockatrice/src/database/model/database/card_database_display_model.h b/cockatrice/src/database/model/card_database_display_model.h
similarity index 98%
rename from cockatrice/src/database/model/database/card_database_display_model.h
rename to cockatrice/src/database/model/card_database_display_model.h
index f536eace7..0515c7624 100644
--- a/cockatrice/src/database/model/database/card_database_display_model.h
+++ b/cockatrice/src/database/model/card_database_display_model.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 
-#include "../../../filters/filter_string.h"
+#include "../../filters/filter_string.h"
 
 #include <QList>
 #include <QSet>
diff --git a/cockatrice/src/database/model/database/card_database_model.cpp b/cockatrice/src/database/model/card_database_model.cpp
similarity index 100%
rename from cockatrice/src/database/model/database/card_database_model.cpp
rename to cockatrice/src/database/model/card_database_model.cpp
diff --git a/cockatrice/src/database/model/database/card_database_model.h b/cockatrice/src/database/model/card_database_model.h
similarity index 97%
rename from cockatrice/src/database/model/database/card_database_model.h
rename to cockatrice/src/database/model/card_database_model.h
index 52060fced..fac099f5a 100644
--- a/cockatrice/src/database/model/database/card_database_model.h
+++ b/cockatrice/src/database/model/card_database_model.h
@@ -1,7 +1,7 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "../../card_database.h"
+#include "../card_database.h"
 
 #include <QAbstractListModel>
 #include <QList>
diff --git a/cockatrice/src/database/model/token/token_display_model.cpp b/cockatrice/src/database/model/token/token_display_model.cpp
index 17a6e0dfd..4282c6dc8 100644
--- a/cockatrice/src/database/model/token/token_display_model.cpp
+++ b/cockatrice/src/database/model/token/token_display_model.cpp
@@ -1,6 +1,6 @@
 #include "token_display_model.h"
 
-#include "../database/card_database_model.h"
+#include "../card_database_model.h"
 
 TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
diff --git a/cockatrice/src/database/model/token/token_display_model.h b/cockatrice/src/database/model/token/token_display_model.h
index e580e99c6..50d351653 100644
--- a/cockatrice/src/database/model/token/token_display_model.h
+++ b/cockatrice/src/database/model/token/token_display_model.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H
 #define COCKATRICE_TOKEN_DISPLAY_MODEL_H
 
-#include "../database/card_database_display_model.h"
+#include "../card_database_display_model.h"
 
 class TokenDisplayModel : public CardDatabaseDisplayModel
 {
diff --git a/cockatrice/src/database/model/token/token_edit_model.cpp b/cockatrice/src/database/model/token/token_edit_model.cpp
index c7bc4b251..ad6891d2e 100644
--- a/cockatrice/src/database/model/token/token_edit_model.cpp
+++ b/cockatrice/src/database/model/token/token_edit_model.cpp
@@ -1,6 +1,6 @@
 #include "token_edit_model.h"
 
-#include "../database/card_database_model.h"
+#include "../card_database_model.h"
 
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
diff --git a/cockatrice/src/database/model/token/token_edit_model.h b/cockatrice/src/database/model/token/token_edit_model.h
index 4ac5aeea6..3ae2278cf 100644
--- a/cockatrice/src/database/model/token/token_edit_model.h
+++ b/cockatrice/src/database/model/token/token_edit_model.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H
 #define COCKATRICE_TOKEN_EDIT_MODEL_H
 
-#include "../database/card_database_display_model.h"
+#include "../card_database_display_model.h"
 
 class TokenEditModel : public CardDatabaseDisplayModel
 {
diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
index 2e8afa3b4..8ad0fdbbc 100644
--- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
@@ -3,7 +3,7 @@
 #include "../client/get_text_with_max.h"
 #include "../database/card_database.h"
 #include "../database/card_database_manager.h"
-#include "../database/model/database/card_database_model.h"
+#include "../database/model/card_database_model.h"
 #include "../database/model/token/token_edit_model.h"
 #include "../main.h"
 #include "trice_limits.h"
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
index 5ad09493f..101727bee 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -1,7 +1,7 @@
 #include "dlg_create_token.h"
 
 #include "../../database/card_database_manager.h"
-#include "../../database/model/database/card_database_model.h"
+#include "../../database/model/card_database_model.h"
 #include "../../database/model/token/token_display_model.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
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 90ef56fe7..3944b03f6 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
@@ -1,8 +1,8 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../database/model/database/card_database_display_model.h"
-#include "../../../database/model/database/card_database_model.h"
+#include "../../../database/model/card_database_display_model.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../deck/custom_line_edit.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../../../utility/key_signals.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 be7120be0..51d0cdbbe 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
@@ -1,6 +1,6 @@
 #include "deck_editor_filter_dock_widget.h"
 
-#include "../../../database/model/database/card_database_model.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../../settings/cache_settings.h"
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 34c00631f..ec7bc9d5c 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
@@ -2,7 +2,7 @@
 #define VISUAL_DATABASE_DISPLAY_WIDGET_H
 
 #include "../../../database/card_database.h"
-#include "../../../database/model/database/card_database_model.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../deck/custom_line_edit.h"
 #include "../../../deck/deck_list_model.h"
 #include "../../../filters/filter_tree_model.h"
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 b016335be..369e09be2 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
@@ -4,7 +4,7 @@
 #include "../../../database/card_database_manager.h"
 #include "../../../database/model/card/card_completer_proxy_model.h"
 #include "../../../database/model/card/card_search_model.h"
-#include "../../../database/model/database/card_database_model.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../deck/deck_list_model.h"
 #include "../../../deck/deck_loader.h"
 #include "../../../main.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 3fd5909f3..cd5cfcd98 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
@@ -3,8 +3,8 @@
 
 #include "../../../database/card_database.h"
 #include "../../../database/model/card/card_completer_proxy_model.h"
-#include "../../../database/model/database/card_database_display_model.h"
-#include "../../../database/model/database/card_database_model.h"
+#include "../../../database/model/card_database_display_model.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../deck/deck_list_model.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/card_size_widget.h"
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
index 66eea3363..455b5ca29 100644
--- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
@@ -2,7 +2,7 @@
 
 #include "../client/tapped_out_interface.h"
 #include "../database/card_database_manager.h"
-#include "../database/model/database/card_database_model.h"
+#include "../database/model/card_database_model.h"
 #include "../deck/deck_stats_interface.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp
index e43397d1e..b17eb5ff1 100644
--- a/cockatrice/src/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/tab_deck_editor.cpp
@@ -3,7 +3,7 @@
 #include "../client/deck_editor_menu.h"
 #include "../client/tapped_out_interface.h"
 #include "../database/card_database_manager.h"
-#include "../database/model/database/card_database_model.h"
+#include "../database/model/card_database_model.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../filters/filter_builder.h"
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index 67b28ae4c..d8584433d 100644
--- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -1,6 +1,6 @@
 #include "tab_deck_editor_visual.h"
 
-#include "../../database/model/database/card_database_model.h"
+#include "../../database/model/card_database_model.h"
 #include "../../deck/deck_list_model.h"
 #include "../../deck/deck_stats_interface.h"
 #include "../../filters/filter_builder.h"
diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index 0929223e9..ea8822213 100644
--- a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -1,6 +1,6 @@
 #include "tab_deck_storage_visual.h"
 
-#include "../../database/model/database/card_database_model.h"
+#include "../../database/model/card_database_model.h"
 #include "../../interface/widgets/cards/deck_preview_card_picture_widget.h"
 #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "../tab_supervisor.h"