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 fb68a4c..6cbd213 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/tasks/task-manager.js' },
-        { name: 'TaskCommands', src: '/core/tasks/task-commands.js' },
-        { name: 'TaskActions', src: '/core/tasks/task-actions.js' },
-        { name: 'TaskRouter', src: '/core/tasks/task-router.js' },
+        { name: 'TaskManager', src: '/core/tasks/js/task-manager.js' },
+        { name: 'TaskCommands', src: '/core/tasks/js/task-commands.js' },
+        { name: 'TaskActions', src: '/core/tasks/js/task-actions.js' },
+        { name: 'TaskRouter', src: '/core/tasks/js/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 9158c78..4d15482 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/backup-card/backup-app-card.js',
+    '/core/backup-card/js/backup-app-card.js',
   ],
 
   async mount(ctx) {
diff --git a/containers/libreportal/frontend/core/app-meta/app-helpers.js b/containers/libreportal/frontend/core/app-meta/js/app-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/app-meta/app-helpers.js
rename to containers/libreportal/frontend/core/app-meta/js/app-helpers.js
diff --git a/containers/libreportal/frontend/core/backup-card/backup-app-card.js b/containers/libreportal/frontend/core/backup-card/js/backup-app-card.js
similarity index 100%
rename from containers/libreportal/frontend/core/backup-card/backup-app-card.js
rename to containers/libreportal/frontend/core/backup-card/js/backup-app-card.js
diff --git a/containers/libreportal/frontend/core/boot/auth/login.css b/containers/libreportal/frontend/core/boot/auth/css/login.css
similarity index 100%
rename from containers/libreportal/frontend/core/boot/auth/login.css
rename to containers/libreportal/frontend/core/boot/auth/css/login.css
diff --git a/containers/libreportal/frontend/core/boot/auth/auth-manager.js b/containers/libreportal/frontend/core/boot/auth/js/auth-manager.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/auth/auth-manager.js
rename to containers/libreportal/frontend/core/boot/auth/js/auth-manager.js
diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/js/system-loader.js
similarity index 98%
rename from containers/libreportal/frontend/core/boot/system-loader.js
rename to containers/libreportal/frontend/core/boot/js/system-loader.js
index e1a224c..bb740b6 100755
--- a/containers/libreportal/frontend/core/boot/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/js/system-loader.js
@@ -39,8 +39,8 @@ class SystemLoader {
       global: 'configManager',
       dependencies: ['data'],
       scripts: [
-        '/core/config/options.js',
-        '/core/config/field-factory.js',
+        '/core/config/js/options.js',
+        '/core/config/js/field-factory.js',
         '/components/admin/config/js/config-validator.js',
         '/components/admin/config/js/toggle-manager.js',
         '/components/admin/config/js/config-core.js',
@@ -69,9 +69,9 @@ class SystemLoader {
       global: null,
       dependencies: [],
       scripts: [
-        '/core/topbar/topbar.js',
-        '/core/update-notifier/update-notifier.js',
-        '/core/topbar/mobile-menu.js'
+        '/core/topbar/js/topbar.js',
+        '/core/update-notifier/js/update-notifier.js',
+        '/core/topbar/js/mobile-menu.js'
       ]
     });
     
@@ -89,7 +89,7 @@ class SystemLoader {
       },
       global: null,
       dependencies: [],
-      script: '/core/overlays/confirmation-dialog.js'
+      script: '/core/overlays/js/confirmation-dialog.js'
     });
 
     // Notifications
@@ -106,7 +106,7 @@ class SystemLoader {
       },
       global: 'notificationSystem',
       dependencies: [],
-      script: '/core/notifications/notifications.js'
+      script: '/core/notifications/js/notifications.js'
     });
     
     // Dashboard
