diff --git a/tools/3rdparty/optional-lite/LICENSE.txt b/src/3rdparty/optional-lite/LICENSE.txt
similarity index 100%
rename from tools/3rdparty/optional-lite/LICENSE.txt
rename to src/3rdparty/optional-lite/LICENSE.txt
diff --git a/tools/3rdparty/optional-lite/optional.hpp b/src/3rdparty/optional-lite/optional.hpp
similarity index 100%
rename from tools/3rdparty/optional-lite/optional.hpp
rename to src/3rdparty/optional-lite/optional.hpp
diff --git a/tools/3rdparty/variant-lite/LICENSE.txt b/src/3rdparty/variant-lite/LICENSE.txt
similarity index 100%
rename from tools/3rdparty/variant-lite/LICENSE.txt
rename to src/3rdparty/variant-lite/LICENSE.txt
diff --git a/tools/3rdparty/variant-lite/variant.hpp b/src/3rdparty/variant-lite/variant.hpp
similarity index 100%
rename from tools/3rdparty/variant-lite/variant.hpp
rename to src/3rdparty/variant-lite/variant.hpp
diff --git a/src/mvvmcore/mvvmcore.pro b/src/mvvmcore/mvvmcore.pro
index 121e906..31d67ac 100644
--- a/src/mvvmcore/mvvmcore.pro
+++ b/src/mvvmcore/mvvmcore.pro
@@ -41,6 +41,8 @@ SOURCES += \
 	qsettingsaccessor.cpp \
 	settingsentry.cpp
 
+include(../settingsconfig/settingsconfig.pri)
+
 TRANSLATIONS += \
 	translations/qtmvvmcore_de.ts \
 	translations/qtmvvmcore_template.ts
diff --git a/src/mvvmcore/qpmx.json b/src/mvvmcore/qpmx.json
index 5005027..ea25afd 100644
--- a/src/mvvmcore/qpmx.json
+++ b/src/mvvmcore/qpmx.json
@@ -4,6 +4,11 @@
             "package": "de.skycoder42.qpluginfactory",
             "provider": "qpm",
             "version": "1.3.0"
