From 2ef4cc00e1de52347a2033ef75170b06f5b213cd Mon Sep 17 00:00:00 2001
From: librelad <librelad@digitalangels.vip>
Date: Sat, 30 May 2026 12:42:35 +0100
Subject: [PATCH] refactor(webui): granular sub-system folders per component

De-clutter each component into sub-system folders (apps: core/ port-manager/
services/ tools/ routing/; admin: config/ overview/ system/ ssh/ peers/) with
the standard js/ css/ html/ icons/ layout inside; single-page components
(backup/dashboard/tasks/updater) get js/ css/ html/. Single-feature icon sets
moved into their sub-system (vpn -> apps/core/icons, config/cpu/os ->
admin/{config,system}/icons); shared app + category icons stay in core/icons.
feature.json + index.js stay at each component root (the scanned descriptor +
entry). Every controller/CSS/fragment/icon path reference rewritten; verified
no stale refs, all JS valid.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
---
 .../admin/{ => config/css}/ip-whitelist.css   |   0
 .../{ => config/html}/config-content.html     |   0
 .../admin/config}/icons/config/backup.svg     |   0
 .../admin/config}/icons/config/features.svg   |   0
 .../admin/config}/icons/config/general.svg    |   0
 .../admin/config}/icons/config/network.svg    |   0
 .../admin/config}/icons/config/security.svg   |   0
 .../admin/config}/icons/config/webui.svg      |   0
 .../admin/{ => config/js}/config-core.js      |   0
 .../admin/{ => config/js}/config-form.js      |   0
 .../admin/{ => config/js}/config-manager.js   |  20 +++++------
 .../admin/{ => config/js}/config-renderer.js  |   0
 .../admin/{ => config/js}/config-sidebar.js   |   2 +-
 .../admin/{ => config/js}/config-utils.js     |   0
 .../admin/{ => config/js}/config-validator.js |   0
 .../admin/{ => config/js}/domain-manager.js   |   0
 .../{ => config/js}/ip-whitelist-manager.js   |   0
 .../admin/{ => config/js}/toggle-manager.js   |   0
 .../components/admin/{ => css}/admin.css      |   0
 .../frontend/components/admin/index.js        |   2 +-
 .../admin/{ => overview/js}/admin-overview.js |   0
 .../admin/{ => peers/html}/peers-content.html |   0
 .../admin/{ => peers/js}/peers-page.js        |   0
 .../components/admin/{ => ssh/css}/ssh.css    |   0
 .../components/admin/{ => ssh/js}/ssh-page.js |   0
 .../admin/system}/icons/cpu/amd.svg           |   0
 .../admin/system}/icons/cpu/intel.svg         |   0
 .../admin/system}/icons/os/arch.svg           |   0
 .../admin/system}/icons/os/debian.svg         |   0
 .../admin/system}/icons/os/fedora.svg         |   0
 .../admin/system}/icons/os/linux.svg          |   0
 .../admin/system}/icons/os/ubuntu.svg         |   0
 .../admin/{ => system/js}/admin-system.js     |   6 ++--
 .../admin/{ => system/js}/charts.js           |   0
 .../{ => system/js}/system-metric-page.js     |   0
 .../{ => system/js}/system-storage-page.js    |   0
 .../frontend/components/app-detail/index.js   |   2 +-
 .../apps/{ => core/css}/apps-layout.css       |   0
 .../components/apps/{ => core/css}/apps.css   |   0
 .../apps/{ => core/css}/service-buttons.css   |   0
 .../{ => core/html}/apps-unified-layout.html  |   0
 .../apps}/core/icons/vpn/airvpn.svg           |   0
 .../apps}/core/icons/vpn/cyberghost.png       | Bin
 .../apps}/core/icons/vpn/expressvpn.svg       |   0
 .../apps}/core/icons/vpn/fastestvpn.png       | Bin
 .../apps}/core/icons/vpn/giganews.png         | Bin
 .../apps}/core/icons/vpn/hidemyass.png        | Bin
 .../apps}/core/icons/vpn/ipvanish.svg         |   0
 .../apps}/core/icons/vpn/ivpn.png             | Bin
 .../apps}/core/icons/vpn/mullvad.svg          |   0
 .../apps}/core/icons/vpn/nordvpn.svg          |   0
 .../apps}/core/icons/vpn/privado.png          | Bin
 .../icons/vpn/private-internet-access.svg     |   0
 .../apps}/core/icons/vpn/privatevpn.png       | Bin
 .../apps}/core/icons/vpn/protonvpn.svg        |   0
 .../apps}/core/icons/vpn/purevpn.png          | Bin
 .../apps}/core/icons/vpn/slickvpn.png         | Bin
 .../apps}/core/icons/vpn/surfshark.svg        |   0
 .../apps}/core/icons/vpn/torguard.png         | Bin
 .../apps}/core/icons/vpn/vpn-unlimited.png    | Bin
 .../apps}/core/icons/vpn/vpnsecure.png        | Bin
 .../apps}/core/icons/vpn/vyprvpn.png          | Bin
 .../apps}/core/icons/vpn/windscribe.png       | Bin
 .../apps/{ => core/js}/app-tabbed-manager.js  |   0
 .../apps/{ => core/js}/apps-manager.js        |   4 +--
 .../frontend/components/apps/index.js         |   2 +-
 .../{ => port-manager/css}/port-manager.css   |   0
 .../{ => port-manager/js}/port-manager.js     |   0
 .../apps/{ => routing/css}/routing.css        |   0
 .../apps/{ => routing/js}/routing-manager.js  |   0
 .../apps/{ => services/css}/services.css      |   0
 .../{ => services/js}/services-manager.js     |   0
 .../components/apps/{ => tools/css}/tools.css |   0
 .../apps/{ => tools/js}/tools-manager.js      |   0
 .../components/backup/{ => css}/backup.css    |   0
 .../backup/{ => html}/backup-content.html     |   0
 .../frontend/components/backup/index.js       |   6 ++--
 .../components/backup/{ => js}/backup-page.js |   0
 .../backup/{ => js}/backup-schema.js          |   0
 .../dashboard/{ => css}/dashboard.css         |   0
 .../{ => html}/dashboard-content.html         |   0
 .../frontend/components/dashboard/index.js    |   2 +-
 .../dashboard/{ => js}/dashboard.js           |   0
 .../components/tasks/{ => css}/tasks.css      |   0
 .../tasks/{ => html}/tasks-content.html       |   0
 .../frontend/components/tasks/index.js        |   2 +-
 .../tasks/{ => js}/tasks-manager.js           |   0
 .../components/updater/{ => css}/updater.css  |   0
 .../updater/{ => html}/updater-content.html   |   0
 .../frontend/components/updater/index.js      |   4 +--
 .../updater/{ => js}/updater-page.js          |   0
 .../frontend/core/boot/system-loader.js       |  34 +++++++++---------
 .../libreportal/frontend/core/kernel/spa.js   |  14 ++++----
 containers/libreportal/frontend/index.html    |  30 ++++++++--------
 94 files changed, 65 insertions(+), 65 deletions(-)
 rename containers/libreportal/frontend/components/admin/{ => config/css}/ip-whitelist.css (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/html}/config-content.html (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/backup.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/features.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/general.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/network.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/security.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/config}/icons/config/webui.svg (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-core.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-form.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-manager.js (95%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-renderer.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-sidebar.js (99%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-utils.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/config-validator.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/domain-manager.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/ip-whitelist-manager.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => config/js}/toggle-manager.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => css}/admin.css (100%)
 rename containers/libreportal/frontend/components/admin/{ => overview/js}/admin-overview.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => peers/html}/peers-content.html (100%)
 rename containers/libreportal/frontend/components/admin/{ => peers/js}/peers-page.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => ssh/css}/ssh.css (100%)
 rename containers/libreportal/frontend/components/admin/{ => ssh/js}/ssh-page.js (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/cpu/amd.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/cpu/intel.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/os/arch.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/os/debian.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/os/fedora.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/os/linux.svg (100%)
 rename containers/libreportal/frontend/{core => components/admin/system}/icons/os/ubuntu.svg (100%)
 rename containers/libreportal/frontend/components/admin/{ => system/js}/admin-system.js (98%)
 rename containers/libreportal/frontend/components/admin/{ => system/js}/charts.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => system/js}/system-metric-page.js (100%)
 rename containers/libreportal/frontend/components/admin/{ => system/js}/system-storage-page.js (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/css}/apps-layout.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/css}/apps.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/css}/service-buttons.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/html}/apps-unified-layout.html (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/airvpn.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/cyberghost.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/expressvpn.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/fastestvpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/giganews.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/hidemyass.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/ipvanish.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/ivpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/mullvad.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/nordvpn.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/privado.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/private-internet-access.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/privatevpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/protonvpn.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/purevpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/slickvpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/surfshark.svg (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/torguard.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/vpn-unlimited.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/vpnsecure.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/vyprvpn.png (100%)
 rename containers/libreportal/frontend/{ => components/apps}/core/icons/vpn/windscribe.png (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/js}/app-tabbed-manager.js (100%)
 rename containers/libreportal/frontend/components/apps/{ => core/js}/apps-manager.js (99%)
 rename containers/libreportal/frontend/components/apps/{ => port-manager/css}/port-manager.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => port-manager/js}/port-manager.js (100%)
 rename containers/libreportal/frontend/components/apps/{ => routing/css}/routing.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => routing/js}/routing-manager.js (100%)
 rename containers/libreportal/frontend/components/apps/{ => services/css}/services.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => services/js}/services-manager.js (100%)
 rename containers/libreportal/frontend/components/apps/{ => tools/css}/tools.css (100%)
 rename containers/libreportal/frontend/components/apps/{ => tools/js}/tools-manager.js (100%)
 rename containers/libreportal/frontend/components/backup/{ => css}/backup.css (100%)
 rename containers/libreportal/frontend/components/backup/{ => html}/backup-content.html (100%)
 rename containers/libreportal/frontend/components/backup/{ => js}/backup-page.js (100%)
 rename containers/libreportal/frontend/components/backup/{ => js}/backup-schema.js (100%)
 rename containers/libreportal/frontend/components/dashboard/{ => css}/dashboard.css (100%)
 rename containers/libreportal/frontend/components/dashboard/{ => html}/dashboard-content.html (100%)
 rename containers/libreportal/frontend/components/dashboard/{ => js}/dashboard.js (100%)
 rename containers/libreportal/frontend/components/tasks/{ => css}/tasks.css (100%)
 rename containers/libreportal/frontend/components/tasks/{ => html}/tasks-content.html (100%)
 rename containers/libreportal/frontend/components/tasks/{ => js}/tasks-manager.js (100%)
 rename containers/libreportal/frontend/components/updater/{ => css}/updater.css (100%)
 rename containers/libreportal/frontend/components/updater/{ => html}/updater-content.html (100%)
 rename containers/libreportal/frontend/components/updater/{ => js}/updater-page.js (100%)

