diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index 4149b97..f32635f 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -1,14 +1,14 @@
 import AppLayout from '@/layouts/AppLayout.vue';
 import ChangePassword from '@/views/ChangePassword';
-import ClientSessions from '@/views/AccessControl/ClientSessions';
+import Sessions from '@/views/SecurityAndAccess/Sessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
 import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 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 Ldap from '@/views/SecurityAndAccess/Ldap';
+import UserManagement from '@/views/SecurityAndAccess/UserManagement';
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
@@ -19,12 +19,12 @@
 import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Settings/SecuritySettings';
+import Policies from '@/views/SecurityAndAccess/Policies';
 import Sensors from '@/views/HardwareStatus/Sensors';
 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 Certificates from '@/views/SecurityAndAccess/Certificates';
 import i18n from '@/i18n';
 
 // Custom components
@@ -135,15 +135,15 @@
         },
       },
       {
-        path: '/access-control/client-sessions',
-        name: 'client-sessions',
-        component: ClientSessions,
+        path: '/security-and-access/sessions',
+        name: 'sessions',
+        component: Sessions,
         meta: {
-          title: i18n.t('appPageTitle.clientSessions'),
+          title: i18n.t('appPageTitle.sessions'),
         },
       },
       {
-        path: '/access-control/ldap',
+        path: '/security-and-access/ldap',
         name: 'ldap',
         component: Ldap,
         meta: {
@@ -151,19 +151,27 @@
         },
       },
       {
-        path: '/access-control/local-user-management',
-        name: 'local-users',
-        component: LocalUserManagement,
+        path: '/security-and-access/user-management',
+        name: 'user-management',
+        component: UserManagement,
         meta: {
-          title: i18n.t('appPageTitle.localUserManagement'),
+          title: i18n.t('appPageTitle.userManagement'),
         },
       },
       {
-        path: '/access-control/ssl-certificates',
-        name: 'ssl-certificates',
-        component: SslCertificates,
+        path: '/security-and-access/policies',
+        name: 'policies',
+        component: Policies,
         meta: {
-          title: i18n.t('appPageTitle.sslCertificates'),
+          title: i18n.t('appPageTitle.policies'),
+        },
+      },
+      {
+        path: '/security-and-access/certificates',
+        name: 'certificates',
+        component: Certificates,
+        meta: {
+          title: i18n.t('appPageTitle.certificates'),
         },
       },
       {
@@ -207,14 +215,6 @@
         },
       },
       {
-        path: '/settings/security-settings',
-        name: 'security-settings',
-        component: SecuritySettings,
-        meta: {
-          title: i18n.t('appPageTitle.securitySettings'),
-        },
-      },
-      {
         path: '/operations/factory-reset',
         name: 'factory-reset',
         component: FactoryReset,
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index a8c5a2a..dec42af 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -1,6 +1,6 @@
 import AppLayout from '@/layouts/AppLayout.vue';
 import ChangePassword from '@/views/ChangePassword';
-import ClientSessions from '@/views/AccessControl/ClientSessions';
+import Sessions from '@/views/SecurityAndAccess/Sessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
 import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
@@ -8,7 +8,7 @@
 import Inventory from '@/views/HardwareStatus/Inventory';
 import Kvm from '@/views/Operations/Kvm';
 import KvmConsole from '@/views/Operations/Kvm/KvmConsole';
-import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
+import UserManagement from '@/views/SecurityAndAccess/UserManagement';
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
@@ -17,12 +17,12 @@
 import PageNotFound from '@/views/PageNotFound';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Settings/SecuritySettings';
+import Policies from '@/views/SecurityAndAccess/Policies';
 import Sensors from '@/views/HardwareStatus/Sensors';
 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 Certificates from '@/views/SecurityAndAccess/Certificates';
 import VirtualMedia from '@/views/Operations/VirtualMedia';
 import i18n from '@/i18n';
 
@@ -123,27 +123,35 @@
         },
       },
       {
-        path: '/access-control/client-sessions',
-        name: 'client-sessions',
-        component: ClientSessions,
+        path: '/security-and-access/sessions',
+        name: 'sessions',
+        component: Sessions,
         meta: {
-          title: i18n.t('appPageTitle.clientSessions'),
+          title: i18n.t('appPageTitle.sessions'),
         },
       },
       {
-        path: '/access-control/local-user-management',
-        name: 'local-users',
-        component: LocalUserManagement,
+        path: '/security-and-access/user-management',
+        name: 'user-management',
+        component: UserManagement,
         meta: {
-          title: i18n.t('appPageTitle.localUserManagement'),
+          title: i18n.t('appPageTitle.userManagement'),
         },
       },
       {
-        path: '/access-control/ssl-certificates',
-        name: 'ssl-certificates',
-        component: SslCertificates,
+        path: '/security-and-access/policies',
+        name: 'policies',
+        component: Policies,
         meta: {
-          title: i18n.t('appPageTitle.sslCertificates'),
+          title: i18n.t('appPageTitle.policies'),
+        },
+      },
+      {
+        path: '/security-and-access/certificates',
+        name: 'certificates',
+        component: Certificates,
+        meta: {
+          title: i18n.t('appPageTitle.certificates'),
         },
       },
       {
@@ -187,14 +195,6 @@
         },
       },
       {
-        path: '/settings/security-settings',
-        name: 'security-settings',
-        component: SecuritySettings,
-        meta: {
-          title: i18n.t('appPageTitle.securitySettings'),
-        },
-      },
-      {
         path: '/operations/reboot-bmc',
         name: 'reboot-bmc',
         component: RebootBmc,