diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index 0128d74..fa3891e 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -65,44 +65,44 @@
           ],
         },
         {
-          id: 'control',
-          label: this.$t('appNavigation.control'),
+          id: 'operations',
+          label: this.$t('appNavigation.operations'),
           icon: 'iconControl',
           children: [
             {
               id: 'factory-reset',
               label: this.$t('appNavigation.factoryReset'),
-              route: '/control/factory-reset',
+              route: '/operations/factory-reset',
+            },
+            {
+              id: 'firmware',
+              label: this.$t('appNavigation.firmware'),
+              route: '/operations/firmware',
             },
             {
               id: 'manage-power-usage',
               label: this.$t('appNavigation.managePowerUsage'),
-              route: '/control/manage-power-usage',
+              route: '/operations/manage-power-usage',
             },
             {
               id: 'power-restore-policy',
               label: this.$t('appNavigation.powerRestorePolicy'),
-              route: '/control/power-restore-policy',
+              route: '/operations/power-restore-policy',
             },
             {
               id: 'reboot-bmc',
               label: this.$t('appNavigation.rebootBmc'),
-              route: '/control/reboot-bmc',
+              route: '/operations/reboot-bmc',
             },
             {
               id: 'serial-over-lan',
               label: this.$t('appNavigation.serialOverLan'),
-              route: '/control/serial-over-lan',
-            },
-            {
-              id: 'server-led',
-              label: this.$t('appNavigation.serverLed'),
-              route: '/control/server-led',
+              route: '/operations/serial-over-lan',
             },
             {
               id: 'server-power-operations',
               label: this.$t('appNavigation.serverPowerOperations'),
-              route: '/control/server-power-operations',
+              route: '/operations/server-power-operations',
             },
           ],
         },
@@ -117,11 +117,6 @@
               route: '/configuration/date-time-settings',
             },
             {
-              id: 'firmware',
-              label: this.$t('appNavigation.firmware'),
-              route: '/configuration/firmware',
-            },
-            {
               id: 'network-settings',
               label: this.$t('appNavigation.networkSettings'),
               route: '/configuration/network-settings',
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 68557c1..2c4188c 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -55,44 +55,44 @@
           ],
         },
         {
-          id: 'control',
-          label: this.$t('appNavigation.control'),
+          id: 'operations',
+          label: this.$t('appNavigation.operations'),
           icon: 'iconControl',
           children: [
             {
               id: 'kvm',
               label: this.$t('appNavigation.kvm'),
-              route: '/control/kvm',
+              route: '/operations/kvm',
+            },
+            {
+              id: 'firmware',
+              label: this.$t('appNavigation.firmware'),
+              route: '/operations/firmware',
             },
             {
               id: 'manage-power-usage',
               label: this.$t('appNavigation.managePowerUsage'),
-              route: '/control/manage-power-usage',
+              route: '/operations/manage-power-usage',
             },
             {
               id: 'reboot-bmc',
               label: this.$t('appNavigation.rebootBmc'),
-              route: '/control/reboot-bmc',
+              route: '/operations/reboot-bmc',
             },
             {
               id: 'serial-over-lan',
               label: this.$t('appNavigation.serialOverLan'),
-              route: '/control/serial-over-lan',
-            },
-            {
-              id: 'server-led',
-              label: this.$t('appNavigation.serverLed'),
-              route: '/control/server-led',
+              route: '/operations/serial-over-lan',
             },
             {
               id: 'server-power-operations',
               label: this.$t('appNavigation.serverPowerOperations'),
-              route: '/control/server-power-operations',
+              route: '/operations/server-power-operations',
             },
             {
               id: 'virtual-media',
               label: this.$t('appNavigation.virtualMedia'),
-              route: '/control/virtual-media',
+              route: '/operations/virtual-media',
             },
           ],
         },
