diff --git a/containers/libreportal/frontend/js/components/tasks/tasks-manager.js b/containers/libreportal/frontend/features/tasks/tasks-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/tasks/tasks-manager.js
rename to containers/libreportal/frontend/features/tasks/tasks-manager.js
diff --git a/containers/libreportal/frontend/css/tasks.css b/containers/libreportal/frontend/features/tasks/tasks.css
similarity index 100%
rename from containers/libreportal/frontend/css/tasks.css
rename to containers/libreportal/frontend/features/tasks/tasks.css
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 2c72f8d..202af9e 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -35,7 +35,7 @@
   <link rel="stylesheet" href="/css/config.css">
   <link rel="stylesheet" href="/css/service-buttons.css">
   <link rel="stylesheet" href="/features/dashboard/dashboard.css">
-  <link rel="stylesheet" href="/css/tasks.css">
+  <link rel="stylesheet" href="/features/tasks/tasks.css">
   <link rel="stylesheet" href="/css/update-notifier.css">
   <script>
     // Inline data-theme bootstrap — runs before any rendering so the right
@@ -96,7 +96,7 @@
   <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="/js/components/task/task-refresh-coordinator.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>
diff --git a/containers/libreportal/frontend/js/components/app/apps-manager.js b/containers/libreportal/frontend/js/components/app/apps-manager.js
index b8833c3..9711e6b 100755
--- a/containers/libreportal/frontend/js/components/app/apps-manager.js
+++ b/containers/libreportal/frontend/js/components/app/apps-manager.js
@@ -3350,11 +3350,11 @@ class AppsManager {
       
       // Only load scripts if they're not already loaded
       const scripts = [
-        { name: 'TaskManager', src: '/js/components/task/task-manager.js' },
-        { name: 'TaskCommands', src: '/js/components/task/task-commands.js' },
-        { name: 'TaskActions', src: '/js/components/task/task-actions.js' },
-        { name: 'TaskRouter', src: '/js/components/task/task-router.js' },
-        { name: 'TasksManager', src: '/js/components/tasks/tasks-manager.js' }
+        { 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' }
       ];
       
       for (const script of scripts) {
diff --git a/containers/libreportal/frontend/js/system/system-loader.js b/containers/libreportal/frontend/js/system/system-loader.js
index 0f10b53..cdbfd2f 100755
--- a/containers/libreportal/frontend/js/system/system-loader.js
+++ b/containers/libreportal/frontend/js/system/system-loader.js
@@ -167,14 +167,14 @@ class SystemLoader {
       global: 'tasksManager',
       dependencies: [],
       scripts: [
-        '/js/components/task/task-event-bus.js',
-        '/js/components/task/task-commands.js',
-        '/js/components/task/task-actions.js',
-        '/js/components/task/task-router.js',
-        '/js/components/task/task-global-functions.js',
-        '/js/components/task/task-manager.js',
+        '/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',
-        '/js/components/tasks/tasks-manager.js'
+        '/features/tasks/tasks-manager.js'
       ]
     });
     
@@ -205,7 +205,7 @@ class SystemLoader {
       dependencies: ['data'],
       scripts: [
         '/js/components/app/port-manager.js',
-        '/js/components/task/task-manager.js',  // Add TaskManager for backup functionality
+        '/shared/task/task-manager.js',  // Add TaskManager for backup functionality
         '/js/components/backup/backup-app-card.js',
         '/js/components/app/services-manager.js',
         '/js/components/app/tools-manager.js',
diff --git a/containers/libreportal/frontend/js/components/task/task-actions.js b/containers/libreportal/frontend/shared/task/task-actions.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-actions.js
rename to containers/libreportal/frontend/shared/task/task-actions.js
diff --git a/containers/libreportal/frontend/js/components/task/task-commands.js b/containers/libreportal/frontend/shared/task/task-commands.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-commands.js
rename to containers/libreportal/frontend/shared/task/task-commands.js
diff --git a/containers/libreportal/frontend/js/components/task/task-event-bus.js b/containers/libreportal/frontend/shared/task/task-event-bus.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-event-bus.js
rename to containers/libreportal/frontend/shared/task/task-event-bus.js
diff --git a/containers/libreportal/frontend/js/components/task/task-global-functions.js b/containers/libreportal/frontend/shared/task/task-global-functions.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-global-functions.js
rename to containers/libreportal/frontend/shared/task/task-global-functions.js
diff --git a/containers/libreportal/frontend/js/components/task/task-manager.js b/containers/libreportal/frontend/shared/task/task-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-manager.js
rename to containers/libreportal/frontend/shared/task/task-manager.js
diff --git a/containers/libreportal/frontend/js/components/task/task-refresh-coordinator.js b/containers/libreportal/frontend/shared/task/task-refresh-coordinator.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-refresh-coordinator.js
rename to containers/libreportal/frontend/shared/task/task-refresh-coordinator.js
diff --git a/containers/libreportal/frontend/js/components/task/task-router.js b/containers/libreportal/frontend/shared/task/task-router.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/task/task-router.js
rename to containers/libreportal/frontend/shared/task/task-router.js