@@ -162,12 +162,12 @@ class SystemLoader {
       global: 'tasksManager',
       dependencies: [],
       scripts: [
-        '/core/tasks/task-event-bus.js',
-        '/core/tasks/task-commands.js',
-        '/core/tasks/task-actions.js',
-        '/core/tasks/task-router.js',
-        '/core/tasks/task-manager.js',
-        '/core/tasks/task-parameter-preserve.js',
+        '/core/tasks/js/task-event-bus.js',
+        '/core/tasks/js/task-commands.js',
+        '/core/tasks/js/task-actions.js',
+        '/core/tasks/js/task-router.js',
+        '/core/tasks/js/task-manager.js',
+        '/core/tasks/js/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',
@@ -208,8 +208,8 @@ class SystemLoader {
       dependencies: ['data'],
       scripts: [
         '/components/apps/port-manager/js/port-manager.js',
-        '/core/tasks/task-manager.js',  // Add TaskManager for backup functionality
-        '/core/backup-card/backup-app-card.js',
+        '/core/tasks/js/task-manager.js',  // Add TaskManager for backup functionality
+        '/core/backup-card/js/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/system-orchestrator.js b/containers/libreportal/frontend/core/boot/js/system-orchestrator.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/system-orchestrator.js
rename to containers/libreportal/frontend/core/boot/js/system-orchestrator.js
diff --git a/containers/libreportal/frontend/core/config/field-factory.js b/containers/libreportal/frontend/core/config/js/field-factory.js
similarity index 100%
rename from containers/libreportal/frontend/core/config/field-factory.js
rename to containers/libreportal/frontend/core/config/js/field-factory.js
diff --git a/containers/libreportal/frontend/core/config/options.js b/containers/libreportal/frontend/core/config/js/options.js
similarity index 100%
rename from containers/libreportal/frontend/core/config/options.js
rename to containers/libreportal/frontend/core/config/js/options.js
diff --git a/containers/libreportal/frontend/core/data-loader/data-loader.js b/containers/libreportal/frontend/core/data-loader/js/data-loader.js
similarity index 100%
rename from containers/libreportal/frontend/core/data-loader/data-loader.js
rename to containers/libreportal/frontend/core/data-loader/js/data-loader.js
diff --git a/containers/libreportal/frontend/core/dom/dom-helpers.js b/containers/libreportal/frontend/core/dom/js/dom-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/dom/dom-helpers.js
rename to containers/libreportal/frontend/core/dom/js/dom-helpers.js
diff --git a/containers/libreportal/frontend/core/forms/controls/custom-number.js b/containers/libreportal/frontend/core/forms/controls/js/custom-number.js
similarity index 100%
rename from containers/libreportal/frontend/core/forms/controls/custom-number.js
rename to containers/libreportal/frontend/core/forms/controls/js/custom-number.js
diff --git a/containers/libreportal/frontend/core/forms/controls/custom-select.js b/containers/libreportal/frontend/core/forms/controls/js/custom-select.js
similarity index 100%
rename from containers/libreportal/frontend/core/forms/controls/custom-select.js
rename to containers/libreportal/frontend/core/forms/controls/js/custom-select.js
diff --git a/containers/libreportal/frontend/core/forms/config.css b/containers/libreportal/frontend/core/forms/css/config.css
similarity index 100%
rename from containers/libreportal/frontend/core/forms/config.css
rename to containers/libreportal/frontend/core/forms/css/config.css
diff --git a/containers/libreportal/frontend/core/forms/forms.css b/containers/libreportal/frontend/core/forms/css/forms.css
similarity index 100%
rename from containers/libreportal/frontend/core/forms/forms.css
rename to containers/libreportal/frontend/core/forms/css/forms.css
diff --git a/containers/libreportal/frontend/core/kernel/feature-registry.js b/containers/libreportal/frontend/core/kernel/js/feature-registry.js
similarity index 100%
rename from containers/libreportal/frontend/core/kernel/feature-registry.js
rename to containers/libreportal/frontend/core/kernel/js/feature-registry.js
diff --git a/containers/libreportal/frontend/core/kernel/lifecycle.js b/containers/libreportal/frontend/core/kernel/js/lifecycle.js
similarity index 100%
rename from containers/libreportal/frontend/core/kernel/lifecycle.js
rename to containers/libreportal/frontend/core/kernel/js/lifecycle.js
diff --git a/containers/libreportal/frontend/core/kernel/services.js b/containers/libreportal/frontend/core/kernel/js/services.js
similarity index 100%
rename from containers/libreportal/frontend/core/kernel/services.js
rename to containers/libreportal/frontend/core/kernel/js/services.js
diff --git a/containers/libreportal/frontend/core/kernel/spa.js b/containers/libreportal/frontend/core/kernel/js/spa.js
similarity index 99%
rename from containers/libreportal/frontend/core/kernel/spa.js
rename to containers/libreportal/frontend/core/kernel/js/spa.js
index 1319488..e1db4f0 100755
--- a/containers/libreportal/frontend/core/kernel/spa.js
+++ b/containers/libreportal/frontend/core/kernel/js/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/backup-card/backup-app-card.js')
+        this.loadScript('/core/backup-card/js/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/live/live-system.js b/containers/libreportal/frontend/core/live/js/live-system.js
similarity index 100%
rename from containers/libreportal/frontend/core/live/live-system.js
rename to containers/libreportal/frontend/core/live/js/live-system.js
diff --git a/containers/libreportal/frontend/core/loading/loading-screen.css b/containers/libreportal/frontend/core/loading/css/loading-screen.css
similarity index 100%
rename from containers/libreportal/frontend/core/loading/loading-screen.css
rename to containers/libreportal/frontend/core/loading/css/loading-screen.css
diff --git a/containers/libreportal/frontend/core/loading/loading-ui.js b/containers/libreportal/frontend/core/loading/js/loading-ui.js
similarity index 100%
rename from containers/libreportal/frontend/core/loading/loading-ui.js
rename to containers/libreportal/frontend/core/loading/js/loading-ui.js
diff --git a/containers/libreportal/frontend/core/notifications/notifications.js b/containers/libreportal/frontend/core/notifications/js/notifications.js
similarity index 100%
rename from containers/libreportal/frontend/core/notifications/notifications.js
rename to containers/libreportal/frontend/core/notifications/js/notifications.js
diff --git a/containers/libreportal/frontend/core/overlays/modal.css b/containers/libreportal/frontend/core/overlays/css/modal.css
similarity index 100%
rename from containers/libreportal/frontend/core/overlays/modal.css
rename to containers/libreportal/frontend/core/overlays/css/modal.css
diff --git a/containers/libreportal/frontend/core/overlays/confirmation-dialog.js b/containers/libreportal/frontend/core/overlays/js/confirmation-dialog.js
similarity index 100%
rename from containers/libreportal/frontend/core/overlays/confirmation-dialog.js
rename to containers/libreportal/frontend/core/overlays/js/confirmation-dialog.js
diff --git a/containers/libreportal/frontend/core/overlays/eo-modal.js b/containers/libreportal/frontend/core/overlays/js/eo-modal.js
similarity index 100%
rename from containers/libreportal/frontend/core/overlays/eo-modal.js
rename to containers/libreportal/frontend/core/overlays/js/eo-modal.js
diff --git a/containers/libreportal/frontend/core/setup/setup-wizard.css b/containers/libreportal/frontend/core/setup/css/setup-wizard.css
similarity index 100%
rename from containers/libreportal/frontend/core/setup/setup-wizard.css
rename to containers/libreportal/frontend/core/setup/css/setup-wizard.css
diff --git a/containers/libreportal/frontend/core/setup/setup-completion-watcher.js b/containers/libreportal/frontend/core/setup/js/setup-completion-watcher.js
similarity index 100%
rename from containers/libreportal/frontend/core/setup/setup-completion-watcher.js
rename to containers/libreportal/frontend/core/setup/js/setup-completion-watcher.js
diff --git a/containers/libreportal/frontend/core/setup/setup-detector.js b/containers/libreportal/frontend/core/setup/js/setup-detector.js
similarity index 100%
rename from containers/libreportal/frontend/core/setup/setup-detector.js
rename to containers/libreportal/frontend/core/setup/js/setup-detector.js
diff --git a/containers/libreportal/frontend/core/setup/setup-wizard.js b/containers/libreportal/frontend/core/setup/js/setup-wizard.js
similarity index 100%
rename from containers/libreportal/frontend/core/setup/setup-wizard.js
rename to containers/libreportal/frontend/core/setup/js/setup-wizard.js
diff --git a/containers/libreportal/frontend/core/tasks/task-actions.js b/containers/libreportal/frontend/core/tasks/js/task-actions.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-actions.js
rename to containers/libreportal/frontend/core/tasks/js/task-actions.js
diff --git a/containers/libreportal/frontend/core/tasks/task-commands.js b/containers/libreportal/frontend/core/tasks/js/task-commands.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-commands.js
rename to containers/libreportal/frontend/core/tasks/js/task-commands.js
diff --git a/containers/libreportal/frontend/core/tasks/task-event-bus.js b/containers/libreportal/frontend/core/tasks/js/task-event-bus.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-event-bus.js
rename to containers/libreportal/frontend/core/tasks/js/task-event-bus.js
diff --git a/containers/libreportal/frontend/core/tasks/task-manager.js b/containers/libreportal/frontend/core/tasks/js/task-manager.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-manager.js
rename to containers/libreportal/frontend/core/tasks/js/task-manager.js
diff --git a/containers/libreportal/frontend/core/tasks/task-parameter-preserve.js b/containers/libreportal/frontend/core/tasks/js/task-parameter-preserve.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-parameter-preserve.js
rename to containers/libreportal/frontend/core/tasks/js/task-parameter-preserve.js
diff --git a/containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js b/containers/libreportal/frontend/core/tasks/js/task-refresh-coordinator.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js
rename to containers/libreportal/frontend/core/tasks/js/task-refresh-coordinator.js
diff --git a/containers/libreportal/frontend/core/tasks/task-router.js b/containers/libreportal/frontend/core/tasks/js/task-router.js
similarity index 100%
rename from containers/libreportal/frontend/core/tasks/task-router.js
rename to containers/libreportal/frontend/core/tasks/js/task-router.js
diff --git a/containers/libreportal/frontend/core/theme/aurora-background.css b/containers/libreportal/frontend/core/theme/css/aurora-background.css
similarity index 100%
rename from containers/libreportal/frontend/core/theme/aurora-background.css
rename to containers/libreportal/frontend/core/theme/css/aurora-background.css
diff --git a/containers/libreportal/frontend/core/theme/base.css b/containers/libreportal/frontend/core/theme/css/base.css
similarity index 100%
rename from containers/libreportal/frontend/core/theme/base.css
rename to containers/libreportal/frontend/core/theme/css/base.css
diff --git a/containers/libreportal/frontend/core/theme/themes.css b/containers/libreportal/frontend/core/theme/css/themes.css
similarity index 100%
rename from containers/libreportal/frontend/core/theme/themes.css
rename to containers/libreportal/frontend/core/theme/css/themes.css
diff --git a/containers/libreportal/frontend/core/theme/tokens.css b/containers/libreportal/frontend/core/theme/css/tokens.css
similarity index 100%
rename from containers/libreportal/frontend/core/theme/tokens.css
rename to containers/libreportal/frontend/core/theme/css/tokens.css
diff --git a/containers/libreportal/frontend/core/theme/theme-registry.js b/containers/libreportal/frontend/core/theme/js/theme-registry.js
similarity index 100%
rename from containers/libreportal/frontend/core/theme/theme-registry.js
rename to containers/libreportal/frontend/core/theme/js/theme-registry.js
diff --git a/containers/libreportal/frontend/core/topbar/sidebar.css b/containers/libreportal/frontend/core/topbar/css/sidebar.css
similarity index 100%
rename from containers/libreportal/frontend/core/topbar/sidebar.css
rename to containers/libreportal/frontend/core/topbar/css/sidebar.css
diff --git a/containers/libreportal/frontend/core/topbar/topbar.css b/containers/libreportal/frontend/core/topbar/css/topbar.css
similarity index 100%
rename from containers/libreportal/frontend/core/topbar/topbar.css
rename to containers/libreportal/frontend/core/topbar/css/topbar.css
diff --git a/containers/libreportal/frontend/core/topbar/topbar.html b/containers/libreportal/frontend/core/topbar/html/topbar.html
similarity index 99%
rename from containers/libreportal/frontend/core/topbar/topbar.html
rename to containers/libreportal/frontend/core/topbar/html/topbar.html
index efc3e30..620eacb 100755
--- a/containers/libreportal/frontend/core/topbar/topbar.html
+++ b/containers/libreportal/frontend/core/topbar/html/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 /core/theme/theme-registry.js -->
+        <!-- Options populated by ThemeRegistry — see /core/theme/js/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/core/topbar/mobile-menu.js b/containers/libreportal/frontend/core/topbar/js/mobile-menu.js
similarity index 100%
rename from containers/libreportal/frontend/core/topbar/mobile-menu.js
rename to containers/libreportal/frontend/core/topbar/js/mobile-menu.js
diff --git a/containers/libreportal/frontend/core/topbar/topbar.js b/containers/libreportal/frontend/core/topbar/js/topbar.js
similarity index 99%
rename from containers/libreportal/frontend/core/topbar/topbar.js
rename to containers/libreportal/frontend/core/topbar/js/topbar.js
index be5fc40..26bd3a3 100755
--- a/containers/libreportal/frontend/core/topbar/topbar.js
+++ b/containers/libreportal/frontend/core/topbar/js/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/topbar/topbar.html');
+      const response = await fetch('/core/topbar/html/topbar.html');
       if (!response.ok) {
         throw new Error(`Failed to load topbar: ${response.status}`);
       }
diff --git a/containers/libreportal/frontend/core/ui-mode/lp-ui.js b/containers/libreportal/frontend/core/ui-mode/js/lp-ui.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui-mode/lp-ui.js
rename to containers/libreportal/frontend/core/ui-mode/js/lp-ui.js
diff --git a/containers/libreportal/frontend/core/ui-state/dismissible.js b/containers/libreportal/frontend/core/ui-state/js/dismissible.js
similarity index 100%
rename from containers/libreportal/frontend/core/ui-state/dismissible.js
rename to containers/libreportal/frontend/core/ui-state/js/dismissible.js
diff --git a/containers/libreportal/frontend/core/update-notifier/update-notifier.css b/containers/libreportal/frontend/core/update-notifier/css/update-notifier.css
similarity index 100%
rename from containers/libreportal/frontend/core/update-notifier/update-notifier.css
rename to containers/libreportal/frontend/core/update-notifier/css/update-notifier.css
diff --git a/containers/libreportal/frontend/core/update-notifier/update-notifier.js b/containers/libreportal/frontend/core/update-notifier/js/update-notifier.js
similarity index 100%
rename from containers/libreportal/frontend/core/update-notifier/update-notifier.js
rename to containers/libreportal/frontend/core/update-notifier/js/update-notifier.js
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 7c4c1ec..83257bb 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -11,33 +11,33 @@
 
   <!-- Styles -->
   <!-- Base token layer (theme-agnostic): --font-mono, --page-* identity hues -->
-  <link rel="stylesheet" href="/core/theme/tokens.css">
-  <link rel="stylesheet" href="/core/theme/themes.css">
-  <link rel="stylesheet" href="/core/loading/loading-screen.css">
-  <link rel="stylesheet" href="/core/setup/setup-wizard.css">
-  <link rel="stylesheet" href="/core/theme/base.css">
+  <link rel="stylesheet" href="/core/theme/css/tokens.css">
+  <link rel="stylesheet" href="/core/theme/css/themes.css">
+  <link rel="stylesheet" href="/core/loading/css/loading-screen.css">
+  <link rel="stylesheet" href="/core/setup/css/setup-wizard.css">
+  <link rel="stylesheet" href="/core/theme/css/base.css">
   <link rel="stylesheet" href="/components/admin/config/css/ip-whitelist.css">
   <link rel="stylesheet" href="/components/apps/port-manager/css/port-manager.css">
   <link rel="stylesheet" href="/components/backup/core/css/backup.css">
   <link rel="stylesheet" href="/components/admin/ssh/css/ssh.css">
   <link rel="stylesheet" href="/components/admin/core/css/admin.css">
   <link rel="stylesheet" href="/components/apps/services/css/services.css">
-  <link rel="stylesheet" href="/core/overlays/modal.css">
+  <link rel="stylesheet" href="/core/overlays/css/modal.css">
   <link rel="stylesheet" href="/components/apps/tools/css/tools.css">
   <link rel="stylesheet" href="/components/apps/routing/css/routing.css">
-  <link rel="stylesheet" href="/core/boot/auth/login.css">
-  <link rel="stylesheet" href="/core/theme/aurora-background.css">
-  <link rel="stylesheet" href="/core/topbar/topbar.css">
-  <link rel="stylesheet" href="/core/topbar/sidebar.css">
+  <link rel="stylesheet" href="/core/boot/auth/css/login.css">
+  <link rel="stylesheet" href="/core/theme/css/aurora-background.css">
+  <link rel="stylesheet" href="/core/topbar/css/topbar.css">
+  <link rel="stylesheet" href="/core/topbar/css/sidebar.css">
   <link rel="stylesheet" href="/components/apps/core/css/apps-layout.css">
   <link rel="stylesheet" href="/components/apps/core/css/apps.css">
-  <link rel="stylesheet" href="/core/forms/forms.css">
-  <link rel="stylesheet" href="/core/forms/config.css">
+  <link rel="stylesheet" href="/core/forms/css/forms.css">
+  <link rel="stylesheet" href="/core/forms/css/config.css">
   <link rel="stylesheet" href="/components/apps/core/css/service-buttons.css">
   <link rel="stylesheet" href="/components/dashboard/css/dashboard.css">
   <link rel="stylesheet" href="/components/tasks/css/tasks.css">
   <link rel="stylesheet" href="/components/updater/css/updater.css">
-  <link rel="stylesheet" href="/core/update-notifier/update-notifier.css">
+  <link rel="stylesheet" href="/core/update-notifier/css/update-notifier.css">
   <script>
     // Inline data-theme bootstrap — runs before any rendering so the right
     // palette tokens resolve on first paint. Synchronously injects a
@@ -66,9 +66,9 @@
       );
     })();
   </script>
-  <script src="/core/theme/theme-registry.js"></script>
-  <script src="/core/forms/controls/custom-select.js"></script>
-  <script src="/core/forms/controls/custom-number.js"></script>
+  <script src="/core/theme/js/theme-registry.js"></script>
+  <script src="/core/forms/controls/js/custom-select.js"></script>
+  <script src="/core/forms/controls/js/custom-number.js"></script>
 </head>
 <body>
   <!-- Topbar Container -->
@@ -85,31 +85,31 @@
 
   <!-- Scripts -->
   <!-- Auth must load first — gates all other initialization -->
-  <script src="/core/boot/auth/auth-manager.js"></script>
+  <script src="/core/boot/auth/js/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. -->
-  <script src="/core/ui-mode/lp-ui.js"></script>
-  <script src="/core/dom/dom-helpers.js"></script>
-  <script src="/core/app-meta/app-helpers.js"></script>
-  <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/overlays/eo-modal.js"></script>
-  <script src="/core/tasks/task-refresh-coordinator.js"></script>
+  <script src="/core/ui-mode/js/lp-ui.js"></script>
+  <script src="/core/dom/js/dom-helpers.js"></script>
+  <script src="/core/app-meta/js/app-helpers.js"></script>
+  <script src="/core/data-loader/js/data-loader.js"></script>
+  <script src="/core/live/js/live-system.js"></script>
+  <script src="/core/ui-state/js/dismissible.js"></script>
+  <script src="/core/overlays/js/eo-modal.js"></script>
+  <script src="/core/tasks/js/task-refresh-coordinator.js"></script>
   <script src="/components/dashboard/js/dashboard.js"></script>
-  <script src="/core/boot/system-loader.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>
+  <script src="/core/boot/js/system-loader.js"></script>
+  <script src="/core/loading/js/loading-ui.js"></script>
+  <script src="/core/setup/js/setup-detector.js"></script>
+  <script src="/core/setup/js/setup-wizard.js"></script>
+  <script src="/core/setup/js/setup-completion-watcher.js"></script>
+  <script src="/core/boot/js/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
        docs/frontend-modularization.md. -->
-  <script src="/core/kernel/feature-registry.js"></script>
-  <script src="/core/kernel/services.js"></script>
-  <script src="/core/kernel/lifecycle.js"></script>
+  <script src="/core/kernel/js/feature-registry.js"></script>
+  <script src="/core/kernel/js/services.js"></script>
+  <script src="/core/kernel/js/lifecycle.js"></script>
   <!-- Component (page) modules are NOT listed here: the kernel loads each one's
        self-registering index.js from the manifest (components/manifest.dev.json)
        before routing. Adding a page = drop a components/<id>/ folder + a manifest
@@ -122,6 +122,6 @@
     land on. Each handler's loadScript() call is idempotent — subsequent
     navigations to the same route are free.
   -->
-  <script src="/core/kernel/spa.js"></script>
+  <script src="/core/kernel/js/spa.js"></script>
 </body>
 </html>