+        },
+        {
+            "package": "de.skycoder42.qxmlcodegen",
+            "provider": "qpm",
+            "version": "1.2.1"
         }
     ],
     "license": {
diff --git a/src/mvvmdatasynccore/mvvmdatasynccore.pro b/src/mvvmdatasynccore/mvvmdatasynccore.pro
index 25b6f1c..d53c0b6 100644
--- a/src/mvvmdatasynccore/mvvmdatasynccore.pro
+++ b/src/mvvmdatasynccore/mvvmdatasynccore.pro
@@ -15,10 +15,10 @@ HEADERS += \
 	networkexchangeviewmodel_p.h \
 	exchangedevicesmodel.h \
 	exchangedevicesmodel_p.h \
-    datasyncsettingsviewmodel.h \
-    datasyncsettingsaccessor.h \
-    datasyncsettingsentry.h \
-    datasyncsettingsaccessor_p.h
+	datasyncsettingsviewmodel.h \
+	datasyncsettingsaccessor.h \
+	datasyncsettingsentry.h \
+	datasyncsettingsaccessor_p.h
 
 SOURCES += \
 	datasyncviewmodel.cpp \
@@ -28,9 +28,9 @@ SOURCES += \
 	identityeditviewmodel.cpp \
 	networkexchangeviewmodel.cpp \
 	exchangedevicesmodel.cpp \
-    datasyncsettingsviewmodel.cpp \
-    datasyncsettingsaccessor.cpp \
-    datasyncsettingsentry.cpp
+	datasyncsettingsviewmodel.cpp \
+	datasyncsettingsaccessor.cpp \
+	datasyncsettingsentry.cpp
 
 TRANSLATIONS += \
 	translations/qtmvvmdatasynccore_de.ts \
diff --git a/src/settingsconfig/settingsconfig.pri b/src/settingsconfig/settingsconfig.pri
new file mode 100644
index 0000000..e2d19ee
--- /dev/null
+++ b/src/settingsconfig/settingsconfig.pri
@@ -0,0 +1,13 @@
+HEADERS += \
+	$$PWD/../3rdparty/optional-lite/optional.hpp \
+	$$PWD/../3rdparty/variant-lite/variant.hpp \
+	$$PWD/settingsconfigimpl.h
+
+SOURCES += $$PWD/settingsconfigimpl.cpp
+
+XML_SCHEMA_DEFINITIONS += $$PWD/settingsconfig.xsd
+
+INCLUDEPATH += $$PWD $$PWD/../3rdparty/optional-lite $$PWD/../3rdparty/variant-lite
+
+contains(QT, xmlpatterns): RESOURCES += \
+	$$PWD/settingsconfig.qrc
diff --git a/src/settingsconfig/settingsconfig.qrc b/src/settingsconfig/settingsconfig.qrc
new file mode 100644
index 0000000..31857ac
--- /dev/null
+++ b/src/settingsconfig/settingsconfig.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/schemas">
+        <file>settingsconfig.xsd</file>
+    </qresource>
+</RCC>
diff --git a/tools/settingsgenerator/settingsconfig.xsd b/src/settingsconfig/settingsconfig.xsd
similarity index 100%
rename from tools/settingsgenerator/settingsconfig.xsd
rename to src/settingsconfig/settingsconfig.xsd
diff --git a/tools/settingsgenerator/settingsconfigimpl.cpp b/src/settingsconfig/settingsconfigimpl.cpp
similarity index 100%
rename from tools/settingsgenerator/settingsconfigimpl.cpp
rename to src/settingsconfig/settingsconfigimpl.cpp
diff --git a/tools/settingsgenerator/settingsconfigimpl.h b/src/settingsconfig/settingsconfigimpl.h
similarity index 100%
rename from tools/settingsgenerator/settingsconfigimpl.h
rename to src/settingsconfig/settingsconfigimpl.h
diff --git a/tools/3rdparty/3rdparty.pri b/tools/3rdparty/3rdparty.pri
deleted file mode 100644
index c0a9f8d..0000000
--- a/tools/3rdparty/3rdparty.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-HEADERS += \
-	$$PWD/optional-lite/optional.hpp \
-	$$PWD/variant-lite/variant.hpp
-
-INCLUDEPATH += $$PWD/optional-lite $$PWD/variant-lite
diff --git a/tools/settingsgenerator/qsettingsgenerator.qrc b/tools/settingsgenerator/qsettingsgenerator.qrc
index b2a73cd..c1b6869 100644
--- a/tools/settingsgenerator/qsettingsgenerator.qrc
+++ b/tools/settingsgenerator/qsettingsgenerator.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/schemas">
         <file>qsettingsgenerator.xsd</file>
-        <file>settingsconfig.xsd</file>
     </qresource>
 </RCC>
diff --git a/tools/settingsgenerator/settingsgenerator.pro b/tools/settingsgenerator/settingsgenerator.pro
index 5d5f41c..c0e7215 100644
--- a/tools/settingsgenerator/settingsgenerator.pro
+++ b/tools/settingsgenerator/settingsgenerator.pro
@@ -16,7 +16,6 @@ DEFINES += "BUNDLE_PREFIX=\\\"$$BUNDLE_PREFIX\\\""
 
 HEADERS += \
 	settingstranslator.h \
-    settingsconfigimpl.h \
     cppsettingsgenerator.h \
     settingsgeneratorimpl.h \
     qmlsettingsgenerator.h
@@ -24,18 +23,16 @@ HEADERS += \
 SOURCES += \
 	main.cpp \
 	settingstranslator.cpp \
-    settingsconfigimpl.cpp \
     cppsettingsgenerator.cpp \
     settingsgeneratorimpl.cpp \
     qmlsettingsgenerator.cpp
 
 XML_SCHEMA_DEFINITIONS += \
-	qsettingsgenerator.xsd \
-	settingsconfig.xsd
+	qsettingsgenerator.xsd
 
-contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
+include(../../src/settingsconfig/settingsconfig.pri)
 
-include(../3rdparty/3rdparty.pri)
+contains(QT, xmlpatterns):RESOURCES += qsettingsgenerator.qrc
 
 load(qt_tool)