@@ -107,11 +107,6 @@
               route: '/configuration/date-time-settings',
             },
             {
-              id: 'firmware',
-              label: this.$t('appNavigation.firmware'),
-              route: '/configuration/firmware',
-            },
-            {
               id: 'network-settings',
               label: this.$t('appNavigation.networkSettings'),
               route: '/configuration/network-settings',
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index 208cd97..b0129ea 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -4,27 +4,26 @@
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
 import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
 import EventLogs from '@/views/Logs/EventLogs';
-import FactoryReset from '@/views/Control/FactoryReset';
-import Firmware from '@/views/Configuration/Firmware';
+import FactoryReset from '@/views/Operations/FactoryReset';
+import Firmware from '@/views/Operations/Firmware';
 import Inventory from '@/views/HardwareStatus/Inventory';
 import Ldap from '@/views/AccessControl/Ldap';
 import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
-import ManagePowerUsage from '@/views/Control/ManagePowerUsage';
+import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
 import NetworkSettings from '@/views/Configuration/NetworkSettings';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
-import RebootBmc from '@/views/Control/RebootBmc';
+import RebootBmc from '@/views/Operations/RebootBmc';
 import SecuritySettings from '@/views/Configuration/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
-import SerialOverLan from '@/views/Control/SerialOverLan';
-import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole';
-import ServerLed from '@/views/Control/ServerLed';
-import ServerPowerOperations from '@/views/Control/ServerPowerOperations';
+import SerialOverLan from '@/views/Operations/SerialOverLan';
+import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
+import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
 import SslCertificates from '@/views/AccessControl/SslCertificates';
 import i18n from '@/i18n';
 
@@ -176,7 +175,7 @@
         },
       },
       {
-        path: '/configuration/firmware',
+        path: '/operations/firmware',
         name: 'firmware',
         component: Firmware,
         meta: {
@@ -184,7 +183,7 @@
         },
       },
       {
-        path: '/control/manage-power-usage',
+        path: '/operations/manage-power-usage',
         name: 'manage-power-usage',
         component: ManagePowerUsage,
         meta: {
@@ -192,7 +191,7 @@
         },
       },
       {
-        path: '/control/power-restore-policy',
+        path: '/operations/power-restore-policy',
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
         meta: {
@@ -216,7 +215,7 @@
         },
       },
       {
-        path: '/control/factory-reset',
+        path: '/operations/factory-reset',
         name: 'factory-reset',
         component: FactoryReset,
         meta: {
@@ -224,7 +223,7 @@
         },
       },
       {
-        path: '/control/reboot-bmc',
+        path: '/operations/reboot-bmc',
         name: 'reboot-bmc',
         component: RebootBmc,
         meta: {
@@ -232,15 +231,7 @@
         },
       },
       {
-        path: '/control/server-led',
-        name: 'server-led',
-        component: ServerLed,
-        meta: {
-          title: i18n.t('appPageTitle.serverLed'),
-        },
-      },
-      {
-        path: '/control/serial-over-lan',
+        path: '/operations/serial-over-lan',
         name: 'serial-over-lan',
         component: SerialOverLan,
         meta: {
@@ -248,7 +239,7 @@
         },
       },
       {
-        path: '/control/server-power-operations',
+        path: '/operations/server-power-operations',
         name: 'server-power-operations',
         component: ServerPowerOperations,
         meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 53ae5d4..04fc0ef 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -4,27 +4,26 @@
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
 import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
 import EventLogs from '@/views/Logs/EventLogs';
-import Firmware from '@/views/Configuration/Firmware';
+import Firmware from '@/views/Operations/Firmware';
 import Inventory from '@/views/HardwareStatus/Inventory';
-import Kvm from '@/views/Control/Kvm';
-import KvmConsole from '@/views/Control/Kvm/KvmConsole';
+import Kvm from '@/views/Operations/Kvm';
+import KvmConsole from '@/views/Operations/Kvm/KvmConsole';
 import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
-import ManagePowerUsage from '@/views/Control/ManagePowerUsage';
+import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
 import NetworkSettings from '@/views/Configuration/NetworkSettings';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import ProfileSettings from '@/views/ProfileSettings';
-import RebootBmc from '@/views/Control/RebootBmc';
+import RebootBmc from '@/views/Operations/RebootBmc';
 import SecuritySettings from '@/views/Configuration/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
-import SerialOverLan from '@/views/Control/SerialOverLan';
-import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole';
-import ServerLed from '@/views/Control/ServerLed';
-import ServerPowerOperations from '@/views/Control/ServerPowerOperations';
+import SerialOverLan from '@/views/Operations/SerialOverLan';
+import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
+import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
 import SslCertificates from '@/views/AccessControl/SslCertificates';
-import VirtualMedia from '@/views/Control/VirtualMedia';
+import VirtualMedia from '@/views/Operations/VirtualMedia';
 import i18n from '@/i18n';
 
 const routes = [
@@ -156,15 +155,7 @@
         },
       },
       {
-        path: '/configuration/firmware',
-        name: 'firmware',
-        component: Firmware,
-        meta: {
-          title: i18n.t('appPageTitle.firmware'),
-        },
-      },
-      {
-        path: '/control/kvm',
+        path: '/operations/kvm',
         name: 'kvm',
         component: Kvm,
         meta: {
@@ -172,7 +163,15 @@
         },
       },
       {
-        path: '/control/manage-power-usage',
+        path: '/operations/firmware',
+        name: 'firmware',
+        component: Firmware,
+        meta: {
+          title: i18n.t('appPageTitle.firmware'),
+        },
+      },
+      {
+        path: '/operations/manage-power-usage',
         name: 'manage-power-usage',
         component: ManagePowerUsage,
         meta: {
@@ -196,7 +195,7 @@
         },
       },
       {
-        path: '/control/reboot-bmc',
+        path: '/operations/reboot-bmc',
         name: 'reboot-bmc',
         component: RebootBmc,
         meta: {
@@ -204,15 +203,7 @@
         },
       },
       {
-        path: '/control/server-led',
-        name: 'server-led',
-        component: ServerLed,
-        meta: {
-          title: i18n.t('appPageTitle.serverLed'),
-        },
-      },
-      {
-        path: '/control/serial-over-lan',
+        path: '/operations/serial-over-lan',
         name: 'serial-over-lan',
         component: SerialOverLan,
         meta: {
@@ -220,7 +211,7 @@
         },
       },
       {
-        path: '/control/server-power-operations',
+        path: '/operations/server-power-operations',
         name: 'server-power-operations',
         component: ServerPowerOperations,
         meta: {
@@ -228,7 +219,7 @@
         },
       },
       {
-        path: '/control/virtual-media',
+        path: '/operations/virtual-media',
         name: 'virtual-media',
         component: VirtualMedia,
         meta: {