diff --git a/containers/libreportal/backend/routes/features.js b/containers/libreportal/backend/routes/features.js
index fd5f2e3..5f938e4 100644
--- a/containers/libreportal/backend/routes/features.js
+++ b/containers/libreportal/backend/routes/features.js
@@ -4,12 +4,12 @@ const path = require('path');
 
 const router = express.Router();
 
-const FEATURES_DIR = path.join(__dirname, '..', '..', 'frontend', 'features');
+const FEATURES_DIR = path.join(__dirname, '..', '..', 'frontend', 'components');
 
 /* =========================
    GET /api/features/list
 
-   Walks frontend/features/<id>/ and returns one entry per directory that
+   Walks frontend/components/<id>/ and returns one entry per directory that
    contains a feature.json — the WebUI's page manifest, discovered from the
    folders themselves (exactly how /api/themes/list discovers themes). Drop a
    features/<id>/ folder in and its page appears; delete it and the page is
diff --git a/containers/libreportal/frontend/features/admin/admin-overview.js b/containers/libreportal/frontend/components/admin/admin-overview.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/admin-overview.js
rename to containers/libreportal/frontend/components/admin/admin-overview.js
diff --git a/containers/libreportal/frontend/features/admin/admin-system.js b/containers/libreportal/frontend/components/admin/admin-system.js
similarity index 98%
rename from containers/libreportal/frontend/features/admin/admin-system.js
rename to containers/libreportal/frontend/components/admin/admin-system.js
index 01337d3..50cd39f 100644
--- a/containers/libreportal/frontend/features/admin/admin-system.js
+++ b/containers/libreportal/frontend/components/admin/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 /icons/os/, generic Linux glyph
+    // OS stat with a distro icon (bundled under /core/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="/icons/os/${slug}.svg" alt="" onerror="this.onerror=null;this.src='/icons/os/linux.svg'"></span>
+                <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>
                 ${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="/icons/cpu/${vendor}.svg" alt="${vendor}"></span>` : '';
+        const icon = vendor ? `<span class="sys-id-icon"><img src="/core/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/features/admin/admin.css b/containers/libreportal/frontend/components/admin/admin.css
similarity index 100%
rename from containers/libreportal/frontend/features/admin/admin.css
rename to containers/libreportal/frontend/components/admin/admin.css
diff --git a/containers/libreportal/frontend/features/admin/charts.js b/containers/libreportal/frontend/components/admin/charts.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/charts.js
rename to containers/libreportal/frontend/components/admin/charts.js
diff --git a/containers/libreportal/frontend/html/config-content.html b/containers/libreportal/frontend/components/admin/config-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/config-content.html
rename to containers/libreportal/frontend/components/admin/config-content.html
diff --git a/containers/libreportal/frontend/features/admin/config-core.js b/containers/libreportal/frontend/components/admin/config-core.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/config-core.js
rename to containers/libreportal/frontend/components/admin/config-core.js
diff --git a/containers/libreportal/frontend/features/admin/config-form.js b/containers/libreportal/frontend/components/admin/config-form.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/config-form.js
rename to containers/libreportal/frontend/components/admin/config-form.js
diff --git a/containers/libreportal/frontend/features/admin/config-manager.js b/containers/libreportal/frontend/components/admin/config-manager.js
similarity index 96%
rename from containers/libreportal/frontend/features/admin/config-manager.js
rename to containers/libreportal/frontend/components/admin/config-manager.js
index c7565d7..881a33a 100755
--- a/containers/libreportal/frontend/features/admin/config-manager.js
+++ b/containers/libreportal/frontend/components/admin/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('/features/admin/admin-overview.js'),
-          lazyLoad('/features/admin/charts.js')
+          lazyLoad('/components/admin/admin-overview.js'),
+          lazyLoad('/components/admin/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('/features/admin/ssh-page.js');
+        await lazyLoad('/components/admin/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('/features/admin/peers-page.js');
+        await lazyLoad('/components/admin/peers-page.js');
         try {
-          const html = await fetch('/html/peers-content.html').then(r => r.text());
+          const html = await fetch('/components/admin/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('/features/admin/charts.js'),
-          lazyLoad('/features/admin/admin-system.js'),
-          lazyLoad('/features/admin/system-metric-page.js'),
-          lazyLoad('/features/admin/system-storage-page.js')
+          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')
         ]);
         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="/icons/config/' + catIcon + '.svg" alt="" onerror="this.style.display=\'none\'">' +
+              '<img class="page-header-icon" src="/core/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/features/admin/config-renderer.js b/containers/libreportal/frontend/components/admin/config-renderer.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/config-renderer.js
rename to containers/libreportal/frontend/components/admin/config-renderer.js
diff --git a/containers/libreportal/frontend/features/admin/config-sidebar.js b/containers/libreportal/frontend/components/admin/config-sidebar.js
similarity index 99%
rename from containers/libreportal/frontend/features/admin/config-sidebar.js
rename to containers/libreportal/frontend/components/admin/config-sidebar.js
index 3a9f4b7..5960f7d 100755
--- a/containers/libreportal/frontend/features/admin/config-sidebar.js
+++ b/containers/libreportal/frontend/components/admin/config-sidebar.js
@@ -88,7 +88,7 @@ class ConfigSidebar {
       
       // Use correct icon from our new structure
       const iconName = category.icon || category.id;
-      const iconPath = '/icons/config/' + iconName + '.svg';
+      const iconPath = '/core/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/features/admin/config-utils.js b/containers/libreportal/frontend/components/admin/config-utils.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/config-utils.js
rename to containers/libreportal/frontend/components/admin/config-utils.js
diff --git a/containers/libreportal/frontend/features/admin/config-validator.js b/containers/libreportal/frontend/components/admin/config-validator.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/config-validator.js
rename to containers/libreportal/frontend/components/admin/config-validator.js
diff --git a/containers/libreportal/frontend/features/admin/domain-manager.js b/containers/libreportal/frontend/components/admin/domain-manager.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/domain-manager.js
rename to containers/libreportal/frontend/components/admin/domain-manager.js
diff --git a/containers/libreportal/frontend/features/admin/feature.json b/containers/libreportal/frontend/components/admin/feature.json
similarity index 79%
rename from containers/libreportal/frontend/features/admin/feature.json
rename to containers/libreportal/frontend/components/admin/feature.json
index 3fdf44b..28f39f1 100644
--- a/containers/libreportal/frontend/features/admin/feature.json
+++ b/containers/libreportal/frontend/components/admin/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "admin",
   "routes": ["/admin", "/admin*"],
-  "module": "/features/admin/index.js",
+  "module": "/components/admin/index.js",
   "handler": "handleAdmin",
   "navId": "nav-config",
   "nav": { "label": "Admin", "order": 40 },
diff --git a/containers/libreportal/frontend/features/admin/index.js b/containers/libreportal/frontend/components/admin/index.js
similarity index 96%
rename from containers/libreportal/frontend/features/admin/index.js
rename to containers/libreportal/frontend/components/admin/index.js
index eb627b4..f5d969d 100644
--- a/containers/libreportal/frontend/features/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('/html/config-content.html');
+    const html = await ctx.loadFragment('/components/admin/config-content.html');
     ctx.setContent(html, 'Admin');
 
     if (window.configManager) {
diff --git a/containers/libreportal/frontend/features/admin/ip-whitelist-manager.js b/containers/libreportal/frontend/components/admin/ip-whitelist-manager.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/ip-whitelist-manager.js
rename to containers/libreportal/frontend/components/admin/ip-whitelist-manager.js
diff --git a/containers/libreportal/frontend/features/admin/ip-whitelist.css b/containers/libreportal/frontend/components/admin/ip-whitelist.css
similarity index 100%
rename from containers/libreportal/frontend/features/admin/ip-whitelist.css
rename to containers/libreportal/frontend/components/admin/ip-whitelist.css
diff --git a/containers/libreportal/frontend/html/peers-content.html b/containers/libreportal/frontend/components/admin/peers-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/peers-content.html
rename to containers/libreportal/frontend/components/admin/peers-content.html
diff --git a/containers/libreportal/frontend/features/admin/peers-page.js b/containers/libreportal/frontend/components/admin/peers-page.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/peers-page.js
rename to containers/libreportal/frontend/components/admin/peers-page.js
diff --git a/containers/libreportal/frontend/features/admin/ssh-page.js b/containers/libreportal/frontend/components/admin/ssh-page.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/ssh-page.js
rename to containers/libreportal/frontend/components/admin/ssh-page.js
diff --git a/containers/libreportal/frontend/features/admin/ssh.css b/containers/libreportal/frontend/components/admin/ssh.css
similarity index 100%
rename from containers/libreportal/frontend/features/admin/ssh.css
rename to containers/libreportal/frontend/components/admin/ssh.css
diff --git a/containers/libreportal/frontend/features/admin/system-metric-page.js b/containers/libreportal/frontend/components/admin/system-metric-page.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/system-metric-page.js
rename to containers/libreportal/frontend/components/admin/system-metric-page.js
diff --git a/containers/libreportal/frontend/features/admin/system-storage-page.js b/containers/libreportal/frontend/components/admin/system-storage-page.js
similarity index 99%
rename from containers/libreportal/frontend/features/admin/system-storage-page.js
rename to containers/libreportal/frontend/components/admin/system-storage-page.js
index 8a588e6..3b634d2 100644
--- a/containers/libreportal/frontend/features/admin/system-storage-page.js
+++ b/containers/libreportal/frontend/components/admin/system-storage-page.js
@@ -384,9 +384,9 @@ class SystemStoragePage {
     }
 
     // App-icon <img>, falling back to the generic app icon when the slug has no
-    // bundled icon. Icons are served at /icons/apps/<slug>.svg.
+    // bundled icon. Icons are served at /core/icons/apps/<slug>.svg.
     _iconImg(slug) {
-        return `<img class="sys-task-icon" src="/icons/apps/${encodeURIComponent(slug)}.svg" alt="" onerror="this.onerror=null;this.src='/icons/apps/default.svg'">`;
+        return `<img class="sys-task-icon" src="/core/icons/apps/${encodeURIComponent(slug)}.svg" alt="" onerror="this.onerror=null;this.src='/core/icons/apps/default.svg'">`;
     }
 
     _appIconHtml(app) {
diff --git a/containers/libreportal/frontend/features/admin/toggle-manager.js b/containers/libreportal/frontend/components/admin/toggle-manager.js
similarity index 100%
rename from containers/libreportal/frontend/features/admin/toggle-manager.js
rename to containers/libreportal/frontend/components/admin/toggle-manager.js
diff --git a/containers/libreportal/frontend/features/app-detail/feature.json b/containers/libreportal/frontend/components/app-detail/feature.json
similarity index 73%
rename from containers/libreportal/frontend/features/app-detail/feature.json
rename to containers/libreportal/frontend/components/app-detail/feature.json
index 8def3a7..ffdf149 100644
--- a/containers/libreportal/frontend/features/app-detail/feature.json
+++ b/containers/libreportal/frontend/components/app-detail/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "app-detail",
   "routes": ["/app", "/app*"],
-  "module": "/features/app-detail/index.js",
+  "module": "/components/app-detail/index.js",
   "handler": "handleAppDetail",
   "navId": "nav-app-center",
   "order": 25
diff --git a/containers/libreportal/frontend/features/app-detail/index.js b/containers/libreportal/frontend/components/app-detail/index.js
similarity index 96%
rename from containers/libreportal/frontend/features/app-detail/index.js
rename to containers/libreportal/frontend/components/app-detail/index.js
index 197d220..525bc27 100644
--- a/containers/libreportal/frontend/features/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('/html/apps-unified-layout.html');
+    const html = await ctx.loadFragment('/components/apps/apps-unified-layout.html');
     ctx.setContent(html, appName);
 
     if (!window.appTabbedManager) {
diff --git a/containers/libreportal/frontend/features/apps/app-tabbed-manager.js b/containers/libreportal/frontend/components/apps/app-tabbed-manager.js
similarity index 100%
rename from containers/libreportal/frontend/features/apps/app-tabbed-manager.js
rename to containers/libreportal/frontend/components/apps/app-tabbed-manager.js
diff --git a/containers/libreportal/frontend/features/apps/apps-layout.css b/containers/libreportal/frontend/components/apps/apps-layout.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/apps-layout.css
rename to containers/libreportal/frontend/components/apps/apps-layout.css
diff --git a/containers/libreportal/frontend/features/apps/apps-manager.js b/containers/libreportal/frontend/components/apps/apps-manager.js
similarity index 99%
rename from containers/libreportal/frontend/features/apps/apps-manager.js
rename to containers/libreportal/frontend/components/apps/apps-manager.js
index 9711e6b..bbaad31 100755
--- a/containers/libreportal/frontend/features/apps/apps-manager.js
+++ b/containers/libreportal/frontend/components/apps/apps-manager.js
@@ -522,9 +522,9 @@ class AppsManager {
     } else if (!icon && id === 'installed') {
       iconHtml = '<svg class="category-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>';
     } else {
-      let iconPath = icon || `/icons/categories/${id}.svg`;
+      let iconPath = icon || `/core/icons/categories/${id}.svg`;
       if (!iconPath.startsWith('/')) iconPath = '/' + iconPath;
-      iconHtml = `<img src="${iconPath}" alt="${name}" onerror="this.src='/icons/categories/default.svg'"/>`;
+      iconHtml = `<img src="${iconPath}" alt="${name}" onerror="this.src='/core/icons/categories/default.svg'"/>`;
     }
 
     div.innerHTML = `${iconHtml} ${name}`;
@@ -715,7 +715,7 @@ class AppsManager {
     if (onHiddenTab) {
       window.appTabbedManager.switchTab('config');
     }
-    let icon = app.icon || '/icons/apps/default.svg';
+    let icon = app.icon || '/core/icons/apps/default.svg';
     
     // Ensure absolute path from root
     if (!icon.startsWith('/')) {
@@ -735,7 +735,7 @@ class AppsManager {
     const headerHTML = `
       <div class="app-info">
         <div class="app-card-icon" style="width: 80px; height: 80px; min-width: 80px;">
-          <img src="${icon}" alt="${shortName}" onerror="this.onerror=null; this.src='/icons/apps/default.svg'" style="width: 100%; height: 100%; object-fit: contain;"/>
+          <img src="${icon}" alt="${shortName}" onerror="this.onerror=null; this.src='/core/icons/apps/default.svg'" style="width: 100%; height: 100%; object-fit: contain;"/>
         </div>
         <div class="app-details">
           <h2>${shortName}</h2>
@@ -936,14 +936,14 @@ class AppsManager {
     if (requiredService && !this.checkServiceInstalled(requiredService) && !appData.installed) {
       const slug = requiredService.toLowerCase();
       const serviceLabel = slug.charAt(0).toUpperCase() + slug.slice(1);
-      const iconUrl = `/icons/apps/${encodeURIComponent(slug)}.svg`;
+      const iconUrl = `/core/icons/apps/${encodeURIComponent(slug)}.svg`;
       configSection.innerHTML = `
         <div class="config-title">
           <h3>🛠️ Configuration Settings</h3>
           <p>Configure ${this.escHtml(appData.name)} to match your requirements</p>
         </div>
         <div class="dep-required-card" data-service="${this.escAttr(slug)}">
-          <img src="${iconUrl}" alt="" class="dep-required-icon" onerror="this.onerror=null; this.src='/icons/apps/default.svg';">
+          <img src="${iconUrl}" alt="" class="dep-required-icon" onerror="this.onerror=null; this.src='/core/icons/apps/default.svg';">
           <div class="dep-required-body">
             <div class="dep-required-title">${this.escHtml(serviceLabel)} required</div>
             <div class="dep-required-reason">${this.escHtml(serviceLabel)} needs to be installed before you can configure ${this.escHtml(appData.name)}.</div>
@@ -1764,7 +1764,7 @@ class AppsManager {
     card.dataset.search = searchHaystack;
 
     const appName = app.command.split(' ').pop();
-    let icon = app.icon || '/icons/apps/default.svg';
+    let icon = app.icon || '/core/icons/apps/default.svg';
     
     // Ensure absolute path from root
     if (!icon.startsWith('/')) {
@@ -1809,7 +1809,7 @@ class AppsManager {
     card.innerHTML = `
       <div class="app-card-top" style="cursor: pointer;" onclick="appsManager.showAppDetail('${appName}')">
         <div class="app-card-icon">
-          <img src="${icon}" alt="${app.name}" onerror="this.src='/icons/apps/default.svg'"/>
+          <img src="${icon}" alt="${app.name}" onerror="this.src='/core/icons/apps/default.svg'"/>
         </div>
         <div class="app-card-content">
           <div class="app-card-title" style="cursor: pointer;">${app.name.split(' - ')[0].trim()}</div>
@@ -1889,7 +1889,7 @@ class AppsManager {
       cat.name.toLowerCase() === categoryId.toLowerCase()
     );
     
-    let iconPath = category ? category.icon : `/icons/categories/${categoryId}.svg`;
+    let iconPath = category ? category.icon : `/core/icons/categories/${categoryId}.svg`;
     
     // Ensure absolute path from root
     if (iconPath && !iconPath.startsWith('/')) {
@@ -2041,7 +2041,7 @@ class AppsManager {
     const fieldId = fieldKey;
     const slug = this.serviceForField(fieldKey, fieldConfig);
     const serviceName = slug ? slug.charAt(0).toUpperCase() + slug.slice(1) : '';
-    const iconUrl = slug ? `/icons/apps/${encodeURIComponent(slug)}.svg` : '/icons/apps/default.svg';
+    const iconUrl = slug ? `/core/icons/apps/${encodeURIComponent(slug)}.svg` : '/core/icons/apps/default.svg';
     const isCheckbox = fieldConfig.type === 'checkbox';
     const hiddenInput = isCheckbox
       ? `<input type="hidden" id="${fieldId}" name="${cfgKey}" value="false">`
@@ -2050,7 +2050,7 @@ class AppsManager {
     return `
       <div class="dep-required-card" data-service="${this.escAttr(slug)}">
         ${hiddenInput}
-        <img src="${iconUrl}" alt="" class="dep-required-icon" onerror="this.onerror=null; this.src='/icons/apps/default.svg';">
+        <img src="${iconUrl}" alt="" class="dep-required-icon" onerror="this.onerror=null; this.src='/core/icons/apps/default.svg';">
         <div class="dep-required-body">
           <div class="dep-required-title">${this.escHtml(fieldConfig.label)}</div>
           <div class="dep-required-reason">${this.escHtml(disabledReason)}</div>
@@ -2135,7 +2135,7 @@ class AppsManager {
       });
     }
 
-    const iconUrl = app.icon ? (app.icon.startsWith('/') ? app.icon : '/' + app.icon) : `/icons/apps/${slug}.svg`;
+    const iconUrl = app.icon ? (app.icon.startsWith('/') ? app.icon : '/' + app.icon) : `/core/icons/apps/${slug}.svg`;
     const shortName = app.name.split(' - ')[0];
 
     const eoBadges = badges.map(b => ({
@@ -2352,12 +2352,12 @@ class AppsManager {
             const cfgKey = `CFG_${a.slug.toUpperCase()}_NETWORK`;
             const current = (a.config && a.config[cfgKey]) || 'default';
             const checked = current === 'gluetun' ? 'checked' : '';
-            const icon = a.icon ? (a.icon.startsWith('/') ? a.icon : '/' + a.icon) : '/icons/apps/default.svg';
+            const icon = a.icon ? (a.icon.startsWith('/') ? a.icon : '/' + a.icon) : '/core/icons/apps/default.svg';
             return `
               <label class="gluetun-country-item">
                 <input type="checkbox" data-slug="${a.slug}" data-current="${current}" ${checked}>
                 <span class="gluetun-country-name" style="display:flex; align-items:center; gap:10px;">
-                  <img src="${icon}" alt="" style="width:20px; height:20px; object-fit:contain;" onerror="this.onerror=null; this.src='/icons/apps/default.svg';">
+                  <img src="${icon}" alt="" style="width:20px; height:20px; object-fit:contain;" onerror="this.onerror=null; this.src='/core/icons/apps/default.svg';">
                   ${a.name || a.slug}
                 </span>
               </label>`;
@@ -2408,7 +2408,7 @@ class AppsManager {
     const existing = document.getElementById('mullvad-generate-modal');
     if (existing) existing.remove();
 
-    const mullvadIcon = (window.gluetunProviderIcons && window.gluetunProviderIcons.mullvad) || '/icons/vpn/mullvad.svg';
+    const mullvadIcon = (window.gluetunProviderIcons && window.gluetunProviderIcons.mullvad) || '/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
@@ -3144,7 +3144,7 @@ class AppsManager {
     if (existing) existing.remove();
 
     const displayName = appData?.name?.split(' - ')[0]?.trim() || appName;
-    let icon = appData?.icon || `/icons/apps/${appName}.svg`;
+    let icon = appData?.icon || `/core/icons/apps/${appName}.svg`;
     if (icon && !icon.startsWith('/')) icon = '/' + icon;
 
     const bodyHtml = `
@@ -3350,11 +3350,11 @@ class AppsManager {
       
       // Only load scripts if they're not already loaded
       const scripts = [
-        { name: 'TaskManager', src: '/shared/task/task-manager.js' },
-        { name: 'TaskCommands', src: '/shared/task/task-commands.js' },
-        { name: 'TaskActions', src: '/shared/task/task-actions.js' },
-        { name: 'TaskRouter', src: '/shared/task/task-router.js' },
-        { name: 'TasksManager', src: '/features/tasks/tasks-manager.js' }
+        { name: 'TaskManager', src: '/core/lib/task-manager.js' },
+        { name: 'TaskCommands', src: '/core/lib/task-commands.js' },
+        { name: 'TaskActions', src: '/core/lib/task-actions.js' },
+        { name: 'TaskRouter', src: '/core/lib/task-router.js' },
+        { name: 'TasksManager', src: '/components/tasks/tasks-manager.js' }
       ];
       
       for (const script of scripts) {
@@ -3761,7 +3761,7 @@ class AppsManager {
 
   showUpdateConfirmModal(appName) {
     let displayName = appName;
-    let icon = `/icons/apps/${appName}.svg`;
+    let icon = `/core/icons/apps/${appName}.svg`;
     if (window.apps) {
       const app = window.apps.find(a =>
         (a.command || '').endsWith(` ${appName}`) ||
@@ -3820,7 +3820,7 @@ class AppsManager {
   // Confirmation modal for the destructive "Uninstall App" action.
   showUninstallConfirmModal(appName) {
     let displayName = appName;
-    let icon = `/icons/apps/${appName}.svg`;
+    let icon = `/core/icons/apps/${appName}.svg`;
     let app = null;
     if (window.apps) {
       app = window.apps.find(a =>
diff --git a/containers/libreportal/frontend/html/apps-unified-layout.html b/containers/libreportal/frontend/components/apps/apps-unified-layout.html
similarity index 100%
rename from containers/libreportal/frontend/html/apps-unified-layout.html
rename to containers/libreportal/frontend/components/apps/apps-unified-layout.html
diff --git a/containers/libreportal/frontend/features/apps/apps.css b/containers/libreportal/frontend/components/apps/apps.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/apps.css
rename to containers/libreportal/frontend/components/apps/apps.css
diff --git a/containers/libreportal/frontend/features/apps/feature.json b/containers/libreportal/frontend/components/apps/feature.json
similarity index 80%
rename from containers/libreportal/frontend/features/apps/feature.json
rename to containers/libreportal/frontend/components/apps/feature.json
index 541143e..660b2cc 100644
--- a/containers/libreportal/frontend/features/apps/feature.json
+++ b/containers/libreportal/frontend/components/apps/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "apps",
   "routes": ["/apps", "/apps*"],
-  "module": "/features/apps/index.js",
+  "module": "/components/apps/index.js",
   "handler": "handleApps",
   "navId": "nav-app-center",
   "nav": { "label": "App Center", "order": 20 },
diff --git a/containers/libreportal/frontend/features/apps/index.js b/containers/libreportal/frontend/components/apps/index.js
similarity index 95%
rename from containers/libreportal/frontend/features/apps/index.js
rename to containers/libreportal/frontend/components/apps/index.js
index 2f19e3f..c9a7ce4 100644
--- a/containers/libreportal/frontend/features/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('/html/apps-unified-layout.html');
+      const html = await ctx.loadFragment('/components/apps/apps-unified-layout.html');
       ctx.setContent(html, 'Applications');
     }
 
diff --git a/containers/libreportal/frontend/features/apps/port-manager.css b/containers/libreportal/frontend/components/apps/port-manager.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/port-manager.css
rename to containers/libreportal/frontend/components/apps/port-manager.css
diff --git a/containers/libreportal/frontend/features/apps/port-manager.js b/containers/libreportal/frontend/components/apps/port-manager.js
similarity index 100%
rename from containers/libreportal/frontend/features/apps/port-manager.js
rename to containers/libreportal/frontend/components/apps/port-manager.js
diff --git a/containers/libreportal/frontend/features/apps/routing-manager.js b/containers/libreportal/frontend/components/apps/routing-manager.js
similarity index 99%
rename from containers/libreportal/frontend/features/apps/routing-manager.js
rename to containers/libreportal/frontend/components/apps/routing-manager.js
index 5ffa4ae..3087b36 100644
--- a/containers/libreportal/frontend/features/apps/routing-manager.js
+++ b/containers/libreportal/frontend/components/apps/routing-manager.js
@@ -93,7 +93,7 @@ class RoutingManager {
     const renderRow = (p) => {
       const app = byApp.get(p.appSlug);
       const url = this._previewUrl(p, app);
-      const iconUrl = `/icons/apps/${encodeURIComponent(p.appSlug)}.svg`;
+      const iconUrl = `/core/icons/apps/${encodeURIComponent(p.appSlug)}.svg`;
       const badges = [
         p.webui ? '<span class="routing-badge routing-badge-webui" title="Marked as the webui (click-to-open) port">webui</span>' : '',
         p.access === 'public' ? '<span class="routing-badge routing-badge-public" title="Host port is exposed">public</span>' : ''
diff --git a/containers/libreportal/frontend/features/apps/routing.css b/containers/libreportal/frontend/components/apps/routing.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/routing.css
rename to containers/libreportal/frontend/components/apps/routing.css
diff --git a/containers/libreportal/frontend/features/apps/service-buttons.css b/containers/libreportal/frontend/components/apps/service-buttons.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/service-buttons.css
rename to containers/libreportal/frontend/components/apps/service-buttons.css
diff --git a/containers/libreportal/frontend/features/apps/services-manager.js b/containers/libreportal/frontend/components/apps/services-manager.js
similarity index 99%
rename from containers/libreportal/frontend/features/apps/services-manager.js
rename to containers/libreportal/frontend/components/apps/services-manager.js
index 796eeda..ae776b5 100644
--- a/containers/libreportal/frontend/features/apps/services-manager.js
+++ b/containers/libreportal/frontend/components/apps/services-manager.js
@@ -399,7 +399,7 @@ class ServicesManager {
       : (svc.openUrl ? [{ url: svc.openUrl, label: svc.openLabel || 'Open' }] : []);
     const openBtn = linksToRender.map(l => renderOpenBtn(l.url, l.label)).join('');
 
-    const iconUrl = this.currentApp ? `/icons/apps/${encodeURIComponent(this.currentApp)}.svg` : '';
+    const iconUrl = this.currentApp ? `/core/icons/apps/${encodeURIComponent(this.currentApp)}.svg` : '';
     const iconHtml = iconUrl
       ? `<img src="${iconUrl}" alt="${escapeHtml(this.currentApp || '')}" class="task-app-icon service-app-icon" onerror="this.style.display='none'">`
       : '';
diff --git a/containers/libreportal/frontend/features/apps/services.css b/containers/libreportal/frontend/components/apps/services.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/services.css
rename to containers/libreportal/frontend/components/apps/services.css
diff --git a/containers/libreportal/frontend/features/apps/tools-manager.js b/containers/libreportal/frontend/components/apps/tools-manager.js
similarity index 99%
rename from containers/libreportal/frontend/features/apps/tools-manager.js
rename to containers/libreportal/frontend/components/apps/tools-manager.js
index a38ceb8..053fa29 100644
--- a/containers/libreportal/frontend/features/apps/tools-manager.js
+++ b/containers/libreportal/frontend/components/apps/tools-manager.js
@@ -101,7 +101,7 @@ class ToolsManager {
     const deleteTool  = tools.find(t => t.id === 'delete_user');
     const adminTool   = tools.find(t => t.id === 'set_admin');
     const appLabel = (window.getAppDisplayName ? window.getAppDisplayName(appName) : appName);
-    const iconUrl = `/icons/apps/${encodeURIComponent(appName)}.svg`;
+    const iconUrl = `/core/icons/apps/${encodeURIComponent(appName)}.svg`;
 
     // Reopen this exact modal (used as returnTo when a row action's
     // sub-modal is cancelled — keeps the user in flow instead of
@@ -440,7 +440,7 @@ class ToolsManager {
     const prefill = (opts && opts.prefill) || {};
     const returnTo = opts && opts.returnTo;
     let submitted = false;
-    const appIconUrl = this.currentApp ? `/icons/apps/${encodeURIComponent(this.currentApp)}.svg` : '';
+    const appIconUrl = this.currentApp ? `/core/icons/apps/${encodeURIComponent(this.currentApp)}.svg` : '';
     const bodyHtml = `
       ${tool.confirm ? `<div class="tool-modal-confirm">${escapeHtml(tool.confirm)}</div>` : ''}
       <form class="tool-form">
@@ -592,7 +592,7 @@ class ToolsManager {
       .sort((x, y) => (x.app.name || x.slug).localeCompare(y.app.name || y.slug))
       .map(({ app, slug }) => {
         const checked = selected.has(slug) ? 'checked' : '';
-        const iconUrl = `/icons/apps/${encodeURIComponent(slug)}.svg`;
+        const iconUrl = `/core/icons/apps/${encodeURIComponent(slug)}.svg`;
         const displayName = escapeHtml(app.name || slug);
         return `
           <label class="installed-apps-item">
@@ -763,7 +763,7 @@ class ToolsManager {
 
       list.innerHTML = flat.map(u => {
         const checked = selected.has(u.id) ? 'checked' : '';
-        const iconUrl = `/icons/apps/${encodeURIComponent(u.slug)}.svg`;
+        const iconUrl = `/core/icons/apps/${encodeURIComponent(u.slug)}.svg`;
         const appLabel = displayName(u.slug);
         const showButton = u.label && u.label !== appLabel;
         const fullLabel = showButton
diff --git a/containers/libreportal/frontend/features/apps/tools.css b/containers/libreportal/frontend/components/apps/tools.css
similarity index 100%
rename from containers/libreportal/frontend/features/apps/tools.css
rename to containers/libreportal/frontend/components/apps/tools.css
diff --git a/containers/libreportal/frontend/html/backup-content.html b/containers/libreportal/frontend/components/backup/backup-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/backup-content.html
rename to containers/libreportal/frontend/components/backup/backup-content.html
diff --git a/containers/libreportal/frontend/features/backup/backup-page.js b/containers/libreportal/frontend/components/backup/backup-page.js
similarity index 99%
rename from containers/libreportal/frontend/features/backup/backup-page.js
rename to containers/libreportal/frontend/components/backup/backup-page.js
index 82bf636..16caab6 100644
--- a/containers/libreportal/frontend/features/backup/backup-page.js
+++ b/containers/libreportal/frontend/components/backup/backup-page.js
@@ -646,7 +646,7 @@ class BackupPage {
         const when = has ? 'Last backed up ' + this.formatRelative(sys.latest_time) : 'No backup yet';
         return `
             <div class="backup-app-tile backup-app-tile--system" data-system="1" title="Back up system config">
-                <img class="backup-app-tile-icon" src="/icons/apps/libreportal.svg" alt="" onerror="this.style.display='none'">
+                <img class="backup-app-tile-icon" src="/core/icons/apps/libreportal.svg" alt="" onerror="this.style.display='none'">
                 <div class="backup-app-tile-text">
                     <div class="backup-app-tile-name">Configs</div>
                     <div class="backup-app-tile-meta">
@@ -680,7 +680,7 @@ class BackupPage {
             const command = a.command || '';
             return command.endsWith(` ${slug}`) || a.name?.toLowerCase() === slug.toLowerCase();
         });
-        let icon = match?.icon || '/icons/apps/default.svg';
+        let icon = match?.icon || '/core/icons/apps/default.svg';
         if (!icon.startsWith('/')) icon = '/' + icon;
         const displayName = (typeof window.getAppDisplayName === 'function')
             ? window.getAppDisplayName(slug)
@@ -695,7 +695,7 @@ class BackupPage {
         const { icon, displayName } = this.appMeta(app.app);
         return `
             <div class="backup-app-tile" data-app="${this.escape(app.app)}" title="Open ${this.escape(displayName)} backup history">
-                <img class="backup-app-tile-icon" src="${this.escape(icon)}" alt="" onerror="this.src='/icons/apps/default.svg'">
+                <img class="backup-app-tile-icon" src="${this.escape(icon)}" alt="" onerror="this.src='/core/icons/apps/default.svg'">
                 <div class="backup-app-tile-text">
                     <div class="backup-app-tile-name">${this.escape(displayName)}</div>
                     <div class="backup-app-tile-meta">
@@ -1056,7 +1056,7 @@ class BackupPage {
         const deepLink = hasApp
             ? `/app/${encodeURIComponent(r.app)}/backups?snapshot=${encodeURIComponent(r.id)}`
             : null;
-        const iconUrl = hasApp ? `/icons/apps/${encodeURIComponent(r.app)}.svg` : '/icons/apps/libreportal.svg';
+        const iconUrl = hasApp ? `/core/icons/apps/${encodeURIComponent(r.app)}.svg` : '/core/icons/apps/libreportal.svg';
         const displayName = hasApp ? this.appMeta(r.app).displayName : 'Configs';
         const appChip = hasApp
             ? `<a class="backup-snapshot-link backup-snapshot-app-chip" href="${this.escape(deepLink)}" data-deep-link="${this.escape(deepLink)}" title="Open ${this.escape(displayName)} backups">${this.escape(displayName)}</a>`
@@ -1980,7 +1980,7 @@ class BackupPage {
             : 'No backup yet';
 
         const rows = [
-            row('__system__', '/icons/apps/libreportal.svg', 'Configs', sysSub, preTickSystem),
+            row('__system__', '/core/icons/apps/libreportal.svg', 'Configs', sysSub, preTickSystem),
             ...sortedApps.map(app => {
                 const meta = this.appMeta(app.app);
                 const sub = app.latest_snapshot
diff --git a/containers/libreportal/frontend/features/backup/backup-schema.js b/containers/libreportal/frontend/components/backup/backup-schema.js
similarity index 100%
rename from containers/libreportal/frontend/features/backup/backup-schema.js
rename to containers/libreportal/frontend/components/backup/backup-schema.js
diff --git a/containers/libreportal/frontend/features/backup/backup.css b/containers/libreportal/frontend/components/backup/backup.css
similarity index 100%
rename from containers/libreportal/frontend/features/backup/backup.css
rename to containers/libreportal/frontend/components/backup/backup.css
diff --git a/containers/libreportal/frontend/features/backup/feature.json b/containers/libreportal/frontend/components/backup/feature.json
similarity index 80%
rename from containers/libreportal/frontend/features/backup/feature.json
rename to containers/libreportal/frontend/components/backup/feature.json
index e461120..344dda9 100644
--- a/containers/libreportal/frontend/features/backup/feature.json
+++ b/containers/libreportal/frontend/components/backup/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "backup",
   "routes": ["/backup", "/backup*"],
-  "module": "/features/backup/index.js",
+  "module": "/components/backup/index.js",
   "handler": "handleBackup",
   "navId": "nav-backup",
   "nav": { "label": "Backups", "order": 50 },
diff --git a/containers/libreportal/frontend/features/backup/index.js b/containers/libreportal/frontend/components/backup/index.js
similarity index 89%
rename from containers/libreportal/frontend/features/backup/index.js
rename to containers/libreportal/frontend/components/backup/index.js
index 64e3551..e0f5b88 100644
--- a/containers/libreportal/frontend/features/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: [
-    '/features/backup/backup-schema.js',
-    '/features/backup/backup-page.js',
-    '/shared/js/backup-app-card.js',
+    '/components/backup/backup-schema.js',
+    '/components/backup/backup-page.js',
+    '/core/lib/backup-app-card.js',
   ],
 
   async mount(ctx) {
     await ctx.loadScripts(this.scripts);
-    const html = await ctx.loadFragment('/html/backup-content.html');
+    const html = await ctx.loadFragment('/components/backup/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/features/config-redirect/feature.json b/containers/libreportal/frontend/components/config-redirect/feature.json
similarity index 100%
rename from containers/libreportal/frontend/features/config-redirect/feature.json
rename to containers/libreportal/frontend/components/config-redirect/feature.json
diff --git a/containers/libreportal/frontend/html/dashboard-content.html b/containers/libreportal/frontend/components/dashboard/dashboard-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/dashboard-content.html
rename to containers/libreportal/frontend/components/dashboard/dashboard-content.html
diff --git a/containers/libreportal/frontend/features/dashboard/dashboard.css b/containers/libreportal/frontend/components/dashboard/dashboard.css
similarity index 100%
rename from containers/libreportal/frontend/features/dashboard/dashboard.css
rename to containers/libreportal/frontend/components/dashboard/dashboard.css
diff --git a/containers/libreportal/frontend/features/dashboard/dashboard.js b/containers/libreportal/frontend/components/dashboard/dashboard.js
similarity index 98%
rename from containers/libreportal/frontend/features/dashboard/dashboard.js
rename to containers/libreportal/frontend/components/dashboard/dashboard.js
index 47e8b84..f153f0c 100755
--- a/containers/libreportal/frontend/features/dashboard/dashboard.js
+++ b/containers/libreportal/frontend/components/dashboard/dashboard.js
@@ -34,14 +34,14 @@ function renderInstalledApps() {
 
 function createInstalledAppCard(app) {
   const appName = app.command.split(' ').pop();
-  let icon = app.icon || '/icons/apps/default.svg';
+  let icon = app.icon || '/core/icons/apps/default.svg';
   if (!icon.startsWith('/')) icon = '/' + icon;
   const shortName = app.name.split(' - ')[0].trim();
 
   return `
     <div class="frontpage-app-tile" onclick="window.location.href='/app/${appName}'">
       <div class="frontpage-app-icon-wrap">
-        <img src="${icon}" alt="${shortName}" onerror="this.src='/icons/apps/default.svg'">
+        <img src="${icon}" alt="${shortName}" onerror="this.src='/core/icons/apps/default.svg'">
         <div class="frontpage-app-overlay" id="frontpage-overlay-${appName}" onclick="event.stopPropagation()"></div>
       </div>
       <span class="frontpage-app-name">${shortName}</span>
diff --git a/containers/libreportal/frontend/features/dashboard/feature.json b/containers/libreportal/frontend/components/dashboard/feature.json
similarity index 79%
rename from containers/libreportal/frontend/features/dashboard/feature.json
rename to containers/libreportal/frontend/components/dashboard/feature.json
index 561bbfe..508432f 100644
--- a/containers/libreportal/frontend/features/dashboard/feature.json
+++ b/containers/libreportal/frontend/components/dashboard/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "dashboard",
   "routes": ["/", "/dashboard"],
-  "module": "/features/dashboard/index.js",
+  "module": "/components/dashboard/index.js",
   "handler": "handleDashboard",
   "navId": "nav-dashboard",
   "nav": { "label": "Dashboard", "order": 10 },
diff --git a/containers/libreportal/frontend/features/dashboard/index.js b/containers/libreportal/frontend/components/dashboard/index.js
similarity index 95%
rename from containers/libreportal/frontend/features/dashboard/index.js
rename to containers/libreportal/frontend/components/dashboard/index.js
index 19e978a..c6ccc15 100644
--- a/containers/libreportal/frontend/features/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('/html/dashboard-content.html');
+    const html = await ctx.loadFragment('/components/dashboard/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/features/manifest.dev.json b/containers/libreportal/frontend/components/manifest.dev.json
similarity index 86%
rename from containers/libreportal/frontend/features/manifest.dev.json
rename to containers/libreportal/frontend/components/manifest.dev.json
index c61da5a..8ae620d 100644
--- a/containers/libreportal/frontend/features/manifest.dev.json
+++ b/containers/libreportal/frontend/components/manifest.dev.json
@@ -5,7 +5,7 @@
     {
       "id": "dashboard",
       "routes": ["/", "/dashboard"],
-      "module": "/features/dashboard/index.js",
+      "module": "/components/dashboard/index.js",
       "handler": "handleDashboard",
       "navId": "nav-dashboard",
       "nav": { "label": "Dashboard", "order": 10 }
@@ -13,7 +13,7 @@
     {
       "id": "apps",
       "routes": ["/apps", "/apps*"],
-      "module": "/features/apps/index.js",
+      "module": "/components/apps/index.js",
       "handler": "handleApps",
       "navId": "nav-app-center",
       "nav": { "label": "App Center", "order": 20 }
@@ -21,14 +21,14 @@
     {
       "id": "app-detail",
       "routes": ["/app", "/app*"],
-      "module": "/features/app-detail/index.js",
+      "module": "/components/app-detail/index.js",
       "handler": "handleAppDetail",
       "navId": "nav-app-center"
     },
     {
       "id": "admin",
       "routes": ["/admin", "/admin*"],
-      "module": "/features/admin/index.js",
+      "module": "/components/admin/index.js",
       "handler": "handleAdmin",
       "navId": "nav-config",
       "nav": { "label": "Admin", "order": 40 }
@@ -42,7 +42,7 @@
     {
       "id": "tasks",
       "routes": ["/tasks", "/tasks*"],
-      "module": "/features/tasks/index.js",
+      "module": "/components/tasks/index.js",
       "handler": "handleTasks",
       "navId": "nav-tasks",
       "nav": { "label": "Tasks", "order": 60 }
@@ -50,14 +50,14 @@
     {
       "id": "updater",
       "routes": ["/updater", "/updater*"],
-      "module": "/features/updater/index.js",
+      "module": "/components/updater/index.js",
       "navId": "nav-updater",
       "nav": { "label": "Updates", "order": 30 }
     },
     {
       "id": "backup",
       "routes": ["/backup", "/backup*"],
-      "module": "/features/backup/index.js",
+      "module": "/components/backup/index.js",
       "handler": "handleBackup",
       "navId": "nav-backup",
       "nav": { "label": "Backups", "order": 50 }
diff --git a/containers/libreportal/frontend/features/peers/feature.json b/containers/libreportal/frontend/components/peers/feature.json
similarity index 100%
rename from containers/libreportal/frontend/features/peers/feature.json
rename to containers/libreportal/frontend/components/peers/feature.json
diff --git a/containers/libreportal/frontend/features/ssh/feature.json b/containers/libreportal/frontend/components/ssh/feature.json
similarity index 100%
rename from containers/libreportal/frontend/features/ssh/feature.json
rename to containers/libreportal/frontend/components/ssh/feature.json
diff --git a/containers/libreportal/frontend/features/tasks/feature.json b/containers/libreportal/frontend/components/tasks/feature.json
similarity index 79%
rename from containers/libreportal/frontend/features/tasks/feature.json
rename to containers/libreportal/frontend/components/tasks/feature.json
index 16a51dc..ec037f5 100644
--- a/containers/libreportal/frontend/features/tasks/feature.json
+++ b/containers/libreportal/frontend/components/tasks/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "tasks",
   "routes": ["/tasks", "/tasks*"],
-  "module": "/features/tasks/index.js",
+  "module": "/components/tasks/index.js",
   "handler": "handleTasks",
   "navId": "nav-tasks",
   "nav": { "label": "Tasks", "order": 60 },
diff --git a/containers/libreportal/frontend/features/tasks/index.js b/containers/libreportal/frontend/components/tasks/index.js
similarity index 95%
rename from containers/libreportal/frontend/features/tasks/index.js
rename to containers/libreportal/frontend/components/tasks/index.js
index 5899c18..d217769 100644
--- a/containers/libreportal/frontend/features/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('/html/tasks-content.html');
+    const html = await ctx.loadFragment('/components/tasks/tasks-content.html');
     ctx.setContent(html, 'Tasks');
 
     if (window.tasksManager) {
diff --git a/containers/libreportal/frontend/html/tasks-content.html b/containers/libreportal/frontend/components/tasks/tasks-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/tasks-content.html
rename to containers/libreportal/frontend/components/tasks/tasks-content.html
diff --git a/containers/libreportal/frontend/features/tasks/tasks-manager.js b/containers/libreportal/frontend/components/tasks/tasks-manager.js
similarity index 99%
rename from containers/libreportal/frontend/features/tasks/tasks-manager.js
rename to containers/libreportal/frontend/components/tasks/tasks-manager.js
index 0444b36..ef22945 100755
--- a/containers/libreportal/frontend/features/tasks/tasks-manager.js
+++ b/containers/libreportal/frontend/components/tasks/tasks-manager.js
@@ -119,8 +119,8 @@ class TasksManager {
         ? 'LibrePortal'
         : ((appName && window.getAppDisplayName) ? window.getAppDisplayName(appName) : (appName || '')));
     const icon = isSystemTask
-      ? '/icons/libreportal.svg'
-      : (appName ? `/icons/apps/${encodeURIComponent(appName)}.svg` : null);
+      ? '/core/icons/libreportal.svg'
+      : (appName ? `/core/icons/apps/${encodeURIComponent(appName)}.svg` : null);
     const typeIcon = (this.getTaskTypeIcon ? this.getTaskTypeIcon(task)?.icon : '') || '';
     return { appName, isSystemTask, actionTitle, displayName, icon, typeIcon };
   }
@@ -1112,7 +1112,7 @@ class TasksManager {
   renderTaskIcons(task) {
     const typeIcon = `<span class="task-type-icon">${this.getTaskTypeIcon(task).icon}</span>`;
     // `app: 'system'` is a category sentinel (config_update, system_update, …),
-    // not a real app slug, so it has no /icons/apps/system.svg — fall through
+    // not a real app slug, so it has no /core/icons/apps/system.svg — fall through
     // to the LibrePortal-system branch so those tasks still get a logo.
     const isSystemSentinel = task.app === 'system';
     if (task.app && !isSystemSentinel) {
@@ -1120,7 +1120,7 @@ class TasksManager {
       return `${typeIcon}<img src="${appIconPath}" alt="${task.app}" class="task-app-icon" onerror="this.style.display='none'">`;
     }
     if (isSystemSentinel || this.isLibrePortalSystemTask(task)) {
-      return `${typeIcon}<img src="/icons/libreportal.svg" alt="LibrePortal" class="task-app-icon">`;
+      return `${typeIcon}<img src="/core/icons/libreportal.svg" alt="LibrePortal" class="task-app-icon">`;
     }
     return typeIcon;
   }
@@ -1137,7 +1137,7 @@ class TasksManager {
     }
     
     // Default icon path
-    return `/icons/apps/${task.app}.svg`;
+    return `/core/icons/apps/${task.app}.svg`;
   }
 
   updateStats() {
diff --git a/containers/libreportal/frontend/features/tasks/tasks.css b/containers/libreportal/frontend/components/tasks/tasks.css
similarity index 100%
rename from containers/libreportal/frontend/features/tasks/tasks.css
rename to containers/libreportal/frontend/components/tasks/tasks.css
diff --git a/containers/libreportal/frontend/features/updater/feature.json b/containers/libreportal/frontend/components/updater/feature.json
similarity index 89%
rename from containers/libreportal/frontend/features/updater/feature.json
rename to containers/libreportal/frontend/components/updater/feature.json
index c37d28d..39ba73a 100644
--- a/containers/libreportal/frontend/features/updater/feature.json
+++ b/containers/libreportal/frontend/components/updater/feature.json
@@ -1,7 +1,7 @@
 {
   "id": "updater",
   "routes": ["/updater", "/updater*"],
-  "module": "/features/updater/index.js",
+  "module": "/components/updater/index.js",
   "navId": "nav-updater",
   "nav": { "label": "Updates", "order": 30 },
   "order": 30,
diff --git a/containers/libreportal/frontend/features/updater/index.js b/containers/libreportal/frontend/components/updater/index.js
similarity index 90%
rename from containers/libreportal/frontend/features/updater/index.js
rename to containers/libreportal/frontend/components/updater/index.js
index 44d8ce2..d9d9c9f 100644
--- a/containers/libreportal/frontend/features/updater/index.js
+++ b/containers/libreportal/frontend/components/updater/index.js
@@ -9,11 +9,11 @@
 LP.features.register({
   id: 'updater',
   routes: ['/updater', '/updater*'],
-  scripts: ['/features/updater/updater-page.js'],
+  scripts: ['/components/updater/updater-page.js'],
 
   async mount(ctx) {
     await ctx.loadScripts(this.scripts);
-    const html = await ctx.loadFragment('/html/updater-content.html');
+    const html = await ctx.loadFragment('/components/updater/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/html/updater-content.html b/containers/libreportal/frontend/components/updater/updater-content.html
similarity index 100%
rename from containers/libreportal/frontend/html/updater-content.html
rename to containers/libreportal/frontend/components/updater/updater-content.html
diff --git a/containers/libreportal/frontend/features/updater/updater-page.js b/containers/libreportal/frontend/components/updater/updater-page.js
similarity index 100%
rename from containers/libreportal/frontend/features/updater/updater-page.js
rename to containers/libreportal/frontend/components/updater/updater-page.js
diff --git a/containers/libreportal/frontend/features/updater/updater.css b/containers/libreportal/frontend/components/updater/updater.css
similarity index 100%
rename from containers/libreportal/frontend/features/updater/updater.css
rename to containers/libreportal/frontend/components/updater/updater.css
diff --git a/containers/libreportal/frontend/js/system/auth-manager.js b/containers/libreportal/frontend/core/boot/auth-manager.js
similarity index 97%
rename from containers/libreportal/frontend/js/system/auth-manager.js
rename to containers/libreportal/frontend/core/boot/auth-manager.js
index cbe21dd..d609025 100755
--- a/containers/libreportal/frontend/js/system/auth-manager.js
+++ b/containers/libreportal/frontend/core/boot/auth-manager.js
@@ -64,7 +64,7 @@ class AuthManager {
         <div class="login-content">
           <div class="aurora-header">
             <div class="aurora-logo">
-              <img src="/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
+              <img src="/core/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
               <h1>LibrePortal</h1>
             </div>
             <p class="aurora-subtitle">Step softly back into your own private universe</p>
diff --git a/containers/libreportal/frontend/js/system/custom-number.js b/containers/libreportal/frontend/core/boot/custom-number.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/custom-number.js
rename to containers/libreportal/frontend/core/boot/custom-number.js
diff --git a/containers/libreportal/frontend/js/system/custom-select.js b/containers/libreportal/frontend/core/boot/custom-select.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/custom-select.js
rename to containers/libreportal/frontend/core/boot/custom-select.js
diff --git a/containers/libreportal/frontend/js/system/loading-ui.js b/containers/libreportal/frontend/core/boot/loading-ui.js
similarity index 99%
rename from containers/libreportal/frontend/js/system/loading-ui.js
rename to containers/libreportal/frontend/core/boot/loading-ui.js
index 15a9797..6cb9a45 100755
--- a/containers/libreportal/frontend/js/system/loading-ui.js
+++ b/containers/libreportal/frontend/core/boot/loading-ui.js
@@ -27,7 +27,7 @@ class LoadingUI {
       <div class="loading-container">
         <div class="aurora-header">
           <div class="aurora-logo">
-            <img src="/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
+            <img src="/core/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
             <h1>LibrePortal</h1>
           </div>
           <p class="aurora-subtitle">Drifting softly into your private universe...</p>
diff --git a/containers/libreportal/frontend/js/system/setup-completion-watcher.js b/containers/libreportal/frontend/core/boot/setup-completion-watcher.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/setup-completion-watcher.js
rename to containers/libreportal/frontend/core/boot/setup-completion-watcher.js
diff --git a/containers/libreportal/frontend/js/system/setup-detector.js b/containers/libreportal/frontend/core/boot/setup-detector.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/setup-detector.js
rename to containers/libreportal/frontend/core/boot/setup-detector.js
diff --git a/containers/libreportal/frontend/js/system/setup-wizard.js b/containers/libreportal/frontend/core/boot/setup-wizard.js
similarity index 99%
rename from containers/libreportal/frontend/js/system/setup-wizard.js
rename to containers/libreportal/frontend/core/boot/setup-wizard.js
index 6e67729..1d57e1c 100755
--- a/containers/libreportal/frontend/js/system/setup-wizard.js
+++ b/containers/libreportal/frontend/core/boot/setup-wizard.js
@@ -68,7 +68,7 @@ class SetupWizard {
       <div class="setup-content">
         <div class="aurora-header">
           <div class="aurora-logo">
-            <img src="/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
+            <img src="/core/icons/libreportal.svg" alt="LibrePortal" onload="this.classList.add('loaded')" onerror="this.style.display='none'">
             <h1>LibrePortal</h1>
           </div>
           <p class="aurora-subtitle">Tuning your private universe before takeoff...</p>
@@ -425,7 +425,7 @@ class SetupWizard {
       const app = manifest.get(slug) || {};
       const name = app.title || app.name || fallback.name;
       const desc = app.description || fallback.description;
-      const icon = app.icon || `/icons/apps/${slug}.svg`;
+      const icon = app.icon || `/core/icons/apps/${slug}.svg`;
       // Sub-option lives OUTSIDE the parent label (nested <label> behaviour
       // is messy — clicks would toggle both checkboxes). Both labels are
       // siblings inside a wrapper div; CSS connects them visually.
@@ -440,7 +440,7 @@ class SetupWizard {
           <input type="checkbox" data-app="${slug}" ${defaultChecked ? 'checked' : ''}>
           <div class="setup-app-icon-wrap">
             <img src="${icon}" alt="${name}" class="setup-app-icon"
-                 onerror="this.onerror=null; this.src='/icons/apps/default.svg'">
+                 onerror="this.onerror=null; this.src='/core/icons/apps/default.svg'">
           </div>
           <div class="setup-app-info">
             <div class="setup-app-name">${name}</div>
diff --git a/containers/libreportal/frontend/js/system/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js
similarity index 96%
rename from containers/libreportal/frontend/js/system/system-loader.js
rename to containers/libreportal/frontend/core/boot/system-loader.js
index c618b20..caf7d14 100755
--- a/containers/libreportal/frontend/js/system/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/system-loader.js
@@ -39,18 +39,18 @@ class SystemLoader {
       global: 'configManager',
       dependencies: ['data'],
       scripts: [
-        '/shared/js/config-options.js',
-        '/shared/js/config-shared.js',
-        '/features/admin/config-validator.js',
-        '/features/admin/toggle-manager.js',
-        '/features/admin/config-core.js',
-        '/features/admin/domain-manager.js',
-        '/features/admin/ip-whitelist-manager.js',
-        '/features/admin/config-renderer.js',
-        '/features/admin/config-sidebar.js',
-        '/features/admin/config-form.js',
-        '/features/admin/config-utils.js',
-        '/features/admin/config-manager.js'
+        '/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'
       ]
     });
     
@@ -69,9 +69,9 @@ class SystemLoader {
       global: null,
       dependencies: [],
       scripts: [
-        '/js/components/topbar.js',
-        '/js/components/update-notifier.js',
-        '/js/components/mobile-menu.js'
+        '/core/ui/topbar.js',
+        '/core/ui/update-notifier.js',
+        '/core/ui/mobile-menu.js'
       ]
     });
     
@@ -89,7 +89,7 @@ class SystemLoader {
       },
       global: null,
       dependencies: [],
-      script: '/js/components/confirmation-dialog.js'
+      script: '/core/ui/confirmation-dialog.js'
     });
 
     // Notifications
@@ -106,7 +106,7 @@ class SystemLoader {
       },
       global: 'notificationSystem',
       dependencies: [],
-      script: '/js/components/notifications.js'
+      script: '/core/ui/notifications.js'
     });
     
     // Dashboard
@@ -167,14 +167,14 @@ class SystemLoader {
       global: 'tasksManager',
       dependencies: [],
       scripts: [
-        '/shared/task/task-event-bus.js',
-        '/shared/task/task-commands.js',
-        '/shared/task/task-actions.js',
-        '/shared/task/task-router.js',
-        '/shared/task/task-global-functions.js',
-        '/shared/task/task-manager.js',
-        '/js/task-parameter-preserve.js',
-        '/features/tasks/tasks-manager.js'
+        '/core/lib/task-event-bus.js',
+        '/core/lib/task-commands.js',
+        '/core/lib/task-actions.js',
+        '/core/lib/task-router.js',
+        '/core/lib/task-global-functions.js',
+        '/core/lib/task-manager.js',
+        '/core/lib/task-parameter-preserve.js',
+        '/components/tasks/tasks-manager.js'
       ]
     });
     
@@ -204,13 +204,13 @@ class SystemLoader {
       global: 'appsManager',
       dependencies: ['data'],
       scripts: [
-        '/features/apps/port-manager.js',
-        '/shared/task/task-manager.js',  // Add TaskManager for backup functionality
-        '/shared/js/backup-app-card.js',
-        '/features/apps/services-manager.js',
-        '/features/apps/tools-manager.js',
-        '/features/apps/routing-manager.js',
-        '/features/apps/apps-manager.js'
+        '/components/apps/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'
       ]
     });
     
@@ -232,7 +232,7 @@ class SystemLoader {
       },
       global: 'appTabbedManager',
       dependencies: [],
-      script: '/features/apps/app-tabbed-manager.js'
+      script: '/components/apps/app-tabbed-manager.js'
     });
     
     // console.log('TEST: Components added. Total components:', this.components.size);
@@ -639,9 +639,9 @@ class SystemLoader {
           iconUrls.add(app.icon.startsWith('/') ? app.icon : '/' + app.icon);
         } else {
           const cleanAppName = app.command?.split(' ').pop() || app.name;
-          iconUrls.add(`/icons/apps/${cleanAppName}.svg`);
+          iconUrls.add(`/core/icons/apps/${cleanAppName}.svg`);
         }
-        iconUrls.add('/icons/apps/default.svg');
+        iconUrls.add('/core/icons/apps/default.svg');
       });
     }
 
@@ -655,8 +655,8 @@ class SystemLoader {
     }
 
     // Add 'all' and 'installed' category icons
-    iconUrls.add('/icons/categories/all.svg');
-    iconUrls.add('/icons/categories/installed.svg');
+    iconUrls.add('/core/icons/categories/all.svg');
+    iconUrls.add('/core/icons/categories/installed.svg');
 
     // console.log(`📦 Found ${iconUrls.size} unique icons to preload`);
 
diff --git a/containers/libreportal/frontend/js/system/system-orchestrator.js b/containers/libreportal/frontend/core/boot/system-orchestrator.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/system-orchestrator.js
rename to containers/libreportal/frontend/core/boot/system-orchestrator.js
diff --git a/containers/libreportal/frontend/js/system/theme-registry.js b/containers/libreportal/frontend/core/boot/theme-registry.js
similarity index 100%
rename from containers/libreportal/frontend/js/system/theme-registry.js
rename to containers/libreportal/frontend/core/boot/theme-registry.js
diff --git a/containers/libreportal/frontend/css/aurora-background.css b/containers/libreportal/frontend/core/css/aurora-background.css
similarity index 100%
rename from containers/libreportal/frontend/css/aurora-background.css
rename to containers/libreportal/frontend/core/css/aurora-background.css
diff --git a/containers/libreportal/frontend/shared/css/config.css b/containers/libreportal/frontend/core/css/config.css
similarity index 100%
rename from containers/libreportal/frontend/shared/css/config.css
rename to containers/libreportal/frontend/core/css/config.css
diff --git a/containers/libreportal/frontend/shared/css/forms.css b/containers/libreportal/frontend/core/css/forms.css
similarity index 100%
rename from containers/libreportal/frontend/shared/css/forms.css
rename to containers/libreportal/frontend/core/css/forms.css
diff --git a/containers/libreportal/frontend/css/loading-screen.css b/containers/libreportal/frontend/core/css/loading-screen.css
similarity index 100%
rename from containers/libreportal/frontend/css/loading-screen.css
rename to containers/libreportal/frontend/core/css/loading-screen.css
diff --git a/containers/libreportal/frontend/css/login.css b/containers/libreportal/frontend/core/css/login.css
similarity index 100%
rename from containers/libreportal/frontend/css/login.css
rename to containers/libreportal/frontend/core/css/login.css
diff --git a/containers/libreportal/frontend/css/modal.css b/containers/libreportal/frontend/core/css/modal.css
similarity index 100%
rename from containers/libreportal/frontend/css/modal.css
rename to containers/libreportal/frontend/core/css/modal.css
diff --git a/containers/libreportal/frontend/css/setup-wizard.css b/containers/libreportal/frontend/core/css/setup-wizard.css
similarity index 100%
rename from containers/libreportal/frontend/css/setup-wizard.css
rename to containers/libreportal/frontend/core/css/setup-wizard.css
diff --git a/containers/libreportal/frontend/css/sidebar.css b/containers/libreportal/frontend/core/css/sidebar.css
similarity index 100%
rename from containers/libreportal/frontend/css/sidebar.css
rename to containers/libreportal/frontend/core/css/sidebar.css
diff --git a/containers/libreportal/frontend/css/style.css b/containers/libreportal/frontend/core/css/style.css
similarity index 100%
rename from containers/libreportal/frontend/css/style.css
rename to containers/libreportal/frontend/core/css/style.css
diff --git a/containers/libreportal/frontend/css/themes.css b/containers/libreportal/frontend/core/css/themes.css
similarity index 100%
rename from containers/libreportal/frontend/css/themes.css
rename to containers/libreportal/frontend/core/css/themes.css
diff --git a/containers/libreportal/frontend/shared/css/tokens.css b/containers/libreportal/frontend/core/css/tokens.css
similarity index 100%
rename from containers/libreportal/frontend/shared/css/tokens.css
rename to containers/libreportal/frontend/core/css/tokens.css
diff --git a/containers/libreportal/frontend/css/topbar.css b/containers/libreportal/frontend/core/css/topbar.css
similarity index 100%
rename from containers/libreportal/frontend/css/topbar.css
rename to containers/libreportal/frontend/core/css/topbar.css
diff --git a/containers/libreportal/frontend/css/update-notifier.css b/containers/libreportal/frontend/core/css/update-notifier.css
similarity index 100%
rename from containers/libreportal/frontend/css/update-notifier.css
rename to containers/libreportal/frontend/core/css/update-notifier.css
diff --git a/containers/libreportal/frontend/icons/apps/adguard.svg b/containers/libreportal/frontend/core/icons/apps/adguard.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/adguard.svg
rename to containers/libreportal/frontend/core/icons/apps/adguard.svg
diff --git a/containers/libreportal/frontend/icons/apps/authelia.svg b/containers/libreportal/frontend/core/icons/apps/authelia.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/authelia.svg
rename to containers/libreportal/frontend/core/icons/apps/authelia.svg
diff --git a/containers/libreportal/frontend/icons/apps/bookstack.svg b/containers/libreportal/frontend/core/icons/apps/bookstack.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/bookstack.svg
rename to containers/libreportal/frontend/core/icons/apps/bookstack.svg
diff --git a/containers/libreportal/frontend/icons/apps/crowdsec.svg b/containers/libreportal/frontend/core/icons/apps/crowdsec.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/crowdsec.svg
rename to containers/libreportal/frontend/core/icons/apps/crowdsec.svg
diff --git a/containers/libreportal/frontend/icons/apps/dashy.svg b/containers/libreportal/frontend/core/icons/apps/dashy.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/dashy.svg
rename to containers/libreportal/frontend/core/icons/apps/dashy.svg
diff --git a/containers/libreportal/frontend/icons/apps/default.svg b/containers/libreportal/frontend/core/icons/apps/default.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/default.svg
rename to containers/libreportal/frontend/core/icons/apps/default.svg
diff --git a/containers/libreportal/frontend/icons/apps/focalboard.svg b/containers/libreportal/frontend/core/icons/apps/focalboard.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/focalboard.svg
rename to containers/libreportal/frontend/core/icons/apps/focalboard.svg
diff --git a/containers/libreportal/frontend/icons/apps/gitea.svg b/containers/libreportal/frontend/core/icons/apps/gitea.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/gitea.svg
rename to containers/libreportal/frontend/core/icons/apps/gitea.svg
diff --git a/containers/libreportal/frontend/icons/apps/gluetun.svg b/containers/libreportal/frontend/core/icons/apps/gluetun.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/gluetun.svg
rename to containers/libreportal/frontend/core/icons/apps/gluetun.svg
diff --git a/containers/libreportal/frontend/icons/apps/grafana.svg b/containers/libreportal/frontend/core/icons/apps/grafana.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/grafana.svg
rename to containers/libreportal/frontend/core/icons/apps/grafana.svg
diff --git a/containers/libreportal/frontend/icons/apps/headscale.svg b/containers/libreportal/frontend/core/icons/apps/headscale.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/headscale.svg
rename to containers/libreportal/frontend/core/icons/apps/headscale.svg
diff --git a/containers/libreportal/frontend/icons/apps/invidious.svg b/containers/libreportal/frontend/core/icons/apps/invidious.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/invidious.svg
rename to containers/libreportal/frontend/core/icons/apps/invidious.svg
diff --git a/containers/libreportal/frontend/icons/apps/ipinfo.svg b/containers/libreportal/frontend/core/icons/apps/ipinfo.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/ipinfo.svg
rename to containers/libreportal/frontend/core/icons/apps/ipinfo.svg
diff --git a/containers/libreportal/frontend/icons/apps/jellyfin.svg b/containers/libreportal/frontend/core/icons/apps/jellyfin.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/jellyfin.svg
rename to containers/libreportal/frontend/core/icons/apps/jellyfin.svg
diff --git a/containers/libreportal/frontend/icons/apps/jitsimeet.svg b/containers/libreportal/frontend/core/icons/apps/jitsimeet.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/jitsimeet.svg
rename to containers/libreportal/frontend/core/icons/apps/jitsimeet.svg
diff --git a/containers/libreportal/frontend/icons/apps/libreportal.svg b/containers/libreportal/frontend/core/icons/apps/libreportal.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/libreportal.svg
rename to containers/libreportal/frontend/core/icons/apps/libreportal.svg
diff --git a/containers/libreportal/frontend/icons/apps/linkding.svg b/containers/libreportal/frontend/core/icons/apps/linkding.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/linkding.svg
rename to containers/libreportal/frontend/core/icons/apps/linkding.svg
diff --git a/containers/libreportal/frontend/icons/apps/mastodon.svg b/containers/libreportal/frontend/core/icons/apps/mastodon.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/mastodon.svg
rename to containers/libreportal/frontend/core/icons/apps/mastodon.svg
diff --git a/containers/libreportal/frontend/icons/apps/nextcloud.svg b/containers/libreportal/frontend/core/icons/apps/nextcloud.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/nextcloud.svg
rename to containers/libreportal/frontend/core/icons/apps/nextcloud.svg
diff --git a/containers/libreportal/frontend/icons/apps/ollama.svg b/containers/libreportal/frontend/core/icons/apps/ollama.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/ollama.svg
rename to containers/libreportal/frontend/core/icons/apps/ollama.svg
diff --git a/containers/libreportal/frontend/icons/apps/onlyoffice.svg b/containers/libreportal/frontend/core/icons/apps/onlyoffice.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/onlyoffice.svg
rename to containers/libreportal/frontend/core/icons/apps/onlyoffice.svg
diff --git a/containers/libreportal/frontend/icons/apps/owncloud.svg b/containers/libreportal/frontend/core/icons/apps/owncloud.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/owncloud.svg
rename to containers/libreportal/frontend/core/icons/apps/owncloud.svg
diff --git a/containers/libreportal/frontend/icons/apps/pihole.svg b/containers/libreportal/frontend/core/icons/apps/pihole.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/pihole.svg
rename to containers/libreportal/frontend/core/icons/apps/pihole.svg
diff --git a/containers/libreportal/frontend/icons/apps/portainer.svg b/containers/libreportal/frontend/core/icons/apps/portainer.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/portainer.svg
rename to containers/libreportal/frontend/core/icons/apps/portainer.svg
diff --git a/containers/libreportal/frontend/icons/apps/prometheus.svg b/containers/libreportal/frontend/core/icons/apps/prometheus.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/prometheus.svg
rename to containers/libreportal/frontend/core/icons/apps/prometheus.svg
diff --git a/containers/libreportal/frontend/icons/apps/searxng.svg b/containers/libreportal/frontend/core/icons/apps/searxng.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/searxng.svg
rename to containers/libreportal/frontend/core/icons/apps/searxng.svg
diff --git a/containers/libreportal/frontend/icons/apps/speedtest.svg b/containers/libreportal/frontend/core/icons/apps/speedtest.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/speedtest.svg
rename to containers/libreportal/frontend/core/icons/apps/speedtest.svg
diff --git a/containers/libreportal/frontend/icons/apps/traefik.svg b/containers/libreportal/frontend/core/icons/apps/traefik.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/traefik.svg
rename to containers/libreportal/frontend/core/icons/apps/traefik.svg
diff --git a/containers/libreportal/frontend/icons/apps/trilium.svg b/containers/libreportal/frontend/core/icons/apps/trilium.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/trilium.svg
rename to containers/libreportal/frontend/core/icons/apps/trilium.svg
diff --git a/containers/libreportal/frontend/icons/apps/unbound.svg b/containers/libreportal/frontend/core/icons/apps/unbound.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/unbound.svg
rename to containers/libreportal/frontend/core/icons/apps/unbound.svg
diff --git a/containers/libreportal/frontend/icons/apps/vaultwarden.svg b/containers/libreportal/frontend/core/icons/apps/vaultwarden.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/vaultwarden.svg
rename to containers/libreportal/frontend/core/icons/apps/vaultwarden.svg
diff --git a/containers/libreportal/frontend/icons/apps/wireguard.svg b/containers/libreportal/frontend/core/icons/apps/wireguard.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/apps/wireguard.svg
rename to containers/libreportal/frontend/core/icons/apps/wireguard.svg
diff --git a/containers/libreportal/frontend/icons/categories/all.svg b/containers/libreportal/frontend/core/icons/categories/all.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/all.svg
rename to containers/libreportal/frontend/core/icons/categories/all.svg
diff --git a/containers/libreportal/frontend/icons/categories/communication.svg b/containers/libreportal/frontend/core/icons/categories/communication.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/communication.svg
rename to containers/libreportal/frontend/core/icons/categories/communication.svg
diff --git a/containers/libreportal/frontend/icons/categories/development.svg b/containers/libreportal/frontend/core/icons/categories/development.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/development.svg
rename to containers/libreportal/frontend/core/icons/categories/development.svg
diff --git a/containers/libreportal/frontend/icons/categories/installed.svg b/containers/libreportal/frontend/core/icons/categories/installed.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/installed.svg
rename to containers/libreportal/frontend/core/icons/categories/installed.svg
diff --git a/containers/libreportal/frontend/icons/categories/knowledge.svg b/containers/libreportal/frontend/core/icons/categories/knowledge.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/knowledge.svg
rename to containers/libreportal/frontend/core/icons/categories/knowledge.svg
diff --git a/containers/libreportal/frontend/icons/categories/media.svg b/containers/libreportal/frontend/core/icons/categories/media.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/media.svg
rename to containers/libreportal/frontend/core/icons/categories/media.svg
diff --git a/containers/libreportal/frontend/icons/categories/misc.svg b/containers/libreportal/frontend/core/icons/categories/misc.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/misc.svg
rename to containers/libreportal/frontend/core/icons/categories/misc.svg
diff --git a/containers/libreportal/frontend/icons/categories/monitoring.svg b/containers/libreportal/frontend/core/icons/categories/monitoring.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/monitoring.svg
rename to containers/libreportal/frontend/core/icons/categories/monitoring.svg
diff --git a/containers/libreportal/frontend/icons/categories/networking.svg b/containers/libreportal/frontend/core/icons/categories/networking.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/networking.svg
rename to containers/libreportal/frontend/core/icons/categories/networking.svg
diff --git a/containers/libreportal/frontend/icons/categories/productivity.svg b/containers/libreportal/frontend/core/icons/categories/productivity.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/productivity.svg
rename to containers/libreportal/frontend/core/icons/categories/productivity.svg
diff --git a/containers/libreportal/frontend/icons/categories/recommended.svg b/containers/libreportal/frontend/core/icons/categories/recommended.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/recommended.svg
rename to containers/libreportal/frontend/core/icons/categories/recommended.svg
diff --git a/containers/libreportal/frontend/icons/categories/security.svg b/containers/libreportal/frontend/core/icons/categories/security.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/security.svg
rename to containers/libreportal/frontend/core/icons/categories/security.svg
diff --git a/containers/libreportal/frontend/icons/categories/storage.svg b/containers/libreportal/frontend/core/icons/categories/storage.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/storage.svg
rename to containers/libreportal/frontend/core/icons/categories/storage.svg
diff --git a/containers/libreportal/frontend/icons/categories/system.svg b/containers/libreportal/frontend/core/icons/categories/system.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/system.svg
rename to containers/libreportal/frontend/core/icons/categories/system.svg
diff --git a/containers/libreportal/frontend/icons/categories/utils.svg b/containers/libreportal/frontend/core/icons/categories/utils.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/categories/utils.svg
rename to containers/libreportal/frontend/core/icons/categories/utils.svg
diff --git a/containers/libreportal/frontend/icons/config/backup.svg b/containers/libreportal/frontend/core/icons/config/backup.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/backup.svg
rename to containers/libreportal/frontend/core/icons/config/backup.svg
diff --git a/containers/libreportal/frontend/icons/config/features.svg b/containers/libreportal/frontend/core/icons/config/features.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/features.svg
rename to containers/libreportal/frontend/core/icons/config/features.svg
diff --git a/containers/libreportal/frontend/icons/config/general.svg b/containers/libreportal/frontend/core/icons/config/general.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/general.svg
rename to containers/libreportal/frontend/core/icons/config/general.svg
diff --git a/containers/libreportal/frontend/icons/config/network.svg b/containers/libreportal/frontend/core/icons/config/network.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/network.svg
rename to containers/libreportal/frontend/core/icons/config/network.svg
diff --git a/containers/libreportal/frontend/icons/config/security.svg b/containers/libreportal/frontend/core/icons/config/security.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/security.svg
rename to containers/libreportal/frontend/core/icons/config/security.svg
diff --git a/containers/libreportal/frontend/icons/config/webui.svg b/containers/libreportal/frontend/core/icons/config/webui.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/config/webui.svg
rename to containers/libreportal/frontend/core/icons/config/webui.svg
diff --git a/containers/libreportal/frontend/icons/cpu/amd.svg b/containers/libreportal/frontend/core/icons/cpu/amd.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/cpu/amd.svg
rename to containers/libreportal/frontend/core/icons/cpu/amd.svg
diff --git a/containers/libreportal/frontend/icons/cpu/intel.svg b/containers/libreportal/frontend/core/icons/cpu/intel.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/cpu/intel.svg
rename to containers/libreportal/frontend/core/icons/cpu/intel.svg
diff --git a/containers/libreportal/frontend/icons/favicon.ico b/containers/libreportal/frontend/core/icons/favicon.ico
similarity index 100%
rename from containers/libreportal/frontend/icons/favicon.ico
rename to containers/libreportal/frontend/core/icons/favicon.ico
diff --git a/containers/libreportal/frontend/icons/libreportal.svg b/containers/libreportal/frontend/core/icons/libreportal.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/libreportal.svg
rename to containers/libreportal/frontend/core/icons/libreportal.svg
diff --git a/containers/libreportal/frontend/icons/os/arch.svg b/containers/libreportal/frontend/core/icons/os/arch.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/os/arch.svg
rename to containers/libreportal/frontend/core/icons/os/arch.svg
diff --git a/containers/libreportal/frontend/icons/os/debian.svg b/containers/libreportal/frontend/core/icons/os/debian.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/os/debian.svg
rename to containers/libreportal/frontend/core/icons/os/debian.svg
diff --git a/containers/libreportal/frontend/icons/os/fedora.svg b/containers/libreportal/frontend/core/icons/os/fedora.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/os/fedora.svg
rename to containers/libreportal/frontend/core/icons/os/fedora.svg
diff --git a/containers/libreportal/frontend/icons/os/linux.svg b/containers/libreportal/frontend/core/icons/os/linux.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/os/linux.svg
rename to containers/libreportal/frontend/core/icons/os/linux.svg
diff --git a/containers/libreportal/frontend/icons/os/ubuntu.svg b/containers/libreportal/frontend/core/icons/os/ubuntu.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/os/ubuntu.svg
rename to containers/libreportal/frontend/core/icons/os/ubuntu.svg
diff --git a/containers/libreportal/frontend/icons/vpn/airvpn.svg b/containers/libreportal/frontend/core/icons/vpn/airvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/airvpn.svg
rename to containers/libreportal/frontend/core/icons/vpn/airvpn.svg
diff --git a/containers/libreportal/frontend/icons/vpn/cyberghost.png b/containers/libreportal/frontend/core/icons/vpn/cyberghost.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/cyberghost.png
rename to containers/libreportal/frontend/core/icons/vpn/cyberghost.png
diff --git a/containers/libreportal/frontend/icons/vpn/expressvpn.svg b/containers/libreportal/frontend/core/icons/vpn/expressvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/expressvpn.svg
rename to containers/libreportal/frontend/core/icons/vpn/expressvpn.svg
diff --git a/containers/libreportal/frontend/icons/vpn/fastestvpn.png b/containers/libreportal/frontend/core/icons/vpn/fastestvpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/fastestvpn.png
rename to containers/libreportal/frontend/core/icons/vpn/fastestvpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/giganews.png b/containers/libreportal/frontend/core/icons/vpn/giganews.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/giganews.png
rename to containers/libreportal/frontend/core/icons/vpn/giganews.png
diff --git a/containers/libreportal/frontend/icons/vpn/hidemyass.png b/containers/libreportal/frontend/core/icons/vpn/hidemyass.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/hidemyass.png
rename to containers/libreportal/frontend/core/icons/vpn/hidemyass.png
diff --git a/containers/libreportal/frontend/icons/vpn/ipvanish.svg b/containers/libreportal/frontend/core/icons/vpn/ipvanish.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/ipvanish.svg
rename to containers/libreportal/frontend/core/icons/vpn/ipvanish.svg
diff --git a/containers/libreportal/frontend/icons/vpn/ivpn.png b/containers/libreportal/frontend/core/icons/vpn/ivpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/ivpn.png
rename to containers/libreportal/frontend/core/icons/vpn/ivpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/mullvad.svg b/containers/libreportal/frontend/core/icons/vpn/mullvad.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/mullvad.svg
rename to containers/libreportal/frontend/core/icons/vpn/mullvad.svg
diff --git a/containers/libreportal/frontend/icons/vpn/nordvpn.svg b/containers/libreportal/frontend/core/icons/vpn/nordvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/nordvpn.svg
rename to containers/libreportal/frontend/core/icons/vpn/nordvpn.svg
diff --git a/containers/libreportal/frontend/icons/vpn/privado.png b/containers/libreportal/frontend/core/icons/vpn/privado.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/privado.png
rename to containers/libreportal/frontend/core/icons/vpn/privado.png
diff --git a/containers/libreportal/frontend/icons/vpn/private-internet-access.svg b/containers/libreportal/frontend/core/icons/vpn/private-internet-access.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/private-internet-access.svg
rename to containers/libreportal/frontend/core/icons/vpn/private-internet-access.svg
diff --git a/containers/libreportal/frontend/icons/vpn/privatevpn.png b/containers/libreportal/frontend/core/icons/vpn/privatevpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/privatevpn.png
rename to containers/libreportal/frontend/core/icons/vpn/privatevpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/protonvpn.svg b/containers/libreportal/frontend/core/icons/vpn/protonvpn.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/protonvpn.svg
rename to containers/libreportal/frontend/core/icons/vpn/protonvpn.svg
diff --git a/containers/libreportal/frontend/icons/vpn/purevpn.png b/containers/libreportal/frontend/core/icons/vpn/purevpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/purevpn.png
rename to containers/libreportal/frontend/core/icons/vpn/purevpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/slickvpn.png b/containers/libreportal/frontend/core/icons/vpn/slickvpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/slickvpn.png
rename to containers/libreportal/frontend/core/icons/vpn/slickvpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/surfshark.svg b/containers/libreportal/frontend/core/icons/vpn/surfshark.svg
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/surfshark.svg
rename to containers/libreportal/frontend/core/icons/vpn/surfshark.svg
diff --git a/containers/libreportal/frontend/icons/vpn/torguard.png b/containers/libreportal/frontend/core/icons/vpn/torguard.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/torguard.png
rename to containers/libreportal/frontend/core/icons/vpn/torguard.png
diff --git a/containers/libreportal/frontend/icons/vpn/vpn-unlimited.png b/containers/libreportal/frontend/core/icons/vpn/vpn-unlimited.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/vpn-unlimited.png
rename to containers/libreportal/frontend/core/icons/vpn/vpn-unlimited.png
diff --git a/containers/libreportal/frontend/icons/vpn/vpnsecure.png b/containers/libreportal/frontend/core/icons/vpn/vpnsecure.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/vpnsecure.png
rename to containers/libreportal/frontend/core/icons/vpn/vpnsecure.png
diff --git a/containers/libreportal/frontend/icons/vpn/vyprvpn.png b/containers/libreportal/frontend/core/icons/vpn/vyprvpn.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/vyprvpn.png
rename to containers/libreportal/frontend/core/icons/vpn/vyprvpn.png
diff --git a/containers/libreportal/frontend/icons/vpn/windscribe.png b/containers/libreportal/frontend/core/icons/vpn/windscribe.png
similarity index 100%
rename from containers/libreportal/frontend/icons/vpn/windscribe.png
rename to containers/libreportal/frontend/core/icons/vpn/windscribe.png
diff --git a/containers/libreportal/frontend/kernel/feature-registry.js b/containers/libreportal/frontend/core/kernel/feature-registry.js
similarity index 98%
rename from containers/libreportal/frontend/kernel/feature-registry.js
rename to containers/libreportal/frontend/core/kernel/feature-registry.js
index d05b64e..eb0b218 100644
--- a/containers/libreportal/frontend/kernel/feature-registry.js
+++ b/containers/libreportal/frontend/core/kernel/feature-registry.js
@@ -50,7 +50,7 @@
     // built-in defaults).
     async loadManifest() {
       if (this._manifest) return this._manifest;
-      const sources = ['/api/features/list', '/features/manifest.dev.json'];
+      const sources = ['/api/features/list', '/components/manifest.dev.json'];
       for (const url of sources) {
         try {
           const res = await fetch(url, { cache: 'no-cache' });
diff --git a/containers/libreportal/frontend/kernel/lifecycle.js b/containers/libreportal/frontend/core/kernel/lifecycle.js
similarity index 100%
rename from containers/libreportal/frontend/kernel/lifecycle.js
rename to containers/libreportal/frontend/core/kernel/lifecycle.js
diff --git a/containers/libreportal/frontend/kernel/services.js b/containers/libreportal/frontend/core/kernel/services.js
similarity index 100%
rename from containers/libreportal/frontend/kernel/services.js
rename to containers/libreportal/frontend/core/kernel/services.js
diff --git a/containers/libreportal/frontend/js/spa.js b/containers/libreportal/frontend/core/kernel/spa.js
similarity index 97%
rename from containers/libreportal/frontend/js/spa.js
rename to containers/libreportal/frontend/core/kernel/spa.js
index f986c5d..6ca27c7 100755
--- a/containers/libreportal/frontend/js/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('/html/dashboard-content.html');
+      const html = await this.fetchContent('/components/dashboard/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('/features/backup/backup-page.js'),
-        this.loadScript('/shared/js/backup-app-card.js')
+        this.loadScript('/components/backup/backup-page.js'),
+        this.loadScript('/core/lib/backup-app-card.js')
       ]);
-      const html = await this.fetchContent('/html/backup-content.html');
+      const html = await this.fetchContent('/components/backup/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('/html/apps-unified-layout.html');
+        const html = await this.fetchContent('/components/apps/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('/html/apps-unified-layout.html');
+      const html = await this.fetchContent('/components/apps/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('/html/config-content.html');
+      const html = await this.fetchContent('/components/admin/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('/html/tasks-content.html');
+      const html = await this.fetchContent('/components/tasks/tasks-content.html');
       this.loadContent(html, 'Tasks');
       
       // Tasks manager should already be initialized by SystemLoader
diff --git a/containers/libreportal/frontend/shared/js/backup-app-card.js b/containers/libreportal/frontend/core/lib/backup-app-card.js
similarity index 99%
rename from containers/libreportal/frontend/shared/js/backup-app-card.js
rename to containers/libreportal/frontend/core/lib/backup-app-card.js
index 21cbd8b..128bf00 100644
--- a/containers/libreportal/frontend/shared/js/backup-app-card.js
+++ b/containers/libreportal/frontend/core/lib/backup-app-card.js
@@ -75,7 +75,7 @@ class BackupAppCard {
             <span class="backup-card-hint">${allSnaps.length} total across ${locCount} location${locCount === 1 ? '' : 's'}</span>
         `;
 
-        const iconUrl = `/icons/apps/${encodeURIComponent(this.appName)}.svg`;
+        const iconUrl = `/core/icons/apps/${encodeURIComponent(this.appName)}.svg`;
         snapsEl.innerHTML = `
             <div class="backup-snapshot-rows">
                 ${allSnaps.slice(0, 50).map(s => this._renderRow(s, iconUrl)).join('')}
diff --git a/containers/libreportal/frontend/shared/js/config-options.js b/containers/libreportal/frontend/core/lib/config-options.js
similarity index 100%
rename from containers/libreportal/frontend/shared/js/config-options.js
rename to containers/libreportal/frontend/core/lib/config-options.js
diff --git a/containers/libreportal/frontend/shared/js/config-shared.js b/containers/libreportal/frontend/core/lib/config-shared.js
similarity index 100%
rename from containers/libreportal/frontend/shared/js/config-shared.js
rename to containers/libreportal/frontend/core/lib/config-shared.js
diff --git a/containers/libreportal/frontend/js/utils/data-loader.js b/containers/libreportal/frontend/core/lib/data-loader.js
similarity index 99%
rename from containers/libreportal/frontend/js/utils/data-loader.js
rename to containers/libreportal/frontend/core/lib/data-loader.js
index 9c13a5b..1bee5f4 100755
--- a/containers/libreportal/frontend/js/utils/data-loader.js
+++ b/containers/libreportal/frontend/core/lib/data-loader.js
@@ -118,7 +118,7 @@ let categories = [];
 
 function getCategoryIcon(categoryId) {
   const category = categories.find(cat => cat.id === categoryId);
-  return category ? category.icon : '/icons/categories/misc.svg';
+  return category ? category.icon : '/core/icons/categories/misc.svg';
 }
 
 function getCategoryName(categoryId) {
diff --git a/containers/libreportal/frontend/js/utils/dismissible.js b/containers/libreportal/frontend/core/lib/dismissible.js
similarity index 100%
rename from containers/libreportal/frontend/js/utils/dismissible.js
rename to containers/libreportal/frontend/core/lib/dismissible.js
diff --git a/containers/libreportal/frontend/js/utils/dom-helpers.js b/containers/libreportal/frontend/core/lib/dom-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/js/utils/dom-helpers.js
rename to containers/libreportal/frontend/core/lib/dom-helpers.js
diff --git a/containers/libreportal/frontend/js/utils/lp-ui.js b/containers/libreportal/frontend/core/lib/lp-ui.js
similarity index 100%
rename from containers/libreportal/frontend/js/utils/lp-ui.js
rename to containers/libreportal/frontend/core/lib/lp-ui.js
diff --git a/containers/libreportal/frontend/js/utils/router.js b/containers/libreportal/frontend/core/lib/router.js
similarity index 100%
rename from containers/libreportal/frontend/js/utils/router.js
rename to containers/libreportal/frontend/core/lib/router.js
diff --git a/containers/libreportal/frontend/js/utils/system-live.js b/containers/libreportal/frontend/core/lib/system-live.js
similarity index 100%
rename from containers/libreportal/frontend/js/utils/system-live.js
rename to containers/libreportal/frontend/core/lib/system-live.js
diff --git a/containers/libreportal/frontend/shared/task/task-actions.js b/containers/libreportal/frontend/core/lib/task-actions.js
similarity index 98%
rename from containers/libreportal/frontend/shared/task/task-actions.js
rename to containers/libreportal/frontend/core/lib/task-actions.js
index 9c23238..9b58b10 100755
--- a/containers/libreportal/frontend/shared/task/task-actions.js
+++ b/containers/libreportal/frontend/core/lib/task-actions.js
@@ -346,7 +346,7 @@ async configUpdate(changes) {
       } catch (error) {
         console.warn('Could not get app data:', error);
       }
-      const appIcon = appData?.icon || `/icons/apps/${task.app}.svg`;
+      const appIcon = appData?.icon || `/core/icons/apps/${task.app}.svg`;
       
       let taskUrl;
       const currentUrl = window.location.href;
@@ -361,12 +361,12 @@ async configUpdate(changes) {
         // `appName === 'system'` is a category sentinel (config_update,
         // system_update — no real app). Resolve it to the LibrePortal
         // logo + name so the toast doesn't read "App: System" with a
-        // broken /icons/apps/system.svg.
+        // broken /core/icons/apps/system.svg.
         const isSystem = appName === 'system';
         const displayName = isSystem
           ? 'LibrePortal'
           : (window.getAppDisplayName ? window.getAppDisplayName(appName) : appName);
-        const notifIcon = isSystem ? '/icons/libreportal.svg' : appIcon;
+        const notifIcon = isSystem ? '/core/icons/libreportal.svg' : appIcon;
         const typeIcon = (window.tasksManager && window.tasksManager.getTaskTypeIcon
           ? window.tasksManager.getTaskTypeIcon({ type: action })
           : null)?.icon || '';
diff --git a/containers/libreportal/frontend/shared/task/task-commands.js b/containers/libreportal/frontend/core/lib/task-commands.js
similarity index 99%
rename from containers/libreportal/frontend/shared/task/task-commands.js
rename to containers/libreportal/frontend/core/lib/task-commands.js
index 217132f..c838cf8 100755
--- a/containers/libreportal/frontend/shared/task/task-commands.js
+++ b/containers/libreportal/frontend/core/lib/task-commands.js
@@ -331,7 +331,7 @@ class TaskCommands {
     // Fallback: create minimal app data
     return {
       name: appName,
-      icon: `/icons/apps/${appName}.svg`,
+      icon: `/core/icons/apps/${appName}.svg`,
       command: `libreportal app install ${appName}`
     };
   }
diff --git a/containers/libreportal/frontend/shared/task/task-event-bus.js b/containers/libreportal/frontend/core/lib/task-event-bus.js
similarity index 100%
rename from containers/libreportal/frontend/shared/task/task-event-bus.js
rename to containers/libreportal/frontend/core/lib/task-event-bus.js
diff --git a/containers/libreportal/frontend/shared/task/task-global-functions.js b/containers/libreportal/frontend/core/lib/task-global-functions.js
similarity index 100%
rename from containers/libreportal/frontend/shared/task/task-global-functions.js
rename to containers/libreportal/frontend/core/lib/task-global-functions.js
diff --git a/containers/libreportal/frontend/shared/task/task-manager.js b/containers/libreportal/frontend/core/lib/task-manager.js
similarity index 100%
rename from containers/libreportal/frontend/shared/task/task-manager.js
rename to containers/libreportal/frontend/core/lib/task-manager.js
diff --git a/containers/libreportal/frontend/js/task-parameter-preserve.js b/containers/libreportal/frontend/core/lib/task-parameter-preserve.js
similarity index 100%
rename from containers/libreportal/frontend/js/task-parameter-preserve.js
rename to containers/libreportal/frontend/core/lib/task-parameter-preserve.js
diff --git a/containers/libreportal/frontend/shared/task/task-refresh-coordinator.js b/containers/libreportal/frontend/core/lib/task-refresh-coordinator.js
similarity index 100%
rename from containers/libreportal/frontend/shared/task/task-refresh-coordinator.js
rename to containers/libreportal/frontend/core/lib/task-refresh-coordinator.js
diff --git a/containers/libreportal/frontend/shared/task/task-router.js b/containers/libreportal/frontend/core/lib/task-router.js
similarity index 100%
rename from containers/libreportal/frontend/shared/task/task-router.js
rename to containers/libreportal/frontend/core/lib/task-router.js
diff --git a/containers/libreportal/frontend/js/utils/ui-helpers.js b/containers/libreportal/frontend/core/lib/ui-helpers.js
similarity index 97%
rename from containers/libreportal/frontend/js/utils/ui-helpers.js
rename to containers/libreportal/frontend/core/lib/ui-helpers.js
index b3b0c96..0f19d68 100755
--- a/containers/libreportal/frontend/js/utils/ui-helpers.js
+++ b/containers/libreportal/frontend/core/lib/ui-helpers.js
@@ -5,7 +5,7 @@
 function getAppIcon(appName, appIconUrl) {
   const cleanAppName = appName.replace('install_', '').replace(' ', '');
   // Use icon URL from JSON if available, otherwise fall back to default
-  return appIconUrl || `/icons/apps/${cleanAppName}.svg`;
+  return appIconUrl || `/core/icons/apps/${cleanAppName}.svg`;
 }
 
 function getAppStatus(installed) {
diff --git a/containers/libreportal/frontend/js/components/confirmation-dialog.js b/containers/libreportal/frontend/core/ui/confirmation-dialog.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/confirmation-dialog.js
rename to containers/libreportal/frontend/core/ui/confirmation-dialog.js
diff --git a/containers/libreportal/frontend/js/components/eo-modal.js b/containers/libreportal/frontend/core/ui/eo-modal.js
similarity index 99%
rename from containers/libreportal/frontend/js/components/eo-modal.js
rename to containers/libreportal/frontend/core/ui/eo-modal.js
index acf4379..7d6e3be 100644
--- a/containers/libreportal/frontend/js/components/eo-modal.js
+++ b/containers/libreportal/frontend/core/ui/eo-modal.js
@@ -76,7 +76,7 @@
         ${(opts.icon || opts.title || opts.eyebrow) ? `
           <div class="eo-modal-header">
             <div class="eo-modal-header-info">
-              ${headerHasIcon ? `<img src="${escAttr(opts.icon)}" alt="${escAttr(opts.iconAlt || '')}" class="eo-modal-icon" onerror="this.onerror=null;this.src='/icons/apps/default.svg';">` : ''}
+              ${headerHasIcon ? `<img src="${escAttr(opts.icon)}" alt="${escAttr(opts.iconAlt || '')}" class="eo-modal-icon" onerror="this.onerror=null;this.src='/core/icons/apps/default.svg';">` : ''}
               ${titleHtml}
             </div>
             ${endIconHtml}
diff --git a/containers/libreportal/frontend/js/components/mobile-menu.js b/containers/libreportal/frontend/core/ui/mobile-menu.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/mobile-menu.js
rename to containers/libreportal/frontend/core/ui/mobile-menu.js
diff --git a/containers/libreportal/frontend/js/components/notifications.js b/containers/libreportal/frontend/core/ui/notifications.js
similarity index 99%
rename from containers/libreportal/frontend/js/components/notifications.js
rename to containers/libreportal/frontend/core/ui/notifications.js
index 2153b0a..ae6d3cf 100755
--- a/containers/libreportal/frontend/js/components/notifications.js
+++ b/containers/libreportal/frontend/core/ui/notifications.js
@@ -103,7 +103,7 @@ class NotificationSystem {
     if (appIcon) {
       content += `
         <div class="notification-app-icon">
-          <img src="${appIcon}" alt="${appName}" onerror="this.onerror=null; this.src='/icons/apps/default.svg'">
+          <img src="${appIcon}" alt="${appName}" onerror="this.onerror=null; this.src='/core/icons/apps/default.svg'">
         </div>
       `;
     }
diff --git a/containers/libreportal/frontend/html/topbar.html b/containers/libreportal/frontend/core/ui/topbar.html
similarity index 98%
rename from containers/libreportal/frontend/html/topbar.html
rename to containers/libreportal/frontend/core/ui/topbar.html
index 9445f97..aa9add6 100755
--- a/containers/libreportal/frontend/html/topbar.html
+++ b/containers/libreportal/frontend/core/ui/topbar.html
@@ -23,7 +23,7 @@
   </button>
   <div class="topbar-left">
     <div class="libreportal-logo">
-      <img src="/icons/libreportal.svg" alt="LibrePortal" width="32" height="32">
+      <img src="/core/icons/libreportal.svg" alt="LibrePortal" width="32" height="32">
     </div>
   </div>
   <div class="mobile-drawer" id="mobile-drawer">
diff --git a/containers/libreportal/frontend/js/components/topbar.js b/containers/libreportal/frontend/core/ui/topbar.js
similarity index 99%
rename from containers/libreportal/frontend/js/components/topbar.js
rename to containers/libreportal/frontend/core/ui/topbar.js
index 432d2bf..0b47736 100755
--- a/containers/libreportal/frontend/js/components/topbar.js
+++ b/containers/libreportal/frontend/core/ui/topbar.js
@@ -50,7 +50,7 @@ class TopbarComponent {
     // Load fresh topbar HTML
     try {
       //// // console.log('Loading topbar HTML (SPA mode)');
-      const response = await fetch('/html/topbar.html');
+      const response = await fetch('/core/ui/topbar.html');
       if (!response.ok) {
         throw new Error(`Failed to load topbar: ${response.status}`);
       }
diff --git a/containers/libreportal/frontend/js/components/update-notifier.js b/containers/libreportal/frontend/core/ui/update-notifier.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/update-notifier.js
rename to containers/libreportal/frontend/core/ui/update-notifier.js
diff --git a/containers/libreportal/frontend/html/app-content.html b/containers/libreportal/frontend/html/app-content.html
deleted file mode 100755
index 991c74f..0000000
--- a/containers/libreportal/frontend/html/app-content.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- App Management Layout -->
-  <div class="container">
-    <!-- Mobile overlay -->
-    <div class="mobile-overlay" id="mobile-overlay"></div>
-    
-    <!-- Sidebar -->
-    <div class="sidebar" id="sidebar">
-      <!-- Categories will be dynamically generated here -->
-      <div id="dynamic-categories"></div>
-    </div>
-
-    <!-- Main content -->
-    <div class="main">
-      <div class="app-header" id="app-header">
-        <!-- App info will be dynamically inserted -->
-      </div>
-
-      <!-- Tabbed Interface -->
-      <div class="tabbed-interface">
-        <div class="tab-navigation">
-          <button class="tab-button active" data-tab="config" onclick="if(window.appTabbedManager) window.appTabbedManager.switchTab('config')">
-            <span class="tab-emoji">🛠️</span>
-            <span class="tab-name">Config</span>
-          </button>
-          <button class="tab-button" data-tab="services" onclick="if(window.appTabbedManager) window.appTabbedManager.switchTab('services')">
-            <span class="tab-emoji">⚡</span>
-            <span class="tab-name">Services</span>
-          </button>
-          <button class="tab-button" data-tab="tools" style="display: none;" onclick="if(window.appTabbedManager) window.appTabbedManager.switchTab('tools')">
-            <span class="tab-emoji">🧰</span>
-            <span class="tab-name">Tools</span>
-          </button>
-          <button class="tab-button" data-tab="routing" style="display: none;" onclick="if(window.appTabbedManager) window.appTabbedManager.switchTab('routing')">
-            <span class="tab-emoji">🛡️</span>
-            <span class="tab-name">Routing</span>
-          </button>
-          <button class="tab-button" data-tab="backups" onclick="if(window.appTabbedManager) window.appTabbedManager.switchTab('backups')">
-            <span class="tab-emoji">💾</span>
-            <span class="tab-name">Backups</span>
-          </button>
-                  </div>
-
-        <!-- Tab Content -->
-        <div class="tab-content">
-          <!-- Config Tab -->
-          <div class="tab-pane active" id="config-tab">
-            <div class="config-section" id="config-section">
-              <!-- Config form will be dynamically inserted -->
-            </div>
-          </div>
-
-          <!-- Services Tab -->
-          <div class="tab-pane" id="services-tab">
-            <div class="services-section">
-              <div id="services-list" class="services-list">
-                <!-- Service rows are rendered here by services-manager.js -->
-              </div>
-            </div>
-          </div>
-
-          <!-- Tools Tab -->
-          <div class="tab-pane" id="tools-tab">
-            <div class="tools-section">
-              <div id="tools-list" class="tools-list">
-                <!-- Tool buttons are rendered here by tools-manager.js -->
-              </div>
-            </div>
-          </div>
-
-          <!-- Routing Tab (Traefik only) -->
-          <div class="tab-pane" id="routing-tab">
-            <div class="routing-section-wrap">
-              <div id="routing-list" class="routing-list">
-                <!-- Routing rows rendered by routing-manager.js -->
-              </div>
-            </div>
-          </div>
-
-          <!-- Backups Tab -->
-          <div class="tab-pane" id="backups-tab">
-            <div class="backup-section" id="backup-section">
-              <div class="backup-title">
-                <div class="backup-title-main">
-                  <h3>💾 Backups</h3>
-                  <p>Backups for <span id="backup-app-name">this app</span> across all configured locations.</p>
-                </div>
-                <div class="backup-title-actions">
-                  <button type="button" class="btn btn-primary" id="backup-app-card-backup-btn">
-                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
-                      <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
-                      <polyline points="17 8 12 3 7 8"></polyline>
-                      <line x1="12" y1="3" x2="12" y2="15"></line>
-                    </svg>
-                    Backup now
-                  </button>
-                  <a class="btn btn-secondary" href="/backup" onclick="event.preventDefault(); if(window.navigateToRoute){window.navigateToRoute('/backup');}else{window.location.href='/backup';}">
-                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
-                      <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
-                      <polyline points="15 3 21 3 21 9"></polyline>
-                      <line x1="10" y1="14" x2="21" y2="3"></line>
-                    </svg>
-                    Open backup center
-                  </a>
-                </div>
-              </div>
-              <div class="backup-snapshots-container">
-                <div class="backup-app-card-status" id="backup-app-card-status">Loading…</div>
-                <div class="backup-app-card-snapshots" id="backup-app-card-snapshots"></div>
-              </div>
-            </div>
-          </div>
-
-                  </div>
-      </div>
-    </div>
-  </div>
diff --git a/containers/libreportal/frontend/html/apps-content.html b/containers/libreportal/frontend/html/apps-content.html
deleted file mode 100755
index 16d0004..0000000
--- a/containers/libreportal/frontend/html/apps-content.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- Apps Management Layout -->
-  <div class="container">
-    <!-- Mobile overlay -->
-    <div class="mobile-overlay" id="mobile-overlay"></div>
-    
-    <!-- Topbar Component -->
-    <div id="topbar-container"></div>
-    
-    <!-- Sidebar -->
-    <div class="sidebar" id="sidebar">
-      <!-- Categories will be dynamically generated here -->
-      <div id="dynamic-categories">
-        <!-- Loading spinner for categories - simple design with white text -->
-        <div class="loading-categories">
-          <div class="loading-spinner"></div>
-          <p style="color: #ffffff;">Loading categories...</p>
-        </div>
-      </div>
-    </div>
-    
-    <!-- Main content -->
-    <div class="main">
-      <div class="apps-section" id="apps-section">
-        <!-- Loading spinner for apps - full main section with box styling -->
-        <div class="loading-content" style="
-          text-align: center; 
-          padding: 60px 20px;
-          background: var(--input-bg);
-          border: 2px solid var(--border-color);
-          border-radius: 12px;
-          box-shadow: 0 4px 8px rgba(0,0,0,0.15);
-          width: 100%;
-          height: 100%;
-          box-sizing: border-box;
-          margin: 0;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          min-height: 400px;
-        ">
-            <div class="loading-spinner" style="
-              width: 24px; 
-              height: 24px; 
-              border: 3px solid rgba(52, 152, 219, 0.3); 
-              border-top: 3px solid #3498db; 
-              border-radius: 50%; 
-              animation: spin 1s linear infinite; 
-              margin: 0 auto 16px auto;
-              display: inline-block;
-            "></div>
-            <div class="loading-message" style="
-              font-size: 16px; 
-              color: #ffffff; 
-              font-weight: 500;
-              margin-bottom: 8px;
-            ">
-              Loading applications...
-            </div>
-            <div class="loading-subtitle" style="
-              font-size: 14px; 
-              color: rgba(255, 255, 255, 0.8); 
-              font-style: italic;
-            ">
-              Discovering the perfect applications for you...
-            </div>
-          </div>
-      </div>
-      </div>
-    </div>
-  </div>
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 9099876..ef195e3 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -5,39 +5,39 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>LibrePortal - Modern Docker Management</title>
 
-  <link rel="icon" type="image/svg+xml" href="/icons/libreportal.svg">
-  <link rel="icon" type="image/x-icon" href="/icons/favicon.ico" sizes="any">
-  <link rel="apple-touch-icon" href="/icons/libreportal.svg">
+  <link rel="icon" type="image/svg+xml" href="/core/icons/libreportal.svg">
+  <link rel="icon" type="image/x-icon" href="/core/icons/favicon.ico" sizes="any">
+  <link rel="apple-touch-icon" href="/core/icons/libreportal.svg">
 
   <!-- Styles -->
   <!-- Base token layer (theme-agnostic): --font-mono, --page-* identity hues -->
-  <link rel="stylesheet" href="/shared/css/tokens.css">
-  <link rel="stylesheet" href="/css/themes.css">
-  <link rel="stylesheet" href="/css/loading-screen.css">
-  <link rel="stylesheet" href="/css/setup-wizard.css">
-  <link rel="stylesheet" href="/css/style.css">
-  <link rel="stylesheet" href="/features/admin/ip-whitelist.css">
-  <link rel="stylesheet" href="/features/apps/port-manager.css">
-  <link rel="stylesheet" href="/features/backup/backup.css">
-  <link rel="stylesheet" href="/features/admin/ssh.css">
-  <link rel="stylesheet" href="/features/admin/admin.css">
-  <link rel="stylesheet" href="/features/apps/services.css">
-  <link rel="stylesheet" href="/css/modal.css">
-  <link rel="stylesheet" href="/features/apps/tools.css">
-  <link rel="stylesheet" href="/features/apps/routing.css">
-  <link rel="stylesheet" href="/css/login.css">
-  <link rel="stylesheet" href="/css/aurora-background.css">
-  <link rel="stylesheet" href="/css/topbar.css">
-  <link rel="stylesheet" href="/css/sidebar.css">
-  <link rel="stylesheet" href="/features/apps/apps-layout.css">
-  <link rel="stylesheet" href="/features/apps/apps.css">
-  <link rel="stylesheet" href="/shared/css/forms.css">
-  <link rel="stylesheet" href="/shared/css/config.css">
-  <link rel="stylesheet" href="/features/apps/service-buttons.css">
-  <link rel="stylesheet" href="/features/dashboard/dashboard.css">
-  <link rel="stylesheet" href="/features/tasks/tasks.css">
-  <link rel="stylesheet" href="/features/updater/updater.css">
-  <link rel="stylesheet" href="/css/update-notifier.css">
+  <link rel="stylesheet" href="/core/css/tokens.css">
+  <link rel="stylesheet" href="/core/css/themes.css">
+  <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="/core/css/modal.css">
+  <link rel="stylesheet" href="/components/apps/tools.css">
+  <link rel="stylesheet" href="/components/apps/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="/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="/core/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="/js/system/theme-registry.js"></script>
-  <script src="/js/system/custom-select.js"></script>
-  <script src="/js/system/custom-number.js"></script>
+  <script src="/core/boot/theme-registry.js"></script>
+  <script src="/core/boot/custom-select.js"></script>
+  <script src="/core/boot/custom-number.js"></script>
 </head>
 <body>
   <!-- Topbar Container -->
@@ -85,32 +85,32 @@
 
   <!-- Scripts -->
   <!-- Auth must load first — gates all other initialization -->
-  <script src="/js/system/auth-manager.js"></script>
+  <script src="/core/boot/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="/js/utils/lp-ui.js"></script>
-  <script src="/js/utils/dom-helpers.js"></script>
-  <script src="/js/utils/ui-helpers.js"></script>
-  <script src="/js/utils/router.js"></script>
-  <script src="/js/utils/data-loader.js"></script>
-  <script src="/js/utils/system-live.js"></script>
-  <script src="/js/utils/dismissible.js"></script>
-  <script src="/js/components/eo-modal.js"></script>
-  <script src="/shared/task/task-refresh-coordinator.js"></script>
-  <script src="/features/dashboard/dashboard.js"></script>
-  <script src="/js/system/system-loader.js"></script>
-  <script src="/js/system/loading-ui.js"></script>
-  <script src="/js/system/setup-detector.js"></script>
-  <script src="/js/system/setup-wizard.js"></script>
-  <script src="/js/system/setup-completion-watcher.js"></script>
-  <script src="/js/system/system-orchestrator.js"></script>
+  <script src="/core/lib/lp-ui.js"></script>
+  <script src="/core/lib/dom-helpers.js"></script>
+  <script src="/core/lib/ui-helpers.js"></script>
+  <script src="/core/lib/router.js"></script>
+  <script src="/core/lib/data-loader.js"></script>
+  <script src="/core/lib/system-live.js"></script>
+  <script src="/core/lib/dismissible.js"></script>
+  <script src="/core/ui/eo-modal.js"></script>
+  <script src="/core/lib/task-refresh-coordinator.js"></script>
+  <script src="/components/dashboard/dashboard.js"></script>
+  <script src="/core/boot/system-loader.js"></script>
+  <script src="/core/boot/loading-ui.js"></script>
+  <script src="/core/boot/setup-detector.js"></script>
+  <script src="/core/boot/setup-wizard.js"></script>
+  <script src="/core/boot/setup-completion-watcher.js"></script>
+  <script src="/core/boot/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="/kernel/feature-registry.js"></script>
-  <script src="/kernel/services.js"></script>
-  <script src="/kernel/lifecycle.js"></script>
+  <script src="/core/kernel/feature-registry.js"></script>
+  <script src="/core/kernel/services.js"></script>
+  <script src="/core/kernel/lifecycle.js"></script>
   <!-- Feature modules are NOT listed here: the kernel loads each feature's
        self-registering index.js from the manifest (features/manifest.dev.json)
        before routing. Adding a page = drop a features/<id>/ folder + a manifest
@@ -123,6 +123,6 @@
     land on. Each handler's loadScript() call is idempotent — subsequent
     navigations to the same route are free.
   -->
-  <script src="/js/spa.js"></script>
+  <script src="/core/kernel/spa.js"></script>
 </body>
 </html>
diff --git a/containers/libreportal/frontend/js/utils/html-cache.js b/containers/libreportal/frontend/js/utils/html-cache.js
deleted file mode 100755
index e69de29..0000000