diff --git a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
index 4b33e7c..4e82237 100755
--- a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
+++ b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
@@ -1287,10 +1287,10 @@ class AppsManager {
       
       // Only load scripts if they're not already loaded
       const scripts = [
-        { name: 'TaskManager', src: '/core/lib/task-manager.js' },
-        { name: 'TaskCommands', src: '/core/lib/task-commands.js' },
-        { name: 'TaskActions', src: '/core/lib/task-actions.js' },
-        { name: 'TaskRouter', src: '/core/lib/task-router.js' },
+        { name: 'TaskManager', src: '/core/lib/task/task-manager.js' },
+        { name: 'TaskCommands', src: '/core/lib/task/task-commands.js' },
+        { name: 'TaskActions', src: '/core/lib/task/task-actions.js' },
+        { name: 'TaskRouter', src: '/core/lib/task/task-router.js' },
         { name: 'TasksManager', src: '/components/tasks/js/tasks-manager.js' }
       ];
       
diff --git a/containers/libreportal/frontend/components/backup/index.js b/containers/libreportal/frontend/components/backup/index.js
index dcc0a50..f3f8049 100644
--- a/containers/libreportal/frontend/components/backup/index.js
+++ b/containers/libreportal/frontend/components/backup/index.js
@@ -31,7 +31,7 @@ LP.features.register({
     '/components/backup/configuration/js/backup-configuration.js',
     '/components/backup/configuration/js/backup-retention-presets.js',
     '/components/backup/configuration/js/backup-engine-details.js',
-    '/core/lib/backup-app-card.js',
+    '/core/ui/backup-app-card.js',
   ],
 
   async mount(ctx) {
diff --git a/containers/libreportal/frontend/core/boot/custom-number.js b/containers/libreportal/frontend/core/boot/controls/custom-number.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/custom-number.js
rename to containers/libreportal/frontend/core/boot/controls/custom-number.js
diff --git a/containers/libreportal/frontend/core/boot/custom-select.js b/containers/libreportal/frontend/core/boot/controls/custom-select.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/custom-select.js
rename to containers/libreportal/frontend/core/boot/controls/custom-select.js
diff --git a/containers/libreportal/frontend/core/boot/setup-completion-watcher.js b/containers/libreportal/frontend/core/boot/setup/setup-completion-watcher.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup-completion-watcher.js
rename to containers/libreportal/frontend/core/boot/setup/setup-completion-watcher.js
diff --git a/containers/libreportal/frontend/core/boot/setup-detector.js b/containers/libreportal/frontend/core/boot/setup/setup-detector.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup-detector.js
rename to containers/libreportal/frontend/core/boot/setup/setup-detector.js
diff --git a/containers/libreportal/frontend/core/boot/setup-wizard.js b/containers/libreportal/frontend/core/boot/setup/setup-wizard.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup-wizard.js
rename to containers/libreportal/frontend/core/boot/setup/setup-wizard.js
diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js
index 32fbefc..b7c4968 100755
--- a/containers/libreportal/frontend/core/boot/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/system-loader.js
@@ -39,8 +39,8 @@ class SystemLoader {
       global: 'configManager',
       dependencies: ['data'],
       scripts: [
-        '/core/lib/config-options.js',
-        '/core/lib/config-shared.js',
+        '/core/lib/config/config-options.js',
+        '/core/lib/config/config-shared.js',
         '/components/admin/config/js/config-validator.js',
         '/components/admin/config/js/toggle-manager.js',
         '/components/admin/config/js/config-core.js',
@@ -167,13 +167,13 @@ class SystemLoader {
       global: 'tasksManager',
       dependencies: [],
       scripts: [
-        '/core/lib/task-event-bus.js',
-        '/core/lib/task-commands.js',
-        '/core/lib/task-actions.js',
-        '/core/lib/task-router.js',
-        '/core/lib/task-global-functions.js',
-        '/core/lib/task-manager.js',
-        '/core/lib/task-parameter-preserve.js',
+        '/core/lib/task/task-event-bus.js',
+        '/core/lib/task/task-commands.js',
+        '/core/lib/task/task-actions.js',
+        '/core/lib/task/task-router.js',
+        '/core/lib/task/task-global-functions.js',
+        '/core/lib/task/task-manager.js',
+        '/core/lib/task/task-parameter-preserve.js',
         '/components/tasks/js/tasks-manager.js',          // base: class + constructor + init + bus wiring
         // prototype-augment clusters (load after base; ordered via async=false):
         '/components/tasks/js/tasks-format.js',
@@ -214,8 +214,8 @@ class SystemLoader {
       dependencies: ['data'],
       scripts: [
         '/components/apps/port-manager/js/port-manager.js',
-        '/core/lib/task-manager.js',  // Add TaskManager for backup functionality
-        '/core/lib/backup-app-card.js',
+        '/core/lib/task/task-manager.js',  // Add TaskManager for backup functionality
+        '/core/ui/backup-app-card.js',
         '/components/apps/services/js/services-manager.js',
         '/components/apps/tools/js/tools-manager.js',
         '/components/apps/routing/js/routing-manager.js',
diff --git a/containers/libreportal/frontend/core/kernel/spa.js b/containers/libreportal/frontend/core/kernel/spa.js
index a79d524..ae9fe04 100755
--- a/containers/libreportal/frontend/core/kernel/spa.js
+++ b/containers/libreportal/frontend/core/kernel/spa.js
@@ -371,7 +371,7 @@ class LibrePortalSPAClean {
       // loadScript is idempotent — subsequent /backup navigations are no-ops.
       await Promise.all([
         this.loadScript('/components/backup/core/js/backup-page.js'),
-        this.loadScript('/core/lib/backup-app-card.js')
+        this.loadScript('/core/ui/backup-app-card.js')
       ]);
       const html = await this.fetchContent('/components/backup/core/html/backup-content.html');
       this.loadContent(html, 'Backups');
diff --git a/containers/libreportal/frontend/core/lib/config-options.js b/containers/libreportal/frontend/core/lib/config/config-options.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/config-options.js
rename to containers/libreportal/frontend/core/lib/config/config-options.js
diff --git a/containers/libreportal/frontend/core/lib/config-shared.js b/containers/libreportal/frontend/core/lib/config/config-shared.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/config-shared.js
rename to containers/libreportal/frontend/core/lib/config/config-shared.js
diff --git a/containers/libreportal/frontend/core/lib/task-actions.js b/containers/libreportal/frontend/core/lib/task/task-actions.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-actions.js
rename to containers/libreportal/frontend/core/lib/task/task-actions.js
diff --git a/containers/libreportal/frontend/core/lib/task-commands.js b/containers/libreportal/frontend/core/lib/task/task-commands.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-commands.js
rename to containers/libreportal/frontend/core/lib/task/task-commands.js
diff --git a/containers/libreportal/frontend/core/lib/task-event-bus.js b/containers/libreportal/frontend/core/lib/task/task-event-bus.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-event-bus.js
rename to containers/libreportal/frontend/core/lib/task/task-event-bus.js
diff --git a/containers/libreportal/frontend/core/lib/task-global-functions.js b/containers/libreportal/frontend/core/lib/task/task-global-functions.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-global-functions.js
rename to containers/libreportal/frontend/core/lib/task/task-global-functions.js
diff --git a/containers/libreportal/frontend/core/lib/task-manager.js b/containers/libreportal/frontend/core/lib/task/task-manager.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-manager.js
rename to containers/libreportal/frontend/core/lib/task/task-manager.js
diff --git a/containers/libreportal/frontend/core/lib/task-parameter-preserve.js b/containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-parameter-preserve.js
rename to containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js
diff --git a/containers/libreportal/frontend/core/lib/task-refresh-coordinator.js b/containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-refresh-coordinator.js
rename to containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js
diff --git a/containers/libreportal/frontend/core/lib/task-router.js b/containers/libreportal/frontend/core/lib/task/task-router.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task-router.js
rename to containers/libreportal/frontend/core/lib/task/task-router.js
diff --git a/containers/libreportal/frontend/core/lib/data-loader.js b/containers/libreportal/frontend/core/lib/util/data-loader.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/data-loader.js
rename to containers/libreportal/frontend/core/lib/util/data-loader.js
diff --git a/containers/libreportal/frontend/core/lib/dismissible.js b/containers/libreportal/frontend/core/lib/util/dismissible.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/dismissible.js
rename to containers/libreportal/frontend/core/lib/util/dismissible.js
diff --git a/containers/libreportal/frontend/core/lib/dom-helpers.js b/containers/libreportal/frontend/core/lib/util/dom-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/dom-helpers.js
rename to containers/libreportal/frontend/core/lib/util/dom-helpers.js
diff --git a/containers/libreportal/frontend/core/lib/lp-ui.js b/containers/libreportal/frontend/core/lib/util/lp-ui.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/lp-ui.js
rename to containers/libreportal/frontend/core/lib/util/lp-ui.js
diff --git a/containers/libreportal/frontend/core/lib/router.js b/containers/libreportal/frontend/core/lib/util/router.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/router.js
rename to containers/libreportal/frontend/core/lib/util/router.js
diff --git a/containers/libreportal/frontend/core/lib/system-live.js b/containers/libreportal/frontend/core/lib/util/system-live.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/system-live.js
rename to containers/libreportal/frontend/core/lib/util/system-live.js
diff --git a/containers/libreportal/frontend/core/lib/ui-helpers.js b/containers/libreportal/frontend/core/lib/util/ui-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/ui-helpers.js
rename to containers/libreportal/frontend/core/lib/util/ui-helpers.js
diff --git a/containers/libreportal/frontend/core/lib/backup-app-card.js b/containers/libreportal/frontend/core/ui/backup-app-card.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/backup-app-card.js
rename to containers/libreportal/frontend/core/ui/backup-app-card.js
diff --git a/containers/libreportal/frontend/core/ui/topbar.html b/containers/libreportal/frontend/core/ui/topbar.html
index aa9add6..e817ebd 100755
--- a/containers/libreportal/frontend/core/ui/topbar.html
+++ b/containers/libreportal/frontend/core/ui/topbar.html
@@ -78,7 +78,7 @@
     <div class="mobile-drawer-page-section" id="mobile-drawer-page-section"></div>
     <div class="topbar-controls">
       <select id="theme-selector" class="theme-selector" aria-label="Theme">
-        <!-- Options populated by ThemeRegistry — see js/system/theme-registry.js -->
+        <!-- Options populated by ThemeRegistry — see /core/boot/theme-registry.js -->
       </select>
       <button class="donate-btn">Donate</button>
       <button class="logout-btn" id="logout-btn" title="Logout">
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 7d7b268..a3d0cfd 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -67,8 +67,8 @@
     })();
   </script>
   <script src="/core/boot/theme-registry.js"></script>
-  <script src="/core/boot/custom-select.js"></script>
-  <script src="/core/boot/custom-number.js"></script>
+  <script src="/core/boot/controls/custom-select.js"></script>
+  <script src="/core/boot/controls/custom-number.js"></script>
 </head>
 <body>
   <!-- Topbar Container -->
@@ -89,21 +89,21 @@
   <!-- Essential Bootstrap -->
   <!-- LpUi runs first so body.lp-ui--advanced / lp-ui--dev are set
        before any page/component renders → no FOUC of advanced sections. -->
-  <script src="/core/lib/lp-ui.js"></script>
-  <script src="/core/lib/dom-helpers.js"></script>
-  <script src="/core/lib/ui-helpers.js"></script>
-  <script src="/core/lib/router.js"></script>
-  <script src="/core/lib/data-loader.js"></script>
-  <script src="/core/lib/system-live.js"></script>
-  <script src="/core/lib/dismissible.js"></script>
+  <script src="/core/lib/util/lp-ui.js"></script>
+  <script src="/core/lib/util/dom-helpers.js"></script>
+  <script src="/core/lib/util/ui-helpers.js"></script>
+  <script src="/core/lib/util/router.js"></script>
+  <script src="/core/lib/util/data-loader.js"></script>
+  <script src="/core/lib/util/system-live.js"></script>
+  <script src="/core/lib/util/dismissible.js"></script>
   <script src="/core/ui/eo-modal.js"></script>
-  <script src="/core/lib/task-refresh-coordinator.js"></script>
+  <script src="/core/lib/task/task-refresh-coordinator.js"></script>
   <script src="/components/dashboard/js/dashboard.js"></script>
   <script src="/core/boot/system-loader.js"></script>
   <script src="/core/boot/loading-ui.js"></script>
-  <script src="/core/boot/setup-detector.js"></script>
-  <script src="/core/boot/setup-wizard.js"></script>
-  <script src="/core/boot/setup-completion-watcher.js"></script>
+  <script src="/core/boot/setup/setup-detector.js"></script>
+  <script src="/core/boot/setup/setup-wizard.js"></script>
+  <script src="/core/boot/setup/setup-completion-watcher.js"></script>
   <script src="/core/boot/system-orchestrator.js"></script>
   <!-- Feature-module kernel. Currently passive: defines window.LP.features and
        loads the page manifest; spa.js consults it for routing. See