diff --git a/containers/libreportal/frontend/components/admin/ip-whitelist.css b/containers/libreportal/frontend/components/admin/config/css/ip-whitelist.css
similarity index 100%
rename from containers/libreportal/frontend/components/admin/ip-whitelist.css
rename to containers/libreportal/frontend/components/admin/config/css/ip-whitelist.css
diff --git a/containers/libreportal/frontend/components/admin/config-content.html b/containers/libreportal/frontend/components/admin/config/html/config-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-content.html
rename to containers/libreportal/frontend/components/admin/config/html/config-content.html
diff --git a/containers/libreportal/frontend/core/icons/config/backup.svg b/containers/libreportal/frontend/components/admin/config/icons/config/backup.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/backup.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/backup.svg
diff --git a/containers/libreportal/frontend/core/icons/config/features.svg b/containers/libreportal/frontend/components/admin/config/icons/config/features.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/features.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/features.svg
diff --git a/containers/libreportal/frontend/core/icons/config/general.svg b/containers/libreportal/frontend/components/admin/config/icons/config/general.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/general.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/general.svg
diff --git a/containers/libreportal/frontend/core/icons/config/network.svg b/containers/libreportal/frontend/components/admin/config/icons/config/network.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/network.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/network.svg
diff --git a/containers/libreportal/frontend/core/icons/config/security.svg b/containers/libreportal/frontend/components/admin/config/icons/config/security.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/security.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/security.svg
diff --git a/containers/libreportal/frontend/core/icons/config/webui.svg b/containers/libreportal/frontend/components/admin/config/icons/config/webui.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/config/webui.svg
rename to containers/libreportal/frontend/components/admin/config/icons/config/webui.svg
diff --git a/containers/libreportal/frontend/components/admin/config-core.js b/containers/libreportal/frontend/components/admin/config/js/config-core.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-core.js
rename to containers/libreportal/frontend/components/admin/config/js/config-core.js
diff --git a/containers/libreportal/frontend/components/admin/config-form.js b/containers/libreportal/frontend/components/admin/config/js/config-form.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-form.js
rename to containers/libreportal/frontend/components/admin/config/js/config-form.js
diff --git a/containers/libreportal/frontend/components/admin/config-manager.js b/containers/libreportal/frontend/components/admin/config/js/config-manager.js
similarity index 95%
rename from containers/libreportal/frontend/components/admin/config-manager.js
rename to containers/libreportal/frontend/components/admin/config/js/config-manager.js
index 881a33a..39f92be 100755
--- a/containers/libreportal/frontend/components/admin/config-manager.js
+++ b/containers/libreportal/frontend/components/admin/config/js/config-manager.js
@@ -44,8 +44,8 @@ if (typeof window.ConfigManager === 'undefined') {
         try { this.sidebar.populateSidebar(); } catch (e) {}
         // charts.js is the chart-rendering helper admin-overview pulls in.
         await Promise.all([
-          lazyLoad('/components/admin/admin-overview.js'),
-          lazyLoad('/components/admin/charts.js')
+          lazyLoad('/components/admin/overview/js/admin-overview.js'),
+          lazyLoad('/components/admin/system/js/charts.js')
         ]);
         if (typeof AdminOverview !== 'undefined') {
           window.adminOverview = new AdminOverview('config-section');
@@ -60,7 +60,7 @@ if (typeof window.ConfigManager === 'undefined') {
       // a config category — render its own controller into the main pane.
       if (category === 'ssh-access') {
         try { this.sidebar.populateSidebar(); } catch (e) {}
-        await lazyLoad('/components/admin/ssh-page.js');
+        await lazyLoad('/components/admin/ssh/js/ssh-page.js');
         if (typeof SshPage !== 'undefined') {
           window.sshPage = new SshPage('config-section');
           await window.sshPage.init();
@@ -76,9 +76,9 @@ if (typeof window.ConfigManager === 'undefined') {
       // we inject its content template, then init PeersPage.
       if (category === 'peers') {
         try { this.sidebar.populateSidebar(); } catch (e) {}
-        await lazyLoad('/components/admin/peers-page.js');
+        await lazyLoad('/components/admin/peers/js/peers-page.js');
         try {
-          const html = await fetch('/components/admin/peers-content.html').then(r => r.text());
+          const html = await fetch('/components/admin/peers/html/peers-content.html').then(r => r.text());
           configSection.innerHTML = html;
         } catch (e) {
           configSection.innerHTML = '<div class="error">Peers page template failed to load.</div>';
@@ -100,10 +100,10 @@ if (typeof window.ConfigManager === 'undefined') {
       if (category === 'system') {
         try { this.sidebar.populateSidebar(); } catch (e) {}
         await Promise.all([
-          lazyLoad('/components/admin/charts.js'),
-          lazyLoad('/components/admin/admin-system.js'),
-          lazyLoad('/components/admin/system-metric-page.js'),
-          lazyLoad('/components/admin/system-storage-page.js')
+          lazyLoad('/components/admin/system/js/charts.js'),
+          lazyLoad('/components/admin/system/js/admin-system.js'),
+          lazyLoad('/components/admin/system/js/system-metric-page.js'),
+          lazyLoad('/components/admin/system/js/system-storage-page.js')
         ]);
         if (typeof AdminSystem !== 'undefined') {
           window.adminSystem = new AdminSystem('config-section');
@@ -216,7 +216,7 @@ if (typeof window.ConfigManager === 'undefined') {
           var catIcon = catMeta.icon || category;
           var headerHTML =
             '<div class="page-header config-page-header">' +
-              '<img class="page-header-icon" src="/core/icons/config/' + catIcon + '.svg" alt="" onerror="this.style.display=\'none\'">' +
+              '<img class="page-header-icon" src="/components/admin/config/icons/config/' + catIcon + '.svg" alt="" onerror="this.style.display=\'none\'">' +
               '<div class="page-header-title">' +
                 '<div class="admin-breadcrumb">Config</div>' +
                 '<h1>' + catTitle + '</h1>' +
diff --git a/containers/libreportal/frontend/components/admin/config-renderer.js b/containers/libreportal/frontend/components/admin/config/js/config-renderer.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-renderer.js
rename to containers/libreportal/frontend/components/admin/config/js/config-renderer.js
diff --git a/containers/libreportal/frontend/components/admin/config-sidebar.js b/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
similarity index 99%
rename from containers/libreportal/frontend/components/admin/config-sidebar.js
rename to containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
index 5960f7d..8f6374c 100755
--- a/containers/libreportal/frontend/components/admin/config-sidebar.js
+++ b/containers/libreportal/frontend/components/admin/config/js/config-sidebar.js
@@ -88,7 +88,7 @@ class ConfigSidebar {
       
       // Use correct icon from our new structure
       const iconName = category.icon || category.id;
-      const iconPath = '/core/icons/config/' + iconName + '.svg';
+      const iconPath = '/components/admin/config/icons/config/' + iconName + '.svg';
       
       categoryItem.innerHTML = '<img src="' + iconPath + '" alt="' + category.title + '" style="width: 20px; height: 20px; margin-right: 8px;"/> ' + category.title;
       
diff --git a/containers/libreportal/frontend/components/admin/config-utils.js b/containers/libreportal/frontend/components/admin/config/js/config-utils.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-utils.js
rename to containers/libreportal/frontend/components/admin/config/js/config-utils.js
diff --git a/containers/libreportal/frontend/components/admin/config-validator.js b/containers/libreportal/frontend/components/admin/config/js/config-validator.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/config-validator.js
rename to containers/libreportal/frontend/components/admin/config/js/config-validator.js
diff --git a/containers/libreportal/frontend/components/admin/domain-manager.js b/containers/libreportal/frontend/components/admin/config/js/domain-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/domain-manager.js
rename to containers/libreportal/frontend/components/admin/config/js/domain-manager.js
diff --git a/containers/libreportal/frontend/components/admin/ip-whitelist-manager.js b/containers/libreportal/frontend/components/admin/config/js/ip-whitelist-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/ip-whitelist-manager.js
rename to containers/libreportal/frontend/components/admin/config/js/ip-whitelist-manager.js
diff --git a/containers/libreportal/frontend/components/admin/toggle-manager.js b/containers/libreportal/frontend/components/admin/config/js/toggle-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/toggle-manager.js
rename to containers/libreportal/frontend/components/admin/config/js/toggle-manager.js
diff --git a/containers/libreportal/frontend/components/admin/admin.css b/containers/libreportal/frontend/components/admin/css/admin.css
similarity index 100%
rename from containers/libreportal/frontend/components/admin/admin.css
rename to containers/libreportal/frontend/components/admin/css/admin.css
diff --git a/containers/libreportal/frontend/components/admin/index.js b/containers/libreportal/frontend/components/admin/index.js
index f5d969d..c519435 100644
--- a/containers/libreportal/frontend/components/admin/index.js
+++ b/containers/libreportal/frontend/components/admin/index.js
@@ -16,7 +16,7 @@ LP.features.register({
   async mount(ctx) {
     window.configCategory = ctx.services.router.adminCategoryFromPath(window.location.pathname);
 
-    const html = await ctx.loadFragment('/components/admin/config-content.html');
+    const html = await ctx.loadFragment('/components/admin/config/html/config-content.html');
     ctx.setContent(html, 'Admin');
 
     if (window.configManager) {
diff --git a/containers/libreportal/frontend/components/admin/admin-overview.js b/containers/libreportal/frontend/components/admin/overview/js/admin-overview.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/admin-overview.js
rename to containers/libreportal/frontend/components/admin/overview/js/admin-overview.js
diff --git a/containers/libreportal/frontend/components/admin/peers-content.html b/containers/libreportal/frontend/components/admin/peers/html/peers-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/admin/peers-content.html
rename to containers/libreportal/frontend/components/admin/peers/html/peers-content.html
diff --git a/containers/libreportal/frontend/components/admin/peers-page.js b/containers/libreportal/frontend/components/admin/peers/js/peers-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/peers-page.js
rename to containers/libreportal/frontend/components/admin/peers/js/peers-page.js
diff --git a/containers/libreportal/frontend/components/admin/ssh.css b/containers/libreportal/frontend/components/admin/ssh/css/ssh.css
similarity index 100%
rename from containers/libreportal/frontend/components/admin/ssh.css
rename to containers/libreportal/frontend/components/admin/ssh/css/ssh.css
diff --git a/containers/libreportal/frontend/components/admin/ssh-page.js b/containers/libreportal/frontend/components/admin/ssh/js/ssh-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/ssh-page.js
rename to containers/libreportal/frontend/components/admin/ssh/js/ssh-page.js
diff --git a/containers/libreportal/frontend/core/icons/cpu/amd.svg b/containers/libreportal/frontend/components/admin/system/icons/cpu/amd.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/cpu/amd.svg
rename to containers/libreportal/frontend/components/admin/system/icons/cpu/amd.svg
diff --git a/containers/libreportal/frontend/core/icons/cpu/intel.svg b/containers/libreportal/frontend/components/admin/system/icons/cpu/intel.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/cpu/intel.svg
rename to containers/libreportal/frontend/components/admin/system/icons/cpu/intel.svg
diff --git a/containers/libreportal/frontend/core/icons/os/arch.svg b/containers/libreportal/frontend/components/admin/system/icons/os/arch.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/os/arch.svg
rename to containers/libreportal/frontend/components/admin/system/icons/os/arch.svg
diff --git a/containers/libreportal/frontend/core/icons/os/debian.svg b/containers/libreportal/frontend/components/admin/system/icons/os/debian.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/os/debian.svg
rename to containers/libreportal/frontend/components/admin/system/icons/os/debian.svg
diff --git a/containers/libreportal/frontend/core/icons/os/fedora.svg b/containers/libreportal/frontend/components/admin/system/icons/os/fedora.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/os/fedora.svg
rename to containers/libreportal/frontend/components/admin/system/icons/os/fedora.svg
diff --git a/containers/libreportal/frontend/core/icons/os/linux.svg b/containers/libreportal/frontend/components/admin/system/icons/os/linux.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/os/linux.svg
rename to containers/libreportal/frontend/components/admin/system/icons/os/linux.svg
diff --git a/containers/libreportal/frontend/core/icons/os/ubuntu.svg b/containers/libreportal/frontend/components/admin/system/icons/os/ubuntu.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/os/ubuntu.svg
rename to containers/libreportal/frontend/components/admin/system/icons/os/ubuntu.svg
diff --git a/containers/libreportal/frontend/components/admin/admin-system.js b/containers/libreportal/frontend/components/admin/system/js/admin-system.js
similarity index 98%
rename from containers/libreportal/frontend/components/admin/admin-system.js
rename to containers/libreportal/frontend/components/admin/system/js/admin-system.js
index 50cd39f..a1ac16a 100644
--- a/containers/libreportal/frontend/components/admin/admin-system.js
+++ b/containers/libreportal/frontend/components/admin/system/js/admin-system.js
@@ -401,14 +401,14 @@ class AdminSystem {
         return `<div class="sys-stat"><span class="sys-stat-label">${this.escape(label)}</span><strong class="sys-stat-value">${this.escape(value)}</strong></div>`;
     }
 
-    // OS stat with a distro icon (bundled under /core/icons/os/, generic Linux glyph
+    // OS stat with a distro icon (bundled under /components/admin/system/icons/os/, generic Linux glyph
     // for anything we don't have a logo for).
     _osStat(os) {
         const slug = String(os || '').toLowerCase().replace(/[^a-z0-9]/g, '') || 'linux';
         return `<div class="sys-stat">
             <span class="sys-stat-label">OS</span>
             <strong class="sys-stat-value sys-id-value">
-                <span class="sys-id-icon"><img src="/core/icons/os/${slug}.svg" alt="" onerror="this.onerror=null;this.src='/core/icons/os/linux.svg'"></span>
+                <span class="sys-id-icon"><img src="/components/admin/system/icons/os/${slug}.svg" alt="" onerror="this.onerror=null;this.src='/components/admin/system/icons/os/linux.svg'"></span>
                 ${this.escape(os || '—')}
             </strong>
         </div>`;
@@ -430,7 +430,7 @@ class AdminSystem {
     _cpuStat(cpu) {
         const raw = String(cpu || '');
         const vendor = /amd/i.test(raw) ? 'amd' : /intel/i.test(raw) ? 'intel' : null;
-        const icon = vendor ? `<span class="sys-id-icon"><img src="/core/icons/cpu/${vendor}.svg" alt="${vendor}"></span>` : '';
+        const icon = vendor ? `<span class="sys-id-icon"><img src="/components/admin/system/icons/cpu/${vendor}.svg" alt="${vendor}"></span>` : '';
         return `<div class="sys-stat">
             <span class="sys-stat-label">CPU</span>
             <strong class="sys-stat-value sys-id-value">${icon}${this.escape(this._cleanCpu(raw))}</strong>
diff --git a/containers/libreportal/frontend/components/admin/charts.js b/containers/libreportal/frontend/components/admin/system/js/charts.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/charts.js
rename to containers/libreportal/frontend/components/admin/system/js/charts.js
diff --git a/containers/libreportal/frontend/components/admin/system-metric-page.js b/containers/libreportal/frontend/components/admin/system/js/system-metric-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/system-metric-page.js
rename to containers/libreportal/frontend/components/admin/system/js/system-metric-page.js
diff --git a/containers/libreportal/frontend/components/admin/system-storage-page.js b/containers/libreportal/frontend/components/admin/system/js/system-storage-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/admin/system-storage-page.js
rename to containers/libreportal/frontend/components/admin/system/js/system-storage-page.js
diff --git a/containers/libreportal/frontend/components/app-detail/index.js b/containers/libreportal/frontend/components/app-detail/index.js
index 525bc27..bd40070 100644
--- a/containers/libreportal/frontend/components/app-detail/index.js
+++ b/containers/libreportal/frontend/components/app-detail/index.js
@@ -42,7 +42,7 @@ LP.features.register({
       }
     }
 
-    const html = await ctx.loadFragment('/components/apps/apps-unified-layout.html');
+    const html = await ctx.loadFragment('/components/apps/core/html/apps-unified-layout.html');
     ctx.setContent(html, appName);
 
     if (!window.appTabbedManager) {
diff --git a/containers/libreportal/frontend/components/apps/apps-layout.css b/containers/libreportal/frontend/components/apps/core/css/apps-layout.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/apps-layout.css
rename to containers/libreportal/frontend/components/apps/core/css/apps-layout.css
diff --git a/containers/libreportal/frontend/components/apps/apps.css b/containers/libreportal/frontend/components/apps/core/css/apps.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/apps.css
rename to containers/libreportal/frontend/components/apps/core/css/apps.css
diff --git a/containers/libreportal/frontend/components/apps/service-buttons.css b/containers/libreportal/frontend/components/apps/core/css/service-buttons.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/service-buttons.css
rename to containers/libreportal/frontend/components/apps/core/css/service-buttons.css
diff --git a/containers/libreportal/frontend/components/apps/apps-unified-layout.html b/containers/libreportal/frontend/components/apps/core/html/apps-unified-layout.html
similarity index 100%
rename from containers/libreportal/frontend/components/apps/apps-unified-layout.html
rename to containers/libreportal/frontend/components/apps/core/html/apps-unified-layout.html
diff --git a/containers/libreportal/frontend/core/icons/vpn/airvpn.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/airvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/airvpn.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/airvpn.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/cyberghost.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/cyberghost.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/cyberghost.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/cyberghost.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/expressvpn.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/expressvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/expressvpn.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/expressvpn.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/fastestvpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/fastestvpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/fastestvpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/fastestvpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/giganews.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/giganews.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/giganews.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/giganews.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/hidemyass.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/hidemyass.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/hidemyass.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/hidemyass.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/ipvanish.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/ipvanish.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/ipvanish.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/ipvanish.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/ivpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/ivpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/ivpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/ivpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/mullvad.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/mullvad.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/mullvad.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/mullvad.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/nordvpn.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/nordvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/nordvpn.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/nordvpn.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/privado.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/privado.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/privado.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/privado.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/private-internet-access.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/private-internet-access.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/private-internet-access.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/private-internet-access.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/privatevpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/privatevpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/privatevpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/privatevpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/protonvpn.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/protonvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/protonvpn.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/protonvpn.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/purevpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/purevpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/purevpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/purevpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/slickvpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/slickvpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/slickvpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/slickvpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/surfshark.svg b/containers/libreportal/frontend/components/apps/core/icons/vpn/surfshark.svg
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/surfshark.svg
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/surfshark.svg
diff --git a/containers/libreportal/frontend/core/icons/vpn/torguard.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/torguard.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/torguard.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/torguard.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/vpn-unlimited.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/vpn-unlimited.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/vpn-unlimited.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/vpn-unlimited.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/vpnsecure.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/vpnsecure.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/vpnsecure.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/vpnsecure.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/vyprvpn.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/vyprvpn.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/vyprvpn.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/vyprvpn.png
diff --git a/containers/libreportal/frontend/core/icons/vpn/windscribe.png b/containers/libreportal/frontend/components/apps/core/icons/vpn/windscribe.png
similarity index 100%
rename from containers/libreportal/frontend/core/icons/vpn/windscribe.png
rename to containers/libreportal/frontend/components/apps/core/icons/vpn/windscribe.png
diff --git a/containers/libreportal/frontend/components/apps/app-tabbed-manager.js b/containers/libreportal/frontend/components/apps/core/js/app-tabbed-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/apps/app-tabbed-manager.js
rename to containers/libreportal/frontend/components/apps/core/js/app-tabbed-manager.js
diff --git a/containers/libreportal/frontend/components/apps/apps-manager.js b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
similarity index 99%
rename from containers/libreportal/frontend/components/apps/apps-manager.js
rename to containers/libreportal/frontend/components/apps/core/js/apps-manager.js
index bbaad31..a70aff2 100755
--- a/containers/libreportal/frontend/components/apps/apps-manager.js
+++ b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
@@ -2408,7 +2408,7 @@ class AppsManager {
     const existing = document.getElementById('mullvad-generate-modal');
     if (existing) existing.remove();
 
-    const mullvadIcon = (window.gluetunProviderIcons && window.gluetunProviderIcons.mullvad) || '/core/icons/vpn/mullvad.svg';
+    const mullvadIcon = (window.gluetunProviderIcons && window.gluetunProviderIcons.mullvad) || '/components/apps/core/icons/vpn/mullvad.svg';
     const bodyHtml = `
       <p class="eo-modal-section-text">
         Enter your 16-digit Mullvad account number. A new WireGuard key will be generated locally
@@ -3354,7 +3354,7 @@ class AppsManager {
         { 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: 'TasksManager', src: '/components/tasks/tasks-manager.js' }
+        { name: 'TasksManager', src: '/components/tasks/js/tasks-manager.js' }
       ];
       
       for (const script of scripts) {
diff --git a/containers/libreportal/frontend/components/apps/index.js b/containers/libreportal/frontend/components/apps/index.js
index c9a7ce4..31efeb5 100644
--- a/containers/libreportal/frontend/components/apps/index.js
+++ b/containers/libreportal/frontend/components/apps/index.js
@@ -28,7 +28,7 @@ LP.features.register({
     // Load the unified layout only if it isn't already present — preserves grid
     // state when moving between categories / back from app-detail (legacy behaviour).
     if (!document.querySelector('.apps-layout')) {
-      const html = await ctx.loadFragment('/components/apps/apps-unified-layout.html');
+      const html = await ctx.loadFragment('/components/apps/core/html/apps-unified-layout.html');
       ctx.setContent(html, 'Applications');
     }
 
diff --git a/containers/libreportal/frontend/components/apps/port-manager.css b/containers/libreportal/frontend/components/apps/port-manager/css/port-manager.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/port-manager.css
rename to containers/libreportal/frontend/components/apps/port-manager/css/port-manager.css
diff --git a/containers/libreportal/frontend/components/apps/port-manager.js b/containers/libreportal/frontend/components/apps/port-manager/js/port-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/apps/port-manager.js
rename to containers/libreportal/frontend/components/apps/port-manager/js/port-manager.js
diff --git a/containers/libreportal/frontend/components/apps/routing.css b/containers/libreportal/frontend/components/apps/routing/css/routing.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/routing.css
rename to containers/libreportal/frontend/components/apps/routing/css/routing.css
diff --git a/containers/libreportal/frontend/components/apps/routing-manager.js b/containers/libreportal/frontend/components/apps/routing/js/routing-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/apps/routing-manager.js
rename to containers/libreportal/frontend/components/apps/routing/js/routing-manager.js
diff --git a/containers/libreportal/frontend/components/apps/services.css b/containers/libreportal/frontend/components/apps/services/css/services.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/services.css
rename to containers/libreportal/frontend/components/apps/services/css/services.css
diff --git a/containers/libreportal/frontend/components/apps/services-manager.js b/containers/libreportal/frontend/components/apps/services/js/services-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/apps/services-manager.js
rename to containers/libreportal/frontend/components/apps/services/js/services-manager.js
diff --git a/containers/libreportal/frontend/components/apps/tools.css b/containers/libreportal/frontend/components/apps/tools/css/tools.css
similarity index 100%
rename from containers/libreportal/frontend/components/apps/tools.css
rename to containers/libreportal/frontend/components/apps/tools/css/tools.css
diff --git a/containers/libreportal/frontend/components/apps/tools-manager.js b/containers/libreportal/frontend/components/apps/tools/js/tools-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/apps/tools-manager.js
rename to containers/libreportal/frontend/components/apps/tools/js/tools-manager.js
diff --git a/containers/libreportal/frontend/components/backup/backup.css b/containers/libreportal/frontend/components/backup/css/backup.css
similarity index 100%
rename from containers/libreportal/frontend/components/backup/backup.css
rename to containers/libreportal/frontend/components/backup/css/backup.css
diff --git a/containers/libreportal/frontend/components/backup/backup-content.html b/containers/libreportal/frontend/components/backup/html/backup-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/backup/backup-content.html
rename to containers/libreportal/frontend/components/backup/html/backup-content.html
diff --git a/containers/libreportal/frontend/components/backup/index.js b/containers/libreportal/frontend/components/backup/index.js
index e0f5b88..5d7d67d 100644
--- a/containers/libreportal/frontend/components/backup/index.js
+++ b/containers/libreportal/frontend/components/backup/index.js
@@ -14,14 +14,14 @@ LP.features.register({
   routes: ['/backup', '/backup*'],
   // Controllers the feature needs; lazy-loaded on first mount (idempotent).
   scripts: [
-    '/components/backup/backup-schema.js',
-    '/components/backup/backup-page.js',
+    '/components/backup/js/backup-schema.js',
+    '/components/backup/js/backup-page.js',
     '/core/lib/backup-app-card.js',
   ],
 
   async mount(ctx) {
     await ctx.loadScripts(this.scripts);
-    const html = await ctx.loadFragment('/components/backup/backup-content.html');
+    const html = await ctx.loadFragment('/components/backup/html/backup-content.html');
     ctx.setContent(html, 'Backups');
     if (typeof BackupPage === 'undefined') {
       throw new Error('BackupPage controller failed to load');
diff --git a/containers/libreportal/frontend/components/backup/backup-page.js b/containers/libreportal/frontend/components/backup/js/backup-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/backup/backup-page.js
rename to containers/libreportal/frontend/components/backup/js/backup-page.js
diff --git a/containers/libreportal/frontend/components/backup/backup-schema.js b/containers/libreportal/frontend/components/backup/js/backup-schema.js
similarity index 100%
rename from containers/libreportal/frontend/components/backup/backup-schema.js
rename to containers/libreportal/frontend/components/backup/js/backup-schema.js
diff --git a/containers/libreportal/frontend/components/dashboard/dashboard.css b/containers/libreportal/frontend/components/dashboard/css/dashboard.css
similarity index 100%
rename from containers/libreportal/frontend/components/dashboard/dashboard.css
rename to containers/libreportal/frontend/components/dashboard/css/dashboard.css
diff --git a/containers/libreportal/frontend/components/dashboard/dashboard-content.html b/containers/libreportal/frontend/components/dashboard/html/dashboard-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/dashboard/dashboard-content.html
rename to containers/libreportal/frontend/components/dashboard/html/dashboard-content.html
diff --git a/containers/libreportal/frontend/components/dashboard/index.js b/containers/libreportal/frontend/components/dashboard/index.js
index c6ccc15..4e325d2 100644
--- a/containers/libreportal/frontend/components/dashboard/index.js
+++ b/containers/libreportal/frontend/components/dashboard/index.js
@@ -13,7 +13,7 @@ LP.features.register({
   routes: ['/', '/dashboard'],
 
   async mount(ctx) {
-    const html = await ctx.loadFragment('/components/dashboard/dashboard-content.html');
+    const html = await ctx.loadFragment('/components/dashboard/html/dashboard-content.html');
     ctx.setContent(html, 'Dashboard');
 
     // Render the installed-apps icon grid (handleDashboard's only post-render call).
diff --git a/containers/libreportal/frontend/components/dashboard/dashboard.js b/containers/libreportal/frontend/components/dashboard/js/dashboard.js
similarity index 100%
rename from containers/libreportal/frontend/components/dashboard/dashboard.js
rename to containers/libreportal/frontend/components/dashboard/js/dashboard.js
diff --git a/containers/libreportal/frontend/components/tasks/tasks.css b/containers/libreportal/frontend/components/tasks/css/tasks.css
similarity index 100%
rename from containers/libreportal/frontend/components/tasks/tasks.css
rename to containers/libreportal/frontend/components/tasks/css/tasks.css
diff --git a/containers/libreportal/frontend/components/tasks/tasks-content.html b/containers/libreportal/frontend/components/tasks/html/tasks-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/tasks/tasks-content.html
rename to containers/libreportal/frontend/components/tasks/html/tasks-content.html
diff --git a/containers/libreportal/frontend/components/tasks/index.js b/containers/libreportal/frontend/components/tasks/index.js
index d217769..147ffef 100644
--- a/containers/libreportal/frontend/components/tasks/index.js
+++ b/containers/libreportal/frontend/components/tasks/index.js
@@ -11,7 +11,7 @@ LP.features.register({
   routes: ['/tasks', '/tasks*'],
 
   async mount(ctx) {
-    const html = await ctx.loadFragment('/components/tasks/tasks-content.html');
+    const html = await ctx.loadFragment('/components/tasks/html/tasks-content.html');
     ctx.setContent(html, 'Tasks');
 
     if (window.tasksManager) {
diff --git a/containers/libreportal/frontend/components/tasks/tasks-manager.js b/containers/libreportal/frontend/components/tasks/js/tasks-manager.js
similarity index 100%
rename from containers/libreportal/frontend/components/tasks/tasks-manager.js
rename to containers/libreportal/frontend/components/tasks/js/tasks-manager.js
diff --git a/containers/libreportal/frontend/components/updater/updater.css b/containers/libreportal/frontend/components/updater/css/updater.css
similarity index 100%
rename from containers/libreportal/frontend/components/updater/updater.css
rename to containers/libreportal/frontend/components/updater/css/updater.css
diff --git a/containers/libreportal/frontend/components/updater/updater-content.html b/containers/libreportal/frontend/components/updater/html/updater-content.html
similarity index 100%
rename from containers/libreportal/frontend/components/updater/updater-content.html
rename to containers/libreportal/frontend/components/updater/html/updater-content.html
diff --git a/containers/libreportal/frontend/components/updater/index.js b/containers/libreportal/frontend/components/updater/index.js
index d9d9c9f..7459809 100644
--- a/containers/libreportal/frontend/components/updater/index.js
+++ b/containers/libreportal/frontend/components/updater/index.js
@@ -9,11 +9,11 @@
 LP.features.register({
   id: 'updater',
   routes: ['/updater', '/updater*'],
-  scripts: ['/components/updater/updater-page.js'],
+  scripts: ['/components/updater/js/updater-page.js'],
 
   async mount(ctx) {
     await ctx.loadScripts(this.scripts);
-    const html = await ctx.loadFragment('/components/updater/updater-content.html');
+    const html = await ctx.loadFragment('/components/updater/html/updater-content.html');
     ctx.setContent(html, 'Updates');
     if (typeof UpdaterPage === 'undefined') {
       throw new Error('UpdaterPage controller failed to load');
diff --git a/containers/libreportal/frontend/components/updater/updater-page.js b/containers/libreportal/frontend/components/updater/js/updater-page.js
similarity index 100%
rename from containers/libreportal/frontend/components/updater/updater-page.js
rename to containers/libreportal/frontend/components/updater/js/updater-page.js
diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js
index 0866044..9c95e89 100755
--- a/containers/libreportal/frontend/core/boot/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/system-loader.js
@@ -41,16 +41,16 @@ class SystemLoader {
       scripts: [
         '/core/lib/config-options.js',
         '/core/lib/config-shared.js',
-        '/components/admin/config-validator.js',
-        '/components/admin/toggle-manager.js',
-        '/components/admin/config-core.js',
-        '/components/admin/domain-manager.js',
-        '/components/admin/ip-whitelist-manager.js',
-        '/components/admin/config-renderer.js',
-        '/components/admin/config-sidebar.js',
-        '/components/admin/config-form.js',
-        '/components/admin/config-utils.js',
-        '/components/admin/config-manager.js'
+        '/components/admin/config/js/config-validator.js',
+        '/components/admin/config/js/toggle-manager.js',
+        '/components/admin/config/js/config-core.js',
+        '/components/admin/config/js/domain-manager.js',
+        '/components/admin/config/js/ip-whitelist-manager.js',
+        '/components/admin/config/js/config-renderer.js',
+        '/components/admin/config/js/config-sidebar.js',
+        '/components/admin/config/js/config-form.js',
+        '/components/admin/config/js/config-utils.js',
+        '/components/admin/config/js/config-manager.js'
       ]
     });
     
@@ -174,7 +174,7 @@ class SystemLoader {
         '/core/lib/task-global-functions.js',
         '/core/lib/task-manager.js',
         '/core/lib/task-parameter-preserve.js',
-        '/components/tasks/tasks-manager.js'
+        '/components/tasks/js/tasks-manager.js'
       ]
     });
     
@@ -204,13 +204,13 @@ class SystemLoader {
       global: 'appsManager',
       dependencies: ['data'],
       scripts: [
-        '/components/apps/port-manager.js',
+        '/components/apps/port-manager/js/port-manager.js',
         '/core/lib/task-manager.js',  // Add TaskManager for backup functionality
         '/core/lib/backup-app-card.js',
-        '/components/apps/services-manager.js',
-        '/components/apps/tools-manager.js',
-        '/components/apps/routing-manager.js',
-        '/components/apps/apps-manager.js'
+        '/components/apps/services/js/services-manager.js',
+        '/components/apps/tools/js/tools-manager.js',
+        '/components/apps/routing/js/routing-manager.js',
+        '/components/apps/core/js/apps-manager.js'
       ]
     });
     
@@ -232,7 +232,7 @@ class SystemLoader {
       },
       global: 'appTabbedManager',
       dependencies: [],
-      script: '/components/apps/app-tabbed-manager.js'
+      script: '/components/apps/core/js/app-tabbed-manager.js'
     });
     
     // console.log('TEST: Components added. Total components:', this.components.size);
diff --git a/containers/libreportal/frontend/core/kernel/spa.js b/containers/libreportal/frontend/core/kernel/spa.js
index 6ca27c7..40064d9 100755
--- a/containers/libreportal/frontend/core/kernel/spa.js
+++ b/containers/libreportal/frontend/core/kernel/spa.js
@@ -341,7 +341,7 @@ class LibrePortalSPAClean {
     
     try {
       // console.log('📄 SPA: Fetching dashboard content...');
-      const html = await this.fetchContent('/components/dashboard/dashboard-content.html');
+      const html = await this.fetchContent('/components/dashboard/html/dashboard-content.html');
       // console.log('📄 SPA: Dashboard content fetched, loading...');
       this.loadContent(html, 'Dashboard');
       // console.log('📄 SPA: Dashboard content loaded');
@@ -362,10 +362,10 @@ class LibrePortalSPAClean {
       // backup-page.js + backup-app-card.js are loaded on first navigation.
       // loadScript is idempotent — subsequent /backup navigations are no-ops.
       await Promise.all([
-        this.loadScript('/components/backup/backup-page.js'),
+        this.loadScript('/components/backup/js/backup-page.js'),
         this.loadScript('/core/lib/backup-app-card.js')
       ]);
-      const html = await this.fetchContent('/components/backup/backup-content.html');
+      const html = await this.fetchContent('/components/backup/html/backup-content.html');
       this.loadContent(html, 'Backups');
       if (typeof BackupPage !== 'undefined') {
         window.backupPage = new BackupPage();
@@ -409,7 +409,7 @@ class LibrePortalSPAClean {
       // Ensure unified layout is loaded (like the old SPA)
       if (!document.querySelector('.apps-layout')) {
         //console.log('📄 Loading apps layout HTML...');
-        const html = await this.fetchContent('/components/apps/apps-unified-layout.html');
+        const html = await this.fetchContent('/components/apps/core/html/apps-unified-layout.html');
         this.loadContent(html, 'Applications');
       } else {
         //console.log('📄 Apps layout already exists, skipping HTML load');
@@ -477,7 +477,7 @@ class LibrePortalSPAClean {
     }
 
     try {
-      const html = await this.fetchContent('/components/apps/apps-unified-layout.html');
+      const html = await this.fetchContent('/components/apps/core/html/apps-unified-layout.html');
       this.loadContent(html, appName); // Will be updated after app data loads
       
       // AppTabbedManager should already be initialized by SystemLoader
@@ -502,7 +502,7 @@ class LibrePortalSPAClean {
     window.configCategory = window.adminCategoryFromPath(window.location.pathname);
 
     try {
-      const html = await this.fetchContent('/components/admin/config-content.html');
+      const html = await this.fetchContent('/components/admin/config/html/config-content.html');
       this.loadContent(html, 'Admin');
 
       if (window.configManager) {
@@ -535,7 +535,7 @@ class LibrePortalSPAClean {
     //console.log('📋 Loading tasks...');
     
     try {
-      const html = await this.fetchContent('/components/tasks/tasks-content.html');
+      const html = await this.fetchContent('/components/tasks/html/tasks-content.html');
       this.loadContent(html, 'Tasks');
       
       // Tasks manager should already be initialized by SystemLoader
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index d084a2f..60c3f30 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -16,27 +16,27 @@
   <link rel="stylesheet" href="/core/css/loading-screen.css">
   <link rel="stylesheet" href="/core/css/setup-wizard.css">
   <link rel="stylesheet" href="/core/css/style.css">
-  <link rel="stylesheet" href="/components/admin/ip-whitelist.css">
-  <link rel="stylesheet" href="/components/apps/port-manager.css">
-  <link rel="stylesheet" href="/components/backup/backup.css">
-  <link rel="stylesheet" href="/components/admin/ssh.css">
-  <link rel="stylesheet" href="/components/admin/admin.css">
-  <link rel="stylesheet" href="/components/apps/services.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/css/backup.css">
+  <link rel="stylesheet" href="/components/admin/ssh/css/ssh.css">
+  <link rel="stylesheet" href="/components/admin/css/admin.css">
+  <link rel="stylesheet" href="/components/apps/services/css/services.css">
   <link rel="stylesheet" href="/core/css/modal.css">
-  <link rel="stylesheet" href="/components/apps/tools.css">
-  <link rel="stylesheet" href="/components/apps/routing.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/css/login.css">
   <link rel="stylesheet" href="/core/css/aurora-background.css">
   <link rel="stylesheet" href="/core/css/topbar.css">
   <link rel="stylesheet" href="/core/css/sidebar.css">
-  <link rel="stylesheet" href="/components/apps/apps-layout.css">
-  <link rel="stylesheet" href="/components/apps/apps.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/css/forms.css">
   <link rel="stylesheet" href="/core/css/config.css">
-  <link rel="stylesheet" href="/components/apps/service-buttons.css">
-  <link rel="stylesheet" href="/components/dashboard/dashboard.css">
-  <link rel="stylesheet" href="/components/tasks/tasks.css">
-  <link rel="stylesheet" href="/components/updater/updater.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/css/update-notifier.css">
   <script>
     // Inline data-theme bootstrap — runs before any rendering so the right
@@ -98,7 +98,7 @@
   <script src="/core/lib/dismissible.js"></script>
   <script src="/core/ui/eo-modal.js"></script>
   <script src="/core/lib/task-refresh-coordinator.js"></script>
-  <script src="/components/dashboard/dashboard.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>