diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index fa3891e..d6a6289 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -12,7 +12,7 @@
     iconLogs: IconTextLinkAnalysis,
     iconHealth: IconDataCheck,
     iconControl: IconSettingsAdjust,
-    iconConfiguration: IconSettings,
+    iconSettings: IconSettings,
     iconAccessControl: IconPassword,
     iconExpand: IconChevronUp,
   },
@@ -85,11 +85,6 @@
               route: '/operations/manage-power-usage',
             },
             {
-              id: 'power-restore-policy',
-              label: this.$t('appNavigation.powerRestorePolicy'),
-              route: '/operations/power-restore-policy',
-            },
-            {
               id: 'reboot-bmc',
               label: this.$t('appNavigation.rebootBmc'),
               route: '/operations/reboot-bmc',
@@ -107,29 +102,29 @@
           ],
         },
         {
-          id: 'configuration',
-          label: this.$t('appNavigation.configuration'),
-          icon: 'iconConfiguration',
+          id: 'settings',
+          label: this.$t('appNavigation.settings'),
+          icon: 'iconSettings',
           children: [
             {
-              id: 'date-time-settings',
-              label: this.$t('appNavigation.dateTimeSettings'),
-              route: '/configuration/date-time-settings',
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/settings/date-time',
             },
             {
-              id: 'network-settings',
-              label: this.$t('appNavigation.networkSettings'),
-              route: '/configuration/network-settings',
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/settings/network',
+            },
+            {
+              id: 'power-restore-policy',
+              label: this.$t('appNavigation.powerRestorePolicy'),
+              route: '/settings/power-restore-policy',
             },
             {
               id: 'security-settings',
               label: this.$t('appNavigation.securitySettings'),
-              route: '/configuration/security-settings',
-            },
-            {
-              id: 'snmp-settings',
-              label: this.$t('appNavigation.snmpSettings'),
-              route: '/configuration/snmp-settings',
+              route: '/settings/security-settings',
             },
           ],
         },
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 2c4188c..20aa4f2 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -12,7 +12,7 @@
     iconLogs: IconTextLinkAnalysis,
     iconHealth: IconDataCheck,
     iconControl: IconSettingsAdjust,
-    iconConfiguration: IconSettings,
+    iconSettings: IconSettings,
     iconAccessControl: IconPassword,
     iconExpand: IconChevronUp,
   },
@@ -97,24 +97,24 @@
           ],
         },
         {
-          id: 'configuration',
-          label: this.$t('appNavigation.configuration'),
-          icon: 'iconConfiguration',
+          id: 'settings',
+          label: this.$t('appNavigation.settings'),
+          icon: 'iconSettings',
           children: [
             {
-              id: 'date-time-settings',
-              label: this.$t('appNavigation.dateTimeSettings'),
-              route: '/configuration/date-time-settings',
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/settings/date-time',
             },
             {
-              id: 'network-settings',
-              label: this.$t('appNavigation.networkSettings'),
-              route: '/configuration/network-settings',
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/settings/network',
             },
             {
               id: 'security-settings',
               label: this.$t('appNavigation.securitySettings'),
-              route: '/configuration/security-settings',
+              route: '/settings/security-settings',
             },
           ],
         },
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index b0129ea..4149b97 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -2,7 +2,7 @@
 import ChangePassword from '@/views/ChangePassword';
 import ClientSessions from '@/views/AccessControl/ClientSessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
-import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
+import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 import FactoryReset from '@/views/Operations/FactoryReset';
 import Firmware from '@/views/Operations/Firmware';
@@ -12,14 +12,14 @@
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
-import NetworkSettings from '@/views/Configuration/NetworkSettings';
+import Network from '@/views/Settings/Network';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Configuration/SecuritySettings';
+import SecuritySettings from '@/views/Settings/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
@@ -167,11 +167,11 @@
         },
       },
       {
-        path: '/configuration/date-time-settings',
-        name: 'date-time-settings',
-        component: DateTimeSettings,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTimeSettings'),
+          title: i18n.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -191,7 +191,15 @@
         },
       },
       {
-        path: '/operations/power-restore-policy',
+        path: '/settings/network',
+        name: 'network',
+        component: Network,
+        meta: {
+          title: i18n.t('appPageTitle.network'),
+        },
+      },
+      {
+        path: '/settings/power-restore-policy',
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
         meta: {
@@ -199,15 +207,7 @@
         },
       },
       {
-        path: '/configuration/network-settings',
-        name: 'network-settings',
-        component: NetworkSettings,
-        meta: {
-          title: i18n.t('appPageTitle.networkSettings'),
-        },
-      },
-      {
-        path: '/configuration/security-settings',
+        path: '/settings/security-settings',
         name: 'security-settings',
         component: SecuritySettings,
         meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 04fc0ef..a8c5a2a 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -2,7 +2,7 @@
 import ChangePassword from '@/views/ChangePassword';
 import ClientSessions from '@/views/AccessControl/ClientSessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
-import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
+import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 import Firmware from '@/views/Operations/Firmware';
 import Inventory from '@/views/HardwareStatus/Inventory';
@@ -12,12 +12,12 @@
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
-import NetworkSettings from '@/views/Configuration/NetworkSettings';
+import Network from '@/views/Settings/Network';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Configuration/SecuritySettings';
+import SecuritySettings from '@/views/Settings/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
@@ -147,11 +147,11 @@
         },
       },
       {
-        path: '/configuration/date-time-settings',
-        name: 'date-time-settings',
-        component: DateTimeSettings,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTimeSettings'),
+          title: i18n.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -179,15 +179,15 @@
         },
       },
       {
-        path: '/configuration/network-settings',
-        name: 'network-settings',
-        component: NetworkSettings,
+        path: '/settings/network',
+        name: 'network',
+        component: Network,
         meta: {
-          title: i18n.t('appPageTitle.networkSettings'),
+          title: i18n.t('appPageTitle.network'),
         },
       },
       {
-        path: '/configuration/security-settings',
+        path: '/settings/security-settings',
         name: 'security-settings',
         component: SecuritySettings,
         meta: {