diff --git a/containers/libreportal/frontend/js/components/app/app-tabbed-manager.js b/containers/libreportal/frontend/features/apps/app-tabbed-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/app-tabbed-manager.js
rename to containers/libreportal/frontend/features/apps/app-tabbed-manager.js
diff --git a/containers/libreportal/frontend/css/apps-layout.css b/containers/libreportal/frontend/features/apps/apps-layout.css
similarity index 100%
rename from containers/libreportal/frontend/css/apps-layout.css
rename to containers/libreportal/frontend/features/apps/apps-layout.css
diff --git a/containers/libreportal/frontend/js/components/app/apps-manager.js b/containers/libreportal/frontend/features/apps/apps-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/apps-manager.js
rename to containers/libreportal/frontend/features/apps/apps-manager.js
diff --git a/containers/libreportal/frontend/css/apps.css b/containers/libreportal/frontend/features/apps/apps.css
similarity index 100%
rename from containers/libreportal/frontend/css/apps.css
rename to containers/libreportal/frontend/features/apps/apps.css
diff --git a/containers/libreportal/frontend/css/port-manager.css b/containers/libreportal/frontend/features/apps/port-manager.css
similarity index 100%
rename from containers/libreportal/frontend/css/port-manager.css
rename to containers/libreportal/frontend/features/apps/port-manager.css
diff --git a/containers/libreportal/frontend/js/components/app/port-manager.js b/containers/libreportal/frontend/features/apps/port-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/port-manager.js
rename to containers/libreportal/frontend/features/apps/port-manager.js
diff --git a/containers/libreportal/frontend/js/components/app/routing-manager.js b/containers/libreportal/frontend/features/apps/routing-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/routing-manager.js
rename to containers/libreportal/frontend/features/apps/routing-manager.js
diff --git a/containers/libreportal/frontend/css/routing.css b/containers/libreportal/frontend/features/apps/routing.css
similarity index 100%
rename from containers/libreportal/frontend/css/routing.css
rename to containers/libreportal/frontend/features/apps/routing.css
diff --git a/containers/libreportal/frontend/css/service-buttons.css b/containers/libreportal/frontend/features/apps/service-buttons.css
similarity index 100%
rename from containers/libreportal/frontend/css/service-buttons.css
rename to containers/libreportal/frontend/features/apps/service-buttons.css
diff --git a/containers/libreportal/frontend/js/components/app/services-manager.js b/containers/libreportal/frontend/features/apps/services-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/services-manager.js
rename to containers/libreportal/frontend/features/apps/services-manager.js
diff --git a/containers/libreportal/frontend/css/services.css b/containers/libreportal/frontend/features/apps/services.css
similarity index 100%
rename from containers/libreportal/frontend/css/services.css
rename to containers/libreportal/frontend/features/apps/services.css
diff --git a/containers/libreportal/frontend/js/components/app/tools-manager.js b/containers/libreportal/frontend/features/apps/tools-manager.js
similarity index 100%
rename from containers/libreportal/frontend/js/components/app/tools-manager.js
rename to containers/libreportal/frontend/features/apps/tools-manager.js
diff --git a/containers/libreportal/frontend/css/tools.css b/containers/libreportal/frontend/features/apps/tools.css
similarity index 100%
rename from containers/libreportal/frontend/css/tools.css
rename to containers/libreportal/frontend/features/apps/tools.css
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index 202af9e..1cc98ad 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -17,23 +17,23 @@
   <link rel="stylesheet" href="/css/setup-wizard.css">
   <link rel="stylesheet" href="/css/style.css">
   <link rel="stylesheet" href="/css/ip-whitelist.css">
-  <link rel="stylesheet" href="/css/port-manager.css">
+  <link rel="stylesheet" href="/features/apps/port-manager.css">
   <link rel="stylesheet" href="/css/backup.css">
   <link rel="stylesheet" href="/css/ssh.css">
   <link rel="stylesheet" href="/css/admin.css">
-  <link rel="stylesheet" href="/css/services.css">
+  <link rel="stylesheet" href="/features/apps/services.css">
   <link rel="stylesheet" href="/css/modal.css">
-  <link rel="stylesheet" href="/css/tools.css">
-  <link rel="stylesheet" href="/css/routing.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="/css/apps-layout.css">
-  <link rel="stylesheet" href="/css/apps.css">
+  <link rel="stylesheet" href="/features/apps/apps-layout.css">
+  <link rel="stylesheet" href="/features/apps/apps.css">
   <link rel="stylesheet" href="/css/forms.css">
   <link rel="stylesheet" href="/css/config.css">
-  <link rel="stylesheet" href="/css/service-buttons.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="/css/update-notifier.css">
diff --git a/containers/libreportal/frontend/js/system/system-loader.js b/containers/libreportal/frontend/js/system/system-loader.js
index cdbfd2f..047adc9 100755
--- a/containers/libreportal/frontend/js/system/system-loader.js
+++ b/containers/libreportal/frontend/js/system/system-loader.js
@@ -204,13 +204,13 @@ class SystemLoader {
       global: 'appsManager',
       dependencies: ['data'],
       scripts: [
-        '/js/components/app/port-manager.js',
+        '/features/apps/port-manager.js',
         '/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',
-        '/js/components/app/routing-manager.js',
-        '/js/components/app/apps-manager.js'
+        '/features/apps/services-manager.js',
+        '/features/apps/tools-manager.js',
+        '/features/apps/routing-manager.js',
+        '/features/apps/apps-manager.js'
       ]
     });
     
@@ -232,7 +232,7 @@ class SystemLoader {
       },
       global: 'appTabbedManager',
       dependencies: [],
-      script: '/js/components/app/app-tabbed-manager.js'
+      script: '/features/apps/app-tabbed-manager.js'
     });
     
     // console.log('TEST: Components added. Total components:', this.components.size);