diff --git a/containers/libreportal/frontend/components/backup/index.js b/containers/libreportal/frontend/components/backup/index.js
index f3f8049..9158c78 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/ui/backup-app-card.js',
+    '/core/backup-card/backup-app-card.js',
   ],
 
   async mount(ctx) {
diff --git a/containers/libreportal/frontend/core/ui/backup-app-card.js b/containers/libreportal/frontend/core/backup-card/backup-app-card.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/backup-app-card.js
rename to containers/libreportal/frontend/core/backup-card/backup-app-card.js
diff --git a/containers/libreportal/frontend/core/boot/auth-manager.js b/containers/libreportal/frontend/core/boot/auth/auth-manager.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/auth-manager.js
rename to containers/libreportal/frontend/core/boot/auth/auth-manager.js
diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js
index 69bbbb7..e1a224c 100755
--- a/containers/libreportal/frontend/core/boot/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/system-loader.js
@@ -69,9 +69,9 @@ class SystemLoader {
       global: null,
       dependencies: [],
       scripts: [
-        '/core/ui/topbar.js',
-        '/core/ui/update-notifier.js',
-        '/core/ui/mobile-menu.js'
+        '/core/topbar/topbar.js',
+        '/core/update-notifier/update-notifier.js',
+        '/core/topbar/mobile-menu.js'
       ]
     });
     
@@ -89,7 +89,7 @@ class SystemLoader {
       },
       global: null,
       dependencies: [],
-      script: '/core/ui/confirmation-dialog.js'
+      script: '/core/overlays/confirmation-dialog.js'
     });
 
     // Notifications
@@ -106,7 +106,7 @@ class SystemLoader {
       },
       global: 'notificationSystem',
       dependencies: [],
-      script: '/core/ui/notifications.js'
+      script: '/core/notifications/notifications.js'
     });
     
     // Dashboard
@@ -209,7 +209,7 @@ class SystemLoader {
       scripts: [
         '/components/apps/port-manager/js/port-manager.js',
         '/core/tasks/task-manager.js',  // Add TaskManager for backup functionality
-        '/core/ui/backup-app-card.js',
+        '/core/backup-card/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/boot/controls/custom-number.js b/containers/libreportal/frontend/core/forms/controls/custom-number.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/controls/custom-number.js
rename to containers/libreportal/frontend/core/forms/controls/custom-number.js
diff --git a/containers/libreportal/frontend/core/boot/controls/custom-select.js b/containers/libreportal/frontend/core/forms/controls/custom-select.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/controls/custom-select.js
rename to containers/libreportal/frontend/core/forms/controls/custom-select.js
diff --git a/containers/libreportal/frontend/core/kernel/spa.js b/containers/libreportal/frontend/core/kernel/spa.js
index 76ed334..1319488 100755
--- a/containers/libreportal/frontend/core/kernel/spa.js
+++ b/containers/libreportal/frontend/core/kernel/spa.js
@@ -369,7 +369,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/ui/backup-app-card.js')
+        this.loadScript('/core/backup-card/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/boot/loading-ui.js b/containers/libreportal/frontend/core/loading/loading-ui.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/loading-ui.js
rename to containers/libreportal/frontend/core/loading/loading-ui.js
diff --git a/containers/libreportal/frontend/core/ui/notifications.js b/containers/libreportal/frontend/core/notifications/notifications.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/notifications.js
rename to containers/libreportal/frontend/core/notifications/notifications.js
diff --git a/containers/libreportal/frontend/core/ui/confirmation-dialog.js b/containers/libreportal/frontend/core/overlays/confirmation-dialog.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/confirmation-dialog.js
rename to containers/libreportal/frontend/core/overlays/confirmation-dialog.js
diff --git a/containers/libreportal/frontend/core/ui/eo-modal.js b/containers/libreportal/frontend/core/overlays/eo-modal.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/eo-modal.js
rename to containers/libreportal/frontend/core/overlays/eo-modal.js
diff --git a/containers/libreportal/frontend/core/boot/setup/setup-completion-watcher.js b/containers/libreportal/frontend/core/setup/setup-completion-watcher.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup/setup-completion-watcher.js
rename to containers/libreportal/frontend/core/setup/setup-completion-watcher.js
diff --git a/containers/libreportal/frontend/core/boot/setup/setup-detector.js b/containers/libreportal/frontend/core/setup/setup-detector.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup/setup-detector.js
rename to containers/libreportal/frontend/core/setup/setup-detector.js
diff --git a/containers/libreportal/frontend/core/boot/setup/setup-wizard.js b/containers/libreportal/frontend/core/setup/setup-wizard.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/setup/setup-wizard.js
rename to containers/libreportal/frontend/core/setup/setup-wizard.js
diff --git a/containers/libreportal/frontend/core/ui/mobile-menu.js b/containers/libreportal/frontend/core/topbar/mobile-menu.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/mobile-menu.js
rename to containers/libreportal/frontend/core/topbar/mobile-menu.js
diff --git a/containers/libreportal/frontend/core/ui/topbar.html b/containers/libreportal/frontend/core/topbar/topbar.html
similarity index 100%
rename from containers/libreportal/frontend/core/ui/topbar.html
rename to containers/libreportal/frontend/core/topbar/topbar.html
diff --git a/containers/libreportal/frontend/core/ui/topbar.js b/containers/libreportal/frontend/core/topbar/topbar.js
similarity index 99%
rename from containers/libreportal/frontend/core/ui/topbar.js
rename to containers/libreportal/frontend/core/topbar/topbar.js
index 91150e0..be5fc40 100755
--- a/containers/libreportal/frontend/core/ui/topbar.js
+++ b/containers/libreportal/frontend/core/topbar/topbar.js
@@ -50,7 +50,7 @@ class TopbarComponent {
     // Load fresh topbar HTML
     try {
       //// // console.log('Loading topbar HTML (SPA mode)');
-      const response = await fetch('/core/ui/topbar.html');
+      const response = await fetch('/core/topbar/topbar.html');
       if (!response.ok) {
         throw new Error(`Failed to load topbar: ${response.status}`);
       }
diff --git a/containers/libreportal/frontend/core/ui/update-notifier.js b/containers/libreportal/frontend/core/update-notifier/update-notifier.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui/update-notifier.js
rename to containers/libreportal/frontend/core/update-notifier/update-notifier.js
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 808610e..7c4c1ec 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -67,8 +67,8 @@
     })();
   </script>
   <script src="/core/theme/theme-registry.js"></script>
-  <script src="/core/boot/controls/custom-select.js"></script>
-  <script src="/core/boot/controls/custom-number.js"></script>
+  <script src="/core/forms/controls/custom-select.js"></script>
+  <script src="/core/forms/controls/custom-number.js"></script>
 </head>
 <body>
   <!-- Topbar Container -->
@@ -85,7 +85,7 @@
 
   <!-- Scripts -->
   <!-- Auth must load first — gates all other initialization -->
-  <script src="/core/boot/auth-manager.js"></script>
+  <script src="/core/boot/auth/auth-manager.js"></script>
   <!-- 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. -->
@@ -95,14 +95,14 @@
   <script src="/core/data-loader/data-loader.js"></script>
   <script src="/core/live/live-system.js"></script>
   <script src="/core/ui-state/dismissible.js"></script>
-  <script src="/core/ui/eo-modal.js"></script>
+  <script src="/core/overlays/eo-modal.js"></script>
   <script src="/core/tasks/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/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/loading/loading-ui.js"></script>
+  <script src="/core/setup/setup-detector.js"></script>
+  <script src="/core/setup/setup-wizard.js"></script>
+  <script src="/core/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