diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 8e44e0b65..e02934128 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,15 +7,7 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/card/card_completer_proxy_model.cpp
-    src/card/card_database.cpp
-    src/card/card_database_manager.cpp
-    src/card/card_database_model.cpp
-    src/card/card_database_parser/card_database_parser.cpp
-    src/card/card_database_parser/cockatrice_xml_3.cpp
-    src/card/card_database_parser/cockatrice_xml_4.cpp
     src/card/card_info.cpp
-    src/card/card_search_model.cpp
     src/card/exact_card.cpp
     src/client/get_text_with_max.cpp
     src/client/menus/deck_editor/deck_editor_menu.cpp
@@ -161,6 +153,14 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/client/ui/window_main.cpp
     src/client/update_downloader.cpp
+    src/database/card_completer_proxy_model.cpp
+    src/database/card_database.cpp
+    src/database/card_database_manager.cpp
+    src/database/card_database_model.cpp
+    src/database/card_search_model.cpp
+    src/database/parser/card_database_parser.cpp
+    src/database/parser/cockatrice_xml_3.cpp
+    src/database/parser/cockatrice_xml_4.cpp
     src/deck/custom_line_edit.cpp
     src/deck/deck_list_model.cpp
     src/deck/deck_loader.cpp
diff --git a/cockatrice/src/card/card_completer_proxy_model.cpp b/cockatrice/src/database/card_completer_proxy_model.cpp
similarity index 100%
rename from cockatrice/src/card/card_completer_proxy_model.cpp
rename to cockatrice/src/database/card_completer_proxy_model.cpp
diff --git a/cockatrice/src/card/card_completer_proxy_model.h b/cockatrice/src/database/card_completer_proxy_model.h
similarity index 100%
rename from cockatrice/src/card/card_completer_proxy_model.h
rename to cockatrice/src/database/card_completer_proxy_model.h
diff --git a/cockatrice/src/card/card_database.cpp b/cockatrice/src/database/card_database.cpp
similarity index 99%
rename from cockatrice/src/card/card_database.cpp
rename to cockatrice/src/database/card_database.cpp
index 6503e8bef..294b8e659 100644
--- a/cockatrice/src/card/card_database.cpp
+++ b/cockatrice/src/database/card_database.cpp
@@ -3,8 +3,8 @@
 #include "../client/ui/picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 #include "../utility/card_set_comparator.h"
-#include "./card_database_parser/cockatrice_xml_3.h"
-#include "./card_database_parser/cockatrice_xml_4.h"
+#include "./parser/cockatrice_xml_3.h"
+#include "./parser/cockatrice_xml_4.h"
 
 #include <QCryptographicHash>
 #include <QDebug>
diff --git a/cockatrice/src/card/card_database.h b/cockatrice/src/database/card_database.h
similarity index 99%
rename from cockatrice/src/card/card_database.h
rename to cockatrice/src/database/card_database.h
index 1f453d95f..ecfb850ac 100644
--- a/cockatrice/src/card/card_database.h
+++ b/cockatrice/src/database/card_database.h
@@ -1,8 +1,8 @@
 #ifndef CARDDATABASE_H
 #define CARDDATABASE_H
 
+#include "../card/exact_card.h"
 #include "../common/card_ref.h"
-#include "exact_card.h"
 
 #include <QBasicMutex>
 #include <QDate>
diff --git a/cockatrice/src/card/card_database_manager.cpp b/cockatrice/src/database/card_database_manager.cpp
similarity index 100%
rename from cockatrice/src/card/card_database_manager.cpp
rename to cockatrice/src/database/card_database_manager.cpp
diff --git a/cockatrice/src/card/card_database_manager.h b/cockatrice/src/database/card_database_manager.h
similarity index 100%
rename from cockatrice/src/card/card_database_manager.h
rename to cockatrice/src/database/card_database_manager.h
diff --git a/cockatrice/src/card/card_database_model.cpp b/cockatrice/src/database/card_database_model.cpp
similarity index 100%
rename from cockatrice/src/card/card_database_model.cpp
rename to cockatrice/src/database/card_database_model.cpp
diff --git a/cockatrice/src/card/card_database_model.h b/cockatrice/src/database/card_database_model.h
similarity index 100%
rename from cockatrice/src/card/card_database_model.h
rename to cockatrice/src/database/card_database_model.h
diff --git a/cockatrice/src/card/card_search_model.cpp b/cockatrice/src/database/card_search_model.cpp
similarity index 100%
rename from cockatrice/src/card/card_search_model.cpp
rename to cockatrice/src/database/card_search_model.cpp
diff --git a/cockatrice/src/card/card_search_model.h b/cockatrice/src/database/card_search_model.h
similarity index 100%
rename from cockatrice/src/card/card_search_model.h
rename to cockatrice/src/database/card_search_model.h
diff --git a/cockatrice/src/card/card_database_parser/card_database_parser.cpp b/cockatrice/src/database/parser/card_database_parser.cpp
similarity index 100%
rename from cockatrice/src/card/card_database_parser/card_database_parser.cpp
rename to cockatrice/src/database/parser/card_database_parser.cpp
diff --git a/cockatrice/src/card/card_database_parser/card_database_parser.h b/cockatrice/src/database/parser/card_database_parser.h
similarity index 97%
rename from cockatrice/src/card/card_database_parser/card_database_parser.h
rename to cockatrice/src/database/parser/card_database_parser.h
index b7ef36636..9b3950427 100644
--- a/cockatrice/src/card/card_database_parser/card_database_parser.h
+++ b/cockatrice/src/database/parser/card_database_parser.h
@@ -1,7 +1,7 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H
 
