diff --git a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
index 4e82237..fb68a4c 100755
--- a/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
+++ b/containers/libreportal/frontend/components/apps/core/js/apps-manager.js
@@ -1287,10 +1287,10 @@ class AppsManager {
       
       // Only load scripts if they're not already loaded
       const scripts = [
-        { name: 'TaskManager', src: '/core/lib/task/task-manager.js' },
-        { name: 'TaskCommands', src: '/core/lib/task/task-commands.js' },
-        { name: 'TaskActions', src: '/core/lib/task/task-actions.js' },
-        { name: 'TaskRouter', src: '/core/lib/task/task-router.js' },
+        { name: 'TaskManager', src: '/core/tasks/task-manager.js' },
+        { name: 'TaskCommands', src: '/core/tasks/task-commands.js' },
+        { name: 'TaskActions', src: '/core/tasks/task-actions.js' },
+        { name: 'TaskRouter', src: '/core/tasks/task-router.js' },
         { name: 'TasksManager', src: '/components/tasks/js/tasks-manager.js' }
       ];
       
diff --git a/containers/libreportal/frontend/core/lib/util/ui-helpers.js b/containers/libreportal/frontend/core/app-meta/app-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/ui-helpers.js
rename to containers/libreportal/frontend/core/app-meta/app-helpers.js
diff --git a/containers/libreportal/frontend/core/boot/system-loader.js b/containers/libreportal/frontend/core/boot/system-loader.js
index c54d2ab..69bbbb7 100755
--- a/containers/libreportal/frontend/core/boot/system-loader.js
+++ b/containers/libreportal/frontend/core/boot/system-loader.js
@@ -39,8 +39,8 @@ class SystemLoader {
       global: 'configManager',
       dependencies: ['data'],
       scripts: [
-        '/core/lib/config/config-options.js',
-        '/core/lib/config/config-shared.js',
+        '/core/config/options.js',
+        '/core/config/field-factory.js',
         '/components/admin/config/js/config-validator.js',
         '/components/admin/config/js/toggle-manager.js',
         '/components/admin/config/js/config-core.js',
@@ -162,12 +162,12 @@ class SystemLoader {
       global: 'tasksManager',
       dependencies: [],
       scripts: [
-        '/core/lib/task/task-event-bus.js',
-        '/core/lib/task/task-commands.js',
-        '/core/lib/task/task-actions.js',
-        '/core/lib/task/task-router.js',
-        '/core/lib/task/task-manager.js',
-        '/core/lib/task/task-parameter-preserve.js',
+        '/core/tasks/task-event-bus.js',
+        '/core/tasks/task-commands.js',
+        '/core/tasks/task-actions.js',
+        '/core/tasks/task-router.js',
+        '/core/tasks/task-manager.js',
+        '/core/tasks/task-parameter-preserve.js',
         '/components/tasks/js/tasks-manager.js',          // base: class + constructor + init + bus wiring
         // prototype-augment clusters (load after base; ordered via async=false):
         '/components/tasks/js/tasks-format.js',
@@ -208,7 +208,7 @@ class SystemLoader {
       dependencies: ['data'],
       scripts: [
         '/components/apps/port-manager/js/port-manager.js',
-        '/core/lib/task/task-manager.js',  // Add TaskManager for backup functionality
+        '/core/tasks/task-manager.js',  // Add TaskManager for backup functionality
         '/core/ui/backup-app-card.js',
         '/components/apps/services/js/services-manager.js',
         '/components/apps/tools/js/tools-manager.js',
diff --git a/containers/libreportal/frontend/core/lib/config/config-shared.js b/containers/libreportal/frontend/core/config/field-factory.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/config/config-shared.js
rename to containers/libreportal/frontend/core/config/field-factory.js
diff --git a/containers/libreportal/frontend/core/lib/config/config-options.js b/containers/libreportal/frontend/core/config/options.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/config/config-options.js
rename to containers/libreportal/frontend/core/config/options.js
diff --git a/containers/libreportal/frontend/core/lib/util/data-loader.js b/containers/libreportal/frontend/core/data/data-loader.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/data-loader.js
rename to containers/libreportal/frontend/core/data/data-loader.js
diff --git a/containers/libreportal/frontend/core/lib/util/dom-helpers.js b/containers/libreportal/frontend/core/dom/dom-helpers.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/dom-helpers.js
rename to containers/libreportal/frontend/core/dom/dom-helpers.js
diff --git a/containers/libreportal/frontend/core/lib/util/system-live.js b/containers/libreportal/frontend/core/live/live-system.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/system-live.js
rename to containers/libreportal/frontend/core/live/live-system.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-actions.js b/containers/libreportal/frontend/core/tasks/task-actions.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-actions.js
rename to containers/libreportal/frontend/core/tasks/task-actions.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-commands.js b/containers/libreportal/frontend/core/tasks/task-commands.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-commands.js
rename to containers/libreportal/frontend/core/tasks/task-commands.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-event-bus.js b/containers/libreportal/frontend/core/tasks/task-event-bus.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-event-bus.js
rename to containers/libreportal/frontend/core/tasks/task-event-bus.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-manager.js b/containers/libreportal/frontend/core/tasks/task-manager.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-manager.js
rename to containers/libreportal/frontend/core/tasks/task-manager.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js b/containers/libreportal/frontend/core/tasks/task-parameter-preserve.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-parameter-preserve.js
rename to containers/libreportal/frontend/core/tasks/task-parameter-preserve.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js b/containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-refresh-coordinator.js
rename to containers/libreportal/frontend/core/tasks/task-refresh-coordinator.js
diff --git a/containers/libreportal/frontend/core/lib/task/task-router.js b/containers/libreportal/frontend/core/tasks/task-router.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/task/task-router.js
rename to containers/libreportal/frontend/core/tasks/task-router.js
diff --git a/containers/libreportal/frontend/core/boot/theme-registry.js b/containers/libreportal/frontend/core/theme/theme-registry.js
similarity index 100%
rename from containers/libreportal/frontend/core/boot/theme-registry.js
rename to containers/libreportal/frontend/core/theme/theme-registry.js
diff --git a/containers/libreportal/frontend/core/lib/util/lp-ui.js b/containers/libreportal/frontend/core/ui-mode/lp-ui.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/lp-ui.js
rename to containers/libreportal/frontend/core/ui-mode/lp-ui.js
diff --git a/containers/libreportal/frontend/core/lib/util/dismissible.js b/containers/libreportal/frontend/core/ui-state/dismissible.js
similarity index 100%
rename from containers/libreportal/frontend/core/lib/util/dismissible.js
rename to containers/libreportal/frontend/core/ui-state/dismissible.js
diff --git a/containers/libreportal/frontend/core/ui/topbar.html b/containers/libreportal/frontend/core/ui/topbar.html
index e817ebd..efc3e30 100755
--- a/containers/libreportal/frontend/core/ui/topbar.html
+++ b/containers/libreportal/frontend/core/ui/topbar.html
@@ -78,7 +78,7 @@
     <div class="mobile-drawer-page-section" id="mobile-drawer-page-section"></div>
     <div class="topbar-controls">
       <select id="theme-selector" class="theme-selector" aria-label="Theme">
-        <!-- Options populated by ThemeRegistry — see /core/boot/theme-registry.js -->
+        <!-- Options populated by ThemeRegistry — see /core/theme/theme-registry.js -->
       </select>
       <button class="donate-btn">Donate</button>
       <button class="logout-btn" id="logout-btn" title="Logout">
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index f8ffc01..7dea419 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -66,7 +66,7 @@
       );
     })();
   </script>
-  <script src="/core/boot/theme-registry.js"></script>
+  <script src="/core/theme/theme-registry.js"></script>
   <script src="/core/boot/controls/custom-select.js"></script>
   <script src="/core/boot/controls/custom-number.js"></script>
 </head>
@@ -89,14 +89,14 @@
   <!-- Essential Bootstrap -->
   <!-- LpUi runs first so body.lp-ui--advanced / lp-ui--dev are set
        before any page/component renders → no FOUC of advanced sections. -->
-  <script src="/core/lib/util/lp-ui.js"></script>
-  <script src="/core/lib/util/dom-helpers.js"></script>
-  <script src="/core/lib/util/ui-helpers.js"></script>
-  <script src="/core/lib/util/data-loader.js"></script>
-  <script src="/core/lib/util/system-live.js"></script>
-  <script src="/core/lib/util/dismissible.js"></script>
+  <script src="/core/ui-mode/lp-ui.js"></script>
+  <script src="/core/dom/dom-helpers.js"></script>
+  <script src="/core/app-meta/app-helpers.js"></script>
+  <script src="/core/data/data-loader.js"></script>
+  <script src="/core/live/live-system.js"></script>
+  <script src="/core/ui-state/dismissible.js"></script>
   <script src="/core/ui/eo-modal.js"></script>
-  <script src="/core/lib/task/task-refresh-coordinator.js"></script>
+  <script src="/core/tasks/task-refresh-coordinator.js"></script>
   <script src="/components/dashboard/js/dashboard.js"></script>
   <script src="/core/boot/system-loader.js"></script>
   <script src="/core/boot/loading-ui.js"></script>