diff --git a/.gitmodules b/.gitmodules
index f7a382399..a713075e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,65 +61,65 @@
 [submodule "main/dependencies/tqca-tls"]
 	path = main/dependencies/tqca-tls
 	url = https://system@scm.trinitydesktop.org/scm/git/tqca-tls
-[submodule "main/tdelibs"]
-	path = main/tdelibs
+[submodule "main/core/tdelibs"]
+	path = main/core/tdelibs
 	url = https://system@scm.trinitydesktop.org/scm/git/tdelibs
 [submodule "main/libraries/libtdeldap"]
 	path = main/libraries/libtdeldap
 	url = https://system@scm.trinitydesktop.org/scm/git/libtdeldap
-[submodule "main/tdebase"]
-	path = main/tdebase
+[submodule "main/core/tdebase"]
+	path = main/core/tdebase
 	url = https://system@scm.trinitydesktop.org/scm/git/tdebase
-[submodule "main/tdepim"]
-	path = main/tdepim
+[submodule "main/core/tdepim"]
+	path = main/core/tdepim
 	url = https://system@scm.trinitydesktop.org/scm/git/tdepim
-[submodule "main/tdemultimedia"]
-	path = main/tdemultimedia
+[submodule "main/core/tdemultimedia"]
+	path = main/core/tdemultimedia
 	url = https://system@scm.trinitydesktop.org/scm/git/tdemultimedia
-[submodule "main/tdenetwork"]
-	path = main/tdenetwork
+[submodule "main/core/tdenetwork"]
+	path = main/core/tdenetwork
 	url = https://system@scm.trinitydesktop.org/scm/git/tdenetwork
-[submodule "main/tdegraphics"]
-	path = main/tdegraphics
+[submodule "main/core/tdegraphics"]
+	path = main/core/tdegraphics
 	url = https://system@scm.trinitydesktop.org/scm/git/tdegraphics
-[submodule "main/tdetoys"]
-	path = main/tdetoys
+[submodule "main/core/tdetoys"]
+	path = main/core/tdetoys
 	url = https://system@scm.trinitydesktop.org/scm/git/tdetoys
-[submodule "main/tdeutils"]
-	path = main/tdeutils
+[submodule "main/core/tdeutils"]
+	path = main/core/tdeutils
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeutils
-[submodule "main/tdeedu"]
-	path = main/tdeedu
+[submodule "main/core/tdeedu"]
+	path = main/core/tdeedu
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeedu
-[submodule "main/tdegames"]
-	path = main/tdegames
+[submodule "main/core/tdegames"]
+	path = main/core/tdegames
 	url = https://system@scm.trinitydesktop.org/scm/git/tdegames
-[submodule "main/tdeaccessibility"]
-	path = main/tdeaccessibility
+[submodule "main/core/tdeaccessibility"]
+	path = main/core/tdeaccessibility
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeaccessibility
-[submodule "main/tdeaddons"]
-	path = main/tdeaddons
+[submodule "main/core/tdeaddons"]
+	path = main/core/tdeaddons
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeaddons
-[submodule "main/tdeadmin"]
-	path = main/tdeadmin
+[submodule "main/core/tdeadmin"]
+	path = main/core/tdeadmin
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeadmin
-[submodule "main/tdeartwork"]
-	path = main/tdeartwork
+[submodule "main/core/tdeartwork"]
+	path = main/core/tdeartwork
 	url = https://system@scm.trinitydesktop.org/scm/git/tdeartwork
-[submodule "main/tdebindings"]
-	path = main/tdebindings
+[submodule "main/core/tdebindings"]
+	path = main/core/tdebindings
 	url = https://system@scm.trinitydesktop.org/scm/git/tdebindings
-[submodule "main/tdesdk"]
-	path = main/tdesdk
+[submodule "main/core/tdesdk"]
+	path = main/core/tdesdk
 	url = https://system@scm.trinitydesktop.org/scm/git/tdesdk
-[submodule "main/tdevelop"]
-	path = main/tdevelop
+[submodule "main/core/tdevelop"]
+	path = main/core/tdevelop
 	url = https://system@scm.trinitydesktop.org/scm/git/tdevelop
-[submodule "main/tdewebdev"]
-	path = main/tdewebdev
+[submodule "main/core/tdewebdev"]
+	path = main/core/tdewebdev
 	url = https://system@scm.trinitydesktop.org/scm/git/tdewebdev
-[submodule "main/tde-i18n"]
-	path = main/tde-i18n
+[submodule "main/core/tde-i18n"]
+	path = main/core/tde-i18n
 	url = https://system@scm.trinitydesktop.org/scm/git/tde-i18n
 [submodule "main/libraries/libkdcraw"]
 	path = main/libraries/libkdcraw
diff --git a/main/tde-i18n b/main/core/tde-i18n
similarity index 100%
rename from main/tde-i18n
rename to main/core/tde-i18n
diff --git a/main/tdeaccessibility b/main/core/tdeaccessibility
similarity index 100%
rename from main/tdeaccessibility
rename to main/core/tdeaccessibility
diff --git a/main/tdeaddons b/main/core/tdeaddons
similarity index 100%
rename from main/tdeaddons
rename to main/core/tdeaddons
diff --git a/main/tdeadmin b/main/core/tdeadmin
similarity index 100%
rename from main/tdeadmin
rename to main/core/tdeadmin
diff --git a/main/tdeartwork b/main/core/tdeartwork
similarity index 100%
rename from main/tdeartwork
rename to main/core/tdeartwork
diff --git a/main/tdebase b/main/core/tdebase
similarity index 100%
rename from main/tdebase
rename to main/core/tdebase
diff --git a/main/tdebindings b/main/core/tdebindings
similarity index 100%
rename from main/tdebindings
rename to main/core/tdebindings
diff --git a/main/tdeedu b/main/core/tdeedu
similarity index 100%
rename from main/tdeedu
rename to main/core/tdeedu
diff --git a/main/tdegames b/main/core/tdegames
similarity index 100%
rename from main/tdegames
rename to main/core/tdegames
diff --git a/main/tdegraphics b/main/core/tdegraphics
similarity index 100%
rename from main/tdegraphics
rename to main/core/tdegraphics
diff --git a/main/tdelibs b/main/core/tdelibs
similarity index 100%
rename from main/tdelibs
rename to main/core/tdelibs
diff --git a/main/tdemultimedia b/main/core/tdemultimedia
similarity index 100%
rename from main/tdemultimedia
rename to main/core/tdemultimedia
diff --git a/main/tdenetwork b/main/core/tdenetwork
similarity index 100%
rename from main/tdenetwork
rename to main/core/tdenetwork
diff --git a/main/tdepim b/main/core/tdepim
similarity index 100%
rename from main/tdepim
rename to main/core/tdepim
diff --git a/main/tdesdk b/main/core/tdesdk
similarity index 100%
rename from main/tdesdk
rename to main/core/tdesdk
diff --git a/main/tdetoys b/main/core/tdetoys
similarity index 100%
rename from main/tdetoys
rename to main/core/tdetoys
diff --git a/main/tdeutils b/main/core/tdeutils
similarity index 100%
rename from main/tdeutils
rename to main/core/tdeutils
diff --git a/main/tdevelop b/main/core/tdevelop
similarity index 100%
rename from main/tdevelop
rename to main/core/tdevelop
diff --git a/main/tdewebdev b/main/core/tdewebdev
similarity index 100%
rename from main/tdewebdev
rename to main/core/tdewebdev