diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d8051e0c..237e756d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,10 +315,10 @@ set(${PROJECT_NAME}_SOURCES
   src/nexus.h
   src/persistence/db/rawdatabase.cpp
   src/persistence/db/rawdatabase.h
+  src/persistence/db/upgrades/dbupgrader.cpp
+  src/persistence/db/upgrades/dbupgrader.h
   src/persistence/history.cpp
   src/persistence/history.h
-  src/persistence/dbupgrader.cpp
-  src/persistence/dbupgrader.h
   src/persistence/ifriendsettings.cpp
   src/persistence/ifriendsettings.h
   src/persistence/igroupsettings.cpp
diff --git a/src/persistence/dbupgrader.cpp b/src/persistence/db/upgrades/dbupgrader.cpp
similarity index 100%
rename from src/persistence/dbupgrader.cpp
rename to src/persistence/db/upgrades/dbupgrader.cpp
diff --git a/src/persistence/dbupgrader.h b/src/persistence/db/upgrades/dbupgrader.h
similarity index 100%
rename from src/persistence/dbupgrader.h
rename to src/persistence/db/upgrades/dbupgrader.h
diff --git a/src/persistence/history.cpp b/src/persistence/history.cpp
index 650a3f526..3f347d742 100644
--- a/src/persistence/history.cpp
+++ b/src/persistence/history.cpp
@@ -23,7 +23,7 @@
 #include "history.h"
 #include "profile.h"
 #include "settings.h"
-#include "dbupgrader.h"
+#include "db/upgrades/dbupgrader.h"
 #include "db/rawdatabase.h"
 #include "src/core/toxpk.h"
 
diff --git a/test/persistence/dbschema_test.cpp b/test/persistence/dbschema_test.cpp
index 26bf77374..0f56be811 100644
--- a/test/persistence/dbschema_test.cpp
+++ b/test/persistence/dbschema_test.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "src/persistence/db/rawdatabase.h"
-#include "src/persistence/dbupgrader.h"
+#include "src/persistence/db/upgrades/dbupgrader.h"
 #include "src/core/toxfile.h"
 
 #include "dbutility/dbutility.h"