-#include "../card_info.h"
+#include "../../card/card_info.h"
 
 #include <QIODevice>
 #include <QString>
diff --git a/cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp b/cockatrice/src/database/parser/cockatrice_xml_3.cpp
similarity index 100%
rename from cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
rename to cockatrice/src/database/parser/cockatrice_xml_3.cpp
diff --git a/cockatrice/src/card/card_database_parser/cockatrice_xml_3.h b/cockatrice/src/database/parser/cockatrice_xml_3.h
similarity index 100%
rename from cockatrice/src/card/card_database_parser/cockatrice_xml_3.h
rename to cockatrice/src/database/parser/cockatrice_xml_3.h
diff --git a/cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp b/cockatrice/src/database/parser/cockatrice_xml_4.cpp
similarity index 100%
rename from cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
rename to cockatrice/src/database/parser/cockatrice_xml_4.cpp
diff --git a/cockatrice/src/card/card_database_parser/cockatrice_xml_4.h b/cockatrice/src/database/parser/cockatrice_xml_4.h
similarity index 100%
rename from cockatrice/src/card/card_database_parser/cockatrice_xml_4.h
rename to cockatrice/src/database/parser/cockatrice_xml_4.h
diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
index dbbb6fc33..20bb5c825 100644
--- a/dbconverter/CMakeLists.txt
+++ b/dbconverter/CMakeLists.txt
@@ -5,12 +5,12 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$
 set(dbconverter_SOURCES
     src/main.cpp
     src/mocks.cpp
-    ../cockatrice/src/card/card_database.cpp
-    ../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-    ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-    ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
     ../cockatrice/src/card/card_info.cpp
     ../cockatrice/src/card/exact_card.cpp
+    ../cockatrice/src/database/card_database.cpp
+    ../cockatrice/src/database/parser/card_database_parser.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_4.cpp
     ../cockatrice/src/settings/settings_manager.cpp
     ${VERSION_STRING_CPP}
 )
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index f44e77387..7af66dbb5 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -17,12 +17,12 @@ set(oracle_SOURCES
     src/pagetemplates.cpp
     src/parsehelpers.cpp
     src/qt-json/json.cpp
-    ../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-    ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-    ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
     ../cockatrice/src/card/card_info.cpp
     ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp
     ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
+    ../cockatrice/src/database/parser/card_database_parser.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_4.cpp
     ../cockatrice/src/settings/cache_settings.cpp
     ../cockatrice/src/settings/shortcuts_settings.cpp
     ../cockatrice/src/settings/card_counter_settings.cpp
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index c553c41b7..590c2daeb 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -18,12 +18,12 @@ add_executable(
   carddatabase_test
   ${MOCKS_SOURCES}
   ${VERSION_STRING_CPP}
-  ../../cockatrice/src/card/card_database.cpp
-  ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
   ../../cockatrice/src/card/card_info.cpp
   ../../cockatrice/src/card/exact_card.cpp
+  ../../cockatrice/src/database/card_database.cpp
+  ../../cockatrice/src/database/parser/card_database_parser.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
   ../../cockatrice/src/settings/settings_manager.cpp
   carddatabase_test.cpp
   mocks.cpp
@@ -32,13 +32,13 @@ add_executable(
   filter_string_test
   ${MOCKS_SOURCES}
   ${VERSION_STRING_CPP}
-  ../../cockatrice/src/card/card_database.cpp
-  ../../cockatrice/src/card/card_database_manager.cpp
-  ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
   ../../cockatrice/src/card/card_info.cpp
   ../../cockatrice/src/card/exact_card.cpp
+  ../../cockatrice/src/database/card_database.cpp
+  ../../cockatrice/src/database/card_database_manager.cpp
+  ../../cockatrice/src/database/parser/card_database_parser.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
   ../../cockatrice/src/filters/filter_card.cpp
   ../../cockatrice/src/filters/filter_string.cpp
   ../../cockatrice/src/filters/filter_tree.cpp