diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 5f26f0c356..1fa9c41116 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1107,11 +1107,11 @@ return array(
     'OC\\Settings\\Activity\\SecurityProvider' => $baseDir . '/settings/Activity/SecurityProvider.php',
     'OC\\Settings\\Activity\\SecuritySetting' => $baseDir . '/settings/Activity/SecuritySetting.php',
     'OC\\Settings\\Activity\\Setting' => $baseDir . '/settings/Activity/Setting.php',
-    'OC\\Settings\\Admin\\Mail' => $baseDir . '/lib/private/Settings/Admin/Mail.php',
-    'OC\\Settings\\Admin\\Overview' => $baseDir . '/lib/private/Settings/Admin/Overview.php',
-    'OC\\Settings\\Admin\\Security' => $baseDir . '/lib/private/Settings/Admin/Security.php',
-    'OC\\Settings\\Admin\\Server' => $baseDir . '/lib/private/Settings/Admin/Server.php',
-    'OC\\Settings\\Admin\\Sharing' => $baseDir . '/lib/private/Settings/Admin/Sharing.php',
+    'OC\\Settings\\Admin\\Mail' => $baseDir . '/settings/Settings/Admin/Mail.php',
+    'OC\\Settings\\Admin\\Overview' => $baseDir . '/settings/Settings/Admin/Overview.php',
+    'OC\\Settings\\Admin\\Security' => $baseDir . '/settings/Settings/Admin/Security.php',
+    'OC\\Settings\\Admin\\Server' => $baseDir . '/settings/Settings/Admin/Server.php',
+    'OC\\Settings\\Admin\\Sharing' => $baseDir . '/settings/Settings/Admin/Sharing.php',
     'OC\\Settings\\Application' => $baseDir . '/settings/Application.php',
     'OC\\Settings\\BackgroundJobs\\VerifyUserData' => $baseDir . '/settings/BackgroundJobs/VerifyUserData.php',
     'OC\\Settings\\Controller\\AdminSettingsController' => $baseDir . '/settings/Controller/AdminSettingsController.php',
@@ -1130,10 +1130,10 @@ return array(
     'OC\\Settings\\Mailer\\NewUserMailHelper' => $baseDir . '/settings/Mailer/NewUserMailHelper.php',
     'OC\\Settings\\Manager' => $baseDir . '/lib/private/Settings/Manager.php',
     'OC\\Settings\\Middleware\\SubadminMiddleware' => $baseDir . '/settings/Middleware/SubadminMiddleware.php',
-    'OC\\Settings\\Personal\\Additional' => $baseDir . '/lib/private/Settings/Personal/Additional.php',
-    'OC\\Settings\\Personal\\PersonalInfo' => $baseDir . '/lib/private/Settings/Personal/PersonalInfo.php',
-    'OC\\Settings\\Personal\\Security' => $baseDir . '/lib/private/Settings/Personal/Security.php',
-    'OC\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/lib/private/Settings/Personal/ServerDevNotice.php',
+    'OC\\Settings\\Personal\\Additional' => $baseDir . '/settings/Settings/Personal/Additional.php',
+    'OC\\Settings\\Personal\\PersonalInfo' => $baseDir . '/settings/Settings/Personal/PersonalInfo.php',
+    'OC\\Settings\\Personal\\Security' => $baseDir . '/settings/Settings/Personal/Security.php',
+    'OC\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/settings/Settings/Personal/ServerDevNotice.php',
     'OC\\Settings\\Section' => $baseDir . '/lib/private/Settings/Section.php',
     'OC\\Setup' => $baseDir . '/lib/private/Setup.php',
     'OC\\Setup\\AbstractDatabase' => $baseDir . '/lib/private/Setup/AbstractDatabase.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2c01484d66..d1e0c4d020 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1137,11 +1137,11 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Settings\\Activity\\SecurityProvider' => __DIR__ . '/../../..' . '/settings/Activity/SecurityProvider.php',
         'OC\\Settings\\Activity\\SecuritySetting' => __DIR__ . '/../../..' . '/settings/Activity/SecuritySetting.php',
         'OC\\Settings\\Activity\\Setting' => __DIR__ . '/../../..' . '/settings/Activity/Setting.php',
-        'OC\\Settings\\Admin\\Mail' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Mail.php',
-        'OC\\Settings\\Admin\\Overview' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Overview.php',
-        'OC\\Settings\\Admin\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Security.php',
-        'OC\\Settings\\Admin\\Server' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Server.php',
-        'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Sharing.php',
+        'OC\\Settings\\Admin\\Mail' => __DIR__ . '/../../..' . '/settings/Settings/Admin/Mail.php',
+        'OC\\Settings\\Admin\\Overview' => __DIR__ . '/../../..' . '/settings/Settings/Admin/Overview.php',
+        'OC\\Settings\\Admin\\Security' => __DIR__ . '/../../..' . '/settings/Settings/Admin/Security.php',
+        'OC\\Settings\\Admin\\Server' => __DIR__ . '/../../..' . '/settings/Settings/Admin/Server.php',
+        'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/settings/Settings/Admin/Sharing.php',
         'OC\\Settings\\Application' => __DIR__ . '/../../..' . '/settings/Application.php',
         'OC\\Settings\\BackgroundJobs\\VerifyUserData' => __DIR__ . '/../../..' . '/settings/BackgroundJobs/VerifyUserData.php',
         'OC\\Settings\\Controller\\AdminSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/AdminSettingsController.php',
@@ -1160,10 +1160,10 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Settings\\Mailer\\NewUserMailHelper' => __DIR__ . '/../../..' . '/settings/Mailer/NewUserMailHelper.php',
         'OC\\Settings\\Manager' => __DIR__ . '/../../..' . '/lib/private/Settings/Manager.php',
         'OC\\Settings\\Middleware\\SubadminMiddleware' => __DIR__ . '/../../..' . '/settings/Middleware/SubadminMiddleware.php',
-        'OC\\Settings\\Personal\\Additional' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Additional.php',
-        'OC\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/PersonalInfo.php',
-        'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Security.php',
-        'OC\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/ServerDevNotice.php',
+        'OC\\Settings\\Personal\\Additional' => __DIR__ . '/../../..' . '/settings/Settings/Personal/Additional.php',
+        'OC\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/../../..' . '/settings/Settings/Personal/PersonalInfo.php',
+        'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/settings/Settings/Personal/Security.php',
+        'OC\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/../../..' . '/settings/Settings/Personal/ServerDevNotice.php',
         'OC\\Settings\\Section' => __DIR__ . '/../../..' . '/lib/private/Settings/Section.php',
         'OC\\Setup' => __DIR__ . '/../../..' . '/lib/private/Setup.php',
         'OC\\Setup\\AbstractDatabase' => __DIR__ . '/../../..' . '/lib/private/Setup/AbstractDatabase.php',
diff --git a/lib/private/Settings/Admin/Mail.php b/settings/Settings/Admin/Mail.php
similarity index 100%
rename from lib/private/Settings/Admin/Mail.php
rename to settings/Settings/Admin/Mail.php
diff --git a/lib/private/Settings/Admin/Overview.php b/settings/Settings/Admin/Overview.php
similarity index 100%
rename from lib/private/Settings/Admin/Overview.php
rename to settings/Settings/Admin/Overview.php
diff --git a/lib/private/Settings/Admin/Security.php b/settings/Settings/Admin/Security.php
similarity index 100%
rename from lib/private/Settings/Admin/Security.php
rename to settings/Settings/Admin/Security.php
diff --git a/lib/private/Settings/Admin/Server.php b/settings/Settings/Admin/Server.php
similarity index 100%
rename from lib/private/Settings/Admin/Server.php
rename to settings/Settings/Admin/Server.php
diff --git a/lib/private/Settings/Admin/Sharing.php b/settings/Settings/Admin/Sharing.php
similarity index 100%
rename from lib/private/Settings/Admin/Sharing.php
rename to settings/Settings/Admin/Sharing.php
diff --git a/lib/private/Settings/Personal/Additional.php b/settings/Settings/Personal/Additional.php
similarity index 100%
rename from lib/private/Settings/Personal/Additional.php
rename to settings/Settings/Personal/Additional.php
diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/settings/Settings/Personal/PersonalInfo.php
similarity index 100%
rename from lib/private/Settings/Personal/PersonalInfo.php
rename to settings/Settings/Personal/PersonalInfo.php
diff --git a/lib/private/Settings/Personal/Security.php b/settings/Settings/Personal/Security.php
similarity index 100%
rename from lib/private/Settings/Personal/Security.php
rename to settings/Settings/Personal/Security.php
diff --git a/lib/private/Settings/Personal/ServerDevNotice.php b/settings/Settings/Personal/ServerDevNotice.php
similarity index 100%
rename from lib/private/Settings/Personal/ServerDevNotice.php
rename to settings/Settings/Personal/ServerDevNotice.php