diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cfe26e6a..e0a0fd8c1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,6 @@ set(keepassx_SOURCES
         core/Bootstrap.cpp
         core/Clock.cpp
         core/Config.cpp
-        core/CsvParser.cpp
         core/CustomData.cpp
         core/Database.cpp
         core/DatabaseIcons.cpp
@@ -71,6 +70,7 @@ set(keepassx_SOURCES
         crypto/kdf/AesKdf.cpp
         crypto/kdf/Argon2Kdf.cpp
         format/CsvExporter.cpp
+        format/CsvParser.cpp
         format/HtmlExporter.cpp
         format/KeePass1Reader.cpp
         format/KeePass2.cpp
diff --git a/src/core/CsvParser.cpp b/src/format/CsvParser.cpp
similarity index 100%
rename from src/core/CsvParser.cpp
rename to src/format/CsvParser.cpp
diff --git a/src/core/CsvParser.h b/src/format/CsvParser.h
similarity index 100%
rename from src/core/CsvParser.h
rename to src/format/CsvParser.h
diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h
index 2b58b761a..5e979421c 100644
--- a/src/gui/csvImport/CsvParserModel.h
+++ b/src/gui/csvImport/CsvParserModel.h
@@ -21,8 +21,8 @@
 
 #include <QAbstractTableModel>
 
-#include "core/CsvParser.h"
 #include "core/Group.h"
+#include "format/CsvParser.h"
 
 class CsvParserModel : public QAbstractTableModel, public CsvParser
 {
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
index df6038e9e..dc4429dec 100644
--- a/tests/TestCsvParser.h
+++ b/tests/TestCsvParser.h
@@ -22,7 +22,7 @@
 #include <QFile>
 #include <QTemporaryFile>
 
-#include "core/CsvParser.h"
+#include "format/CsvParser.h"
 
 class CsvParser;