diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index 8792ccc..0128d74 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -40,27 +40,27 @@
               label: this.$t('appNavigation.eventLogs'),
               route: '/logs/event-logs',
             },
-          ],
-        },
-        {
-          id: 'health',
-          label: this.$t('appNavigation.health'),
-          icon: 'iconHealth',
-          children: [
-            {
-              id: 'hardware-status',
-              label: this.$t('appNavigation.hardwareStatus'),
-              route: '/health/hardware-status',
-            },
             {
               id: 'post-code-logs',
               label: this.$t('appNavigation.postCodeLogs'),
-              route: '/health/post-code-logs',
+              route: '/logs/post-code-logs',
+            },
+          ],
+        },
+        {
+          id: 'hardware-status',
+          label: this.$t('appNavigation.hardwareStatus'),
+          icon: 'iconHealth',
+          children: [
+            {
+              id: 'inventory',
+              label: this.$t('appNavigation.inventory'),
+              route: '/hardware-status/inventory',
             },
             {
               id: 'sensors',
               label: this.$t('appNavigation.sensors'),
-              route: '/health/sensors',
+              route: '/hardware-status/sensors',
             },
           ],
         },
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 9c3591f..68557c1 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -38,19 +38,19 @@
           ],
         },
         {
-          id: 'health',
-          label: this.$t('appNavigation.health'),
+          id: 'hardware-status',
+          label: this.$t('appNavigation.hardwareStatus'),
           icon: 'iconHealth',
           children: [
             {
-              id: 'hardware-status',
-              label: this.$t('appNavigation.hardwareStatus'),
-              route: '/health/hardware-status',
+              id: 'inventory',
+              label: this.$t('appNavigation.inventory'),
+              route: '/hardware-status/inventory',
             },
             {
               id: 'sensors',
               label: this.$t('appNavigation.sensors'),
-              route: '/health/sensors',
+              route: '/hardware-status/sensors',
             },
           ],
         },
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index 8b94cf7..208cd97 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -6,7 +6,7 @@
 import EventLogs from '@/views/Logs/EventLogs';
 import FactoryReset from '@/views/Control/FactoryReset';
 import Firmware from '@/views/Configuration/Firmware';
-import HardwareStatus from '@/views/Health/HardwareStatus';
+import Inventory from '@/views/HardwareStatus/Inventory';
 import Ldap from '@/views/AccessControl/Ldap';
 import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
 import Login from '@/views/Login';
@@ -15,12 +15,12 @@
 import NetworkSettings from '@/views/Configuration/NetworkSettings';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
-import PostCodeLogs from '@/views/Health/PostCodeLogs';
+import PostCodeLogs from '@/views/Logs/PostCodeLogs';
 import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Control/RebootBmc';
 import SecuritySettings from '@/views/Configuration/SecuritySettings';
-import Sensors from '@/views/Health/Sensors';
+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';
@@ -112,15 +112,7 @@
         },
       },
       {
-        path: '/health/hardware-status',
-        name: 'hardware-status',
-        component: HardwareStatus,
-        meta: {
-          title: i18n.t('appPageTitle.hardwareStatus'),
-        },
-      },
-      {
-        path: '/health/post-code-logs',
+        path: '/logs/post-code-logs',
         name: 'post-code-logs',
         component: PostCodeLogs,
         meta: {
@@ -128,7 +120,15 @@
         },
       },
       {
-        path: '/health/sensors',
+        path: '/hardware-status/inventory',
+        name: 'inventory',
+        component: Inventory,
+        meta: {
+          title: i18n.t('appPageTitle.inventory'),
+        },
+      },
+      {
+        path: '/hardware-status/sensors',
         name: 'sensors',
         component: Sensors,
         meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 3e3349d..53ae5d4 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -5,7 +5,7 @@
 import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
 import EventLogs from '@/views/Logs/EventLogs';
 import Firmware from '@/views/Configuration/Firmware';
-import HardwareStatus from '@/views/Health/HardwareStatus';
+import Inventory from '@/views/HardwareStatus/Inventory';
 import Kvm from '@/views/Control/Kvm';
 import KvmConsole from '@/views/Control/Kvm/KvmConsole';
 import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
@@ -18,7 +18,7 @@
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Control/RebootBmc';
 import SecuritySettings from '@/views/Configuration/SecuritySettings';
-import Sensors from '@/views/Health/Sensors';
+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';
@@ -108,15 +108,15 @@
         },
       },
       {
-        path: '/health/hardware-status',
-        name: 'hardware-status',
-        component: HardwareStatus,
+        path: '/hardware-status/inventory',
+        name: 'inventory',
+        component: Inventory,
         meta: {
-          title: i18n.t('appPageTitle.hardwareStatus'),
+          title: i18n.t('appPageTitle.Inventory'),
         },
       },
       {
-        path: '/health/sensors',
+        path: '/hardware-status/sensors',
         name: 'sensors',
         component: Sensors,
         meta: {