Fix a little global components

Issue: SILABMC-191

75 files changed, 340 insertions, 325 deletions

diff --git a/src/assets/styles/bmc/_sila/_bootstrap-grid.scss b/src/assets/styles/bmc/_sila/_bootstrap-grid.scss
index 87332f4b..2e6c0882 100644
--- a/src/assets/styles/bmc/_sila/_bootstrap-grid.scss
+++ b/src/assets/styles/bmc/_sila/_bootstrap-grid.scss
@@ -5,6 +5,7 @@
   // so the content doesn't center align
   // https://bootstrap-vue.org/docs/components/layout#fluid-width-container
   margin-left: 0;
+  padding-left: 0;
 }
 
 @media (min-width: 1200px) {
diff --git a/src/components/_sila/Global/PageSection.vue b/src/components/_sila/Global/PageSection.vue
index dd39ddd5..f86649fe 100644
--- a/src/components/_sila/Global/PageSection.vue
+++ b/src/components/_sila/Global/PageSection.vue
@@ -19,7 +19,7 @@ export default {
 
 <style lang="scss" scoped>
 .page-section {
-  margin-bottom: $spacer * 4;
+  margin-bottom: $spacer;
 }
 
 h2 {
diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js
index bbbbb1ee..72008186 100644
--- a/src/env/components/AppNavigation/sila.js
+++ b/src/env/components/AppNavigation/sila.js
@@ -24,8 +24,24 @@ const AppNavigationMixin = {
         {
           id: 'overview',
           label: this.$t('appNavigation.overview'),
-          route: '/',
           icon: 'iconOverview',
+          children: [
+            {
+              id: 'inventory',
+              label: this.$t('appNavigation.inventory'),
+              route: '/hardware-inventory',
+            },
+            {
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/network',
+            },
+            {
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/date-time',
+            },
+          ],
         },
         {
           id: 'logs',
@@ -50,11 +66,6 @@ const AppNavigationMixin = {
           icon: 'iconHealth',
           children: [
             {
-              id: 'inventory',
-              label: this.$t('appNavigation.inventory'),
-              route: '/hardware-status/inventory',
-            },
-            {
               id: 'sensors',
               label: this.$t('appNavigation.sensors'),
               route: '/hardware-status/sensors',
@@ -114,16 +125,6 @@ const AppNavigationMixin = {
           icon: 'iconSettings',
           children: [
             {
-              id: 'date-time',
-              label: this.$t('appNavigation.dateTime'),
-              route: '/settings/date-time',
-            },
-            {
-              id: 'network',
-              label: this.$t('appNavigation.network'),
-              route: '/settings/network',
-            },
-            {
               id: 'power-restore-policy',
               label: this.$t('appNavigation.powerRestorePolicy'),
               route: '/settings/power-restore-policy',
diff --git a/src/env/router/sila.js b/src/env/router/sila.js
index 39590cfa..a622a436 100644
--- a/src/env/router/sila.js
+++ b/src/env/router/sila.js
@@ -2,18 +2,18 @@ import AppLayout from '@/layouts/_sila/AppLayout.vue';
 import ChangePassword from '@/views/_sila/ChangePassword';
 import Sessions from '@/views/_sila/SecurityAndAccess/Sessions';
 import ConsoleLayout from '@/layouts/_sila/ConsoleLayout.vue';
-import DateTime from '@/views/_sila/Settings/DateTime';
+import DateTime from '@/views/_sila/Overview/DateTime';
 import EventLogs from '@/views/_sila/Logs/EventLogs';
 import Firmware from '@/views/_sila/Operations/Firmware';
 import FactoryReset from '@/views/_sila/Operations/FactoryReset';
-import Inventory from '@/views/_sila/HardwareStatus/Inventory';
+import Inventory from '@/views/_sila/Overview/Inventory';
 import Kvm from '@/views/_sila/Operations/Kvm';
 import KvmConsole from '@/views/_sila/Operations/Kvm/KvmConsole';
 import Ldap from '@/views/_sila/SecurityAndAccess/Ldap';
 import UserManagement from '@/views/_sila/SecurityAndAccess/UserManagement';
 import Login from '@/views/_sila/Login';
 import LoginLayout from '@/layouts/_sila/LoginLayout';
-import Network from '@/views/_sila/Settings/Network';
+import Network from '@/views/_sila/Overview/Network';
 import Overview from '@/views/_sila/Overview';
 import PageNotFound from '@/views/_sila/PageNotFound';
 import PostCodeLogs from '@/views/_sila/Logs/PostCodeLogs';
@@ -96,6 +96,30 @@ const routes = [
         },
       },
       {
+        path: '/network',
+        name: 'network',
+        component: Network,
+        meta: {
+          title: i18n.t('appPageTitle.network'),
+        },
+      },
+      {
+        path: '/date-time',
+        name: 'date-time',
+        component: DateTime,
+        meta: {
+          title: i18n.t('appPageTitle.dateTime'),
+        },
+      },
+      {
+        path: '/hardware-inventory',
+        name: 'inventory',
+        component: Inventory,
+        meta: {
+          title: i18n.t('appPageTitle.inventory'),
+        },
+      },
+      {
         path: '/profile-settings',
         name: 'profile-settings',
         component: ProfileSettings,
@@ -120,14 +144,6 @@ const routes = [
         },
       },
       {
-        path: '/hardware-status/inventory',
-        name: 'inventory',
-        component: Inventory,
-        meta: {
-          title: i18n.t('appPageTitle.inventory'),
-        },
-      },
-      {
         path: '/hardware-status/sensors',
         name: 'sensors',
         component: Sensors,
@@ -176,14 +192,6 @@ const routes = [
         },
       },
       {
-        path: '/settings/date-time',
-        name: 'date-time',
-        component: DateTime,
-        meta: {
-          title: i18n.t('appPageTitle.dateTime'),
-        },
-      },
-      {
         path: '/operations/kvm',
         name: 'kvm',
         component: Kvm,
@@ -200,14 +208,6 @@ const routes = [
         },
       },
       {
-        path: '/settings/network',
-        name: 'network',
-        component: Network,
-        meta: {
-          title: i18n.t('appPageTitle.network'),
-        },
-      },
-      {
         path: '/settings/power-restore-policy',
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
diff --git a/src/views/_sila/ChangePassword/ChangePassword.vue b/src/views/_sila/ChangePassword/ChangePassword.vue
index 2440ace1..9bd243d1 100644
--- a/src/views/_sila/ChangePassword/ChangePassword.vue
+++ b/src/views/_sila/ChangePassword/ChangePassword.vue
@@ -73,10 +73,10 @@
 
 <script>
 import { required, sameAs } from 'vuelidate/lib/validators';
-import Alert from '@/components/Global/Alert';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import Alert from '@/components/_sila/Global/Alert';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   name: 'ChangePassword',
diff --git a/src/views/_sila/HardwareStatus/Sensors/Sensors.vue b/src/views/_sila/HardwareStatus/Sensors/Sensors.vue
index 6329d9d8..347efd6c 100644
--- a/src/views/_sila/HardwareStatus/Sensors/Sensors.vue
+++ b/src/views/_sila/HardwareStatus/Sensors/Sensors.vue
@@ -101,26 +101,26 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import Search from '@/components/Global/Search';
-import StatusIcon from '@/components/Global/StatusIcon';
-import TableFilter from '@/components/Global/TableFilter';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableToolbarExport from '@/components/Global/TableToolbarExport';
-import TableCellCount from '@/components/Global/TableCellCount';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import Search from '@/components/_sila/Global/Search';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import TableFilter from '@/components/_sila/Global/TableFilter';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableToolbarExport from '@/components/_sila/Global/TableToolbarExport';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
 
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 
 export default {
   name: 'Sensors',
diff --git a/src/views/_sila/Login/Login.vue b/src/views/_sila/Login/Login.vue
index 8d96573a..3c330362 100644
--- a/src/views/_sila/Login/Login.vue
+++ b/src/views/_sila/Login/Login.vue
@@ -65,10 +65,10 @@
 
 <script>
 import { required } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import i18n from '@/i18n';
-import Alert from '@/components/Global/Alert';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
+import Alert from '@/components/_sila/Global/Alert';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
 
 export default {
   name: 'Login',
diff --git a/src/views/_sila/Logs/Dumps/Dumps.vue b/src/views/_sila/Logs/Dumps/Dumps.vue
index 81c9de04..523d36d0 100644
--- a/src/views/_sila/Logs/Dumps/Dumps.vue
+++ b/src/views/_sila/Logs/Dumps/Dumps.vue
@@ -147,30 +147,30 @@
 import IconDelete from '@carbon/icons-vue/es/trash-can/20';
 import IconDownload from '@carbon/icons-vue/es/download/20';
 import DumpsForm from './DumpsForm';
-import PageSection from '@/components/Global/PageSection';
-import PageTitle from '@/components/Global/PageTitle';
-import Search from '@/components/Global/Search';
-import TableCellCount from '@/components/Global/TableCellCount';
-import TableDateFilter from '@/components/Global/TableDateFilter';
-import TableRowAction from '@/components/Global/TableRowAction';
-import TableToolbar from '@/components/Global/TableToolbar';
+import PageSection from '@/components/_sila/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import Search from '@/components/_sila/Global/Search';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import TableDateFilter from '@/components/_sila/Global/TableDateFilter';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+} from '@/components/_sila/Mixins/BVPaginationMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
-import TableFilter from '@/components/Global/TableFilter';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
+import TableFilter from '@/components/_sila/Global/TableFilter';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/Logs/Dumps/DumpsForm.vue b/src/views/_sila/Logs/Dumps/DumpsForm.vue
index 07f4a060..acd755c7 100644
--- a/src/views/_sila/Logs/Dumps/DumpsForm.vue
+++ b/src/views/_sila/Logs/Dumps/DumpsForm.vue
@@ -35,9 +35,9 @@
 <script>
 import { required } from 'vuelidate/lib/validators';
 import ModalConfirmation from './DumpsModalConfirmation';
-import Alert from '@/components/Global/Alert';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import Alert from '@/components/_sila/Global/Alert';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   components: { Alert, ModalConfirmation },
diff --git a/src/views/_sila/Logs/Dumps/DumpsModalConfirmation.vue b/src/views/_sila/Logs/Dumps/DumpsModalConfirmation.vue
index f8e20cfd..49ef960e 100644
--- a/src/views/_sila/Logs/Dumps/DumpsModalConfirmation.vue
+++ b/src/views/_sila/Logs/Dumps/DumpsModalConfirmation.vue
@@ -38,8 +38,8 @@
 </template>
 
 <script>
-import StatusIcon from '@/components/Global/StatusIcon';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   components: { StatusIcon },
diff --git a/src/views/_sila/Logs/EventLogs/EventLogs.vue b/src/views/_sila/Logs/EventLogs/EventLogs.vue
index 5b8ca110..adaa2e9e 100644
--- a/src/views/_sila/Logs/EventLogs/EventLogs.vue
+++ b/src/views/_sila/Logs/EventLogs/EventLogs.vue
@@ -247,37 +247,37 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 import IconDownload from '@carbon/icons-vue/es/download/20';
 import { omit } from 'lodash';
 
-import PageTitle from '@/components/Global/PageTitle';
-import StatusIcon from '@/components/Global/StatusIcon';
-import Search from '@/components/Global/Search';
-import TableCellCount from '@/components/Global/TableCellCount';
-import TableDateFilter from '@/components/Global/TableDateFilter';
-import TableFilter from '@/components/Global/TableFilter';
-import TableRowAction from '@/components/Global/TableRowAction';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableToolbarExport from '@/components/Global/TableToolbarExport';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import Search from '@/components/_sila/Global/Search';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import TableDateFilter from '@/components/_sila/Global/TableDateFilter';
+import TableFilter from '@/components/_sila/Global/TableFilter';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableToolbarExport from '@/components/_sila/Global/TableToolbarExport';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_sila/Mixins/BVPaginationMixin';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue
index d116d2ed..e05ef639 100644
--- a/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue
+++ b/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue
@@ -151,33 +151,33 @@
 import IconDownload from '@carbon/icons-vue/es/download/20';
 import IconExport from '@carbon/icons-vue/es/document--export/20';
 import { omit } from 'lodash';
-import PageTitle from '@/components/Global/PageTitle';
-import Search from '@/components/Global/Search';
-import TableCellCount from '@/components/Global/TableCellCount';
-import TableDateFilter from '@/components/Global/TableDateFilter';
-import TableRowAction from '@/components/Global/TableRowAction';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableToolbarExport from '@/components/Global/TableToolbarExport';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import Search from '@/components/_sila/Global/Search';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import TableDateFilter from '@/components/_sila/Global/TableDateFilter';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableToolbarExport from '@/components/_sila/Global/TableToolbarExport';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_sila/Mixins/BVPaginationMixin';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
index 897348fc..4e315619 100644
--- a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
+++ b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
@@ -56,9 +56,9 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import ModalReset from './FactoryResetModal';
 
 export default {
diff --git a/src/views/_sila/Operations/FactoryReset/FactoryResetModal.vue b/src/views/_sila/Operations/FactoryReset/FactoryResetModal.vue
index 170bf284..abe2e4c5 100644
--- a/src/views/_sila/Operations/FactoryReset/FactoryResetModal.vue
+++ b/src/views/_sila/Operations/FactoryReset/FactoryResetModal.vue
@@ -64,8 +64,8 @@
   </b-modal>
 </template>
 <script>
-import StatusIcon from '@/components/Global/StatusIcon';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin';
 
 export default {
   components: { StatusIcon },
diff --git a/src/views/_sila/Operations/Firmware/Firmware.vue b/src/views/_sila/Operations/Firmware/Firmware.vue
index a2acb9b0..0497376d 100644
--- a/src/views/_sila/Operations/Firmware/Firmware.vue
+++ b/src/views/_sila/Operations/Firmware/Firmware.vue
@@ -39,10 +39,12 @@ import AlertsServerPower from './FirmwareAlertServerPower';
 import BmcCards from './FirmwareCardsBmc';
 import FormUpdate from './FirmwareFormUpdate';
 import HostCards from './FirmwareCardsHost';
-import PageSection from '@/components/Global/PageSection';
-import PageTitle from '@/components/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'FirmwareSingleImage',
diff --git a/src/views/_sila/Operations/Firmware/FirmwareAlertServerPower.vue b/src/views/_sila/Operations/Firmware/FirmwareAlertServerPower.vue
index 24aa1d69..471ccfac 100644
--- a/src/views/_sila/Operations/Firmware/FirmwareAlertServerPower.vue
+++ b/src/views/_sila/Operations/Firmware/FirmwareAlertServerPower.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_sila/Global/Alert';
 
 export default {
   components: { Alert },
diff --git a/src/views/_sila/Operations/Firmware/FirmwareCardsBmc.vue b/src/views/_sila/Operations/Firmware/FirmwareCardsBmc.vue
index d79a8769..23c263d9 100644
--- a/src/views/_sila/Operations/Firmware/FirmwareCardsBmc.vue
+++ b/src/views/_sila/Operations/Firmware/FirmwareCardsBmc.vue
@@ -53,9 +53,11 @@
 
 <script>
 import IconSwitch from '@carbon/icons-vue/es/arrows--horizontal/20';
-import PageSection from '@/components/Global/PageSection';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 import ModalSwitchToRunning from './FirmwareModalSwitchToRunning';
 
diff --git a/src/views/_sila/Operations/Firmware/FirmwareCardsHost.vue b/src/views/_sila/Operations/Firmware/FirmwareCardsHost.vue
index b4a8e90d..03a25ee5 100644
--- a/src/views/_sila/Operations/Firmware/FirmwareCardsHost.vue
+++ b/src/views/_sila/Operations/Firmware/FirmwareCardsHost.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 
 export default {
   components: { PageSection },
diff --git a/src/views/_sila/Operations/Firmware/FirmwareFormUpdate.vue b/src/views/_sila/Operations/Firmware/FirmwareFormUpdate.vue
index ac4b23fc..23fe90f2 100644
--- a/src/views/_sila/Operations/Firmware/FirmwareFormUpdate.vue
+++ b/src/views/_sila/Operations/Firmware/FirmwareFormUpdate.vue
@@ -75,11 +75,13 @@
 <script>
 import { requiredIf } from 'vuelidate/lib/validators';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_sila/Global/FormFile';
 import ModalUpdateFirmware from './FirmwareModalUpdateFirmware';
 
 export default {
diff --git a/src/views/_sila/Operations/KeyClear/KeyClear.vue b/src/views/_sila/Operations/KeyClear/KeyClear.vue
index 2524da10..8955f6cd 100644
--- a/src/views/_sila/Operations/KeyClear/KeyClear.vue
+++ b/src/views/_sila/Operations/KeyClear/KeyClear.vue
@@ -65,10 +65,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import Alert from '@/components/Global/Alert';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import Alert from '@/components/_sila/Global/Alert';
 
 export default {
   name: 'KeyClear',
diff --git a/src/views/_sila/Operations/Kvm/Kvm.vue b/src/views/_sila/Operations/Kvm/Kvm.vue
index 1a41baaf..ede24608 100644
--- a/src/views/_sila/Operations/Kvm/Kvm.vue
+++ b/src/views/_sila/Operations/Kvm/Kvm.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 import KvmConsole from './KvmConsole';
 
 export default {
diff --git a/src/views/_sila/Operations/Kvm/KvmConsole.vue b/src/views/_sila/Operations/Kvm/KvmConsole.vue
index c028a9fc..50cbff7f 100644
--- a/src/views/_sila/Operations/Kvm/KvmConsole.vue
+++ b/src/views/_sila/Operations/Kvm/KvmConsole.vue
@@ -42,7 +42,7 @@
 
 <script>
 import RFB from '@novnc/novnc/core/rfb';
-import StatusIcon from '@/components/Global/StatusIcon';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
 import IconLaunch from '@carbon/icons-vue/es/launch/20';
 import IconArrowDown from '@carbon/icons-vue/es/arrow--down/16';
 import { throttle } from 'lodash';
diff --git a/src/views/_sila/Operations/RebootBmc/RebootBmc.vue b/src/views/_sila/Operations/RebootBmc/RebootBmc.vue
index 900619cd..fa16f55e 100644
--- a/src/views/_sila/Operations/RebootBmc/RebootBmc.vue
+++ b/src/views/_sila/Operations/RebootBmc/RebootBmc.vue
@@ -34,10 +34,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'RebootBmc',
diff --git a/src/views/_sila/Operations/SerialOverLan/SerialOverLan.vue b/src/views/_sila/Operations/SerialOverLan/SerialOverLan.vue
index 48a68345..22824772 100644
--- a/src/views/_sila/Operations/SerialOverLan/SerialOverLan.vue
+++ b/src/views/_sila/Operations/SerialOverLan/SerialOverLan.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
 import SerialOverLanConsole from './SerialOverLanConsole';
 
 export default {
diff --git a/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
index 694083fd..bf974b51 100644
--- a/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
+++ b/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
@@ -38,13 +38,13 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_sila/Global/Alert';
 import { AttachAddon } from 'xterm-addon-attach';
 import { FitAddon } from 'xterm-addon-fit';
 import { Terminal } from 'xterm';
 import { throttle } from 'lodash';
 import IconLaunch from '@carbon/icons-vue/es/launch/20';
-import StatusIcon from '@/components/Global/StatusIcon';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
 
 export default {
   name: 'SerialOverLanConsole',
diff --git a/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue b/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
index 4896286b..8d74e381 100644
--- a/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
@@ -51,8 +51,8 @@
 
 <script>
 import { mapState } from 'vuex';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'BootSettings',
diff --git a/src/views/_sila/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/_sila/Operations/ServerPowerOperations/ServerPowerOperations.vue
index 9e030837..e848215f 100644
--- a/src/views/_sila/Operations/ServerPowerOperations/ServerPowerOperations.vue
+++ b/src/views/_sila/Operations/ServerPowerOperations/ServerPowerOperations.vue
@@ -146,12 +146,12 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import BootSettings from './BootSettings';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import Alert from '@/components/Global/Alert';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import Alert from '@/components/_sila/Global/Alert';
 
 export default {
   name: 'ServerPowerOperations',
diff --git a/src/views/_sila/Operations/VirtualMedia/ModalConfigureConnection.vue b/src/views/_sila/Operations/VirtualMedia/ModalConfigureConnection.vue
index b0bcfb2b..9886eff5 100644
--- a/src/views/_sila/Operations/VirtualMedia/ModalConfigureConnection.vue
+++ b/src/views/_sila/Operations/VirtualMedia/ModalConfigureConnection.vue
@@ -71,7 +71,7 @@
 
 <script>
 import { required } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   mixins: [VuelidateMixin],
diff --git a/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue b/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
index 8a3d5add..0f75bbd7 100644
--- a/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
+++ b/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
@@ -97,13 +97,13 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import ModalConfigureConnection from './ModalConfigureConnection';
 import NbdServer from '@/utilities/NBDServer';
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_sila/Global/FormFile';
 
 export default {
   name: 'VirtualMedia',
diff --git a/src/views/_sila/Settings/DateTime/DateTime.vue b/src/views/_sila/Overview/DateTime/DateTime.vue
index f5e063d1..66871699 100644
--- a/src/views/_sila/Settings/DateTime/DateTime.vue
+++ b/src/views/_sila/Overview/DateTime/DateTime.vue
@@ -197,15 +197,17 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_sila/Global/Alert';
 import IconCalendar from '@carbon/icons-vue/es/calendar/20';
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import LocalTimezoneLabelMixin from '@/components/_sila/Mixins/LocalTimezoneLabelMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 import { mapState } from 'vuex';
 import { requiredIf, helpers } from 'vuelidate/lib/validators';
diff --git a/src/views/_sila/Settings/DateTime/index.js b/src/views/_sila/Overview/DateTime/index.js
index 2df21eae..2df21eae 100644
--- a/src/views/_sila/Settings/DateTime/index.js
+++ b/src/views/_sila/Overview/DateTime/index.js
diff --git a/src/views/_sila/HardwareStatus/Inventory/Inventory.vue b/src/views/_sila/Overview/Inventory/Inventory.vue
index fcdbf8d2..41258597 100644
--- a/src/views/_sila/HardwareStatus/Inventory/Inventory.vue
+++ b/src/views/_sila/Overview/Inventory/Inventory.vue
@@ -15,7 +15,7 @@
               :data-ref="item.dataRef"
               @click.prevent="scrollToOffset"
             >
-              <jump-link /> {{ item.linkText }}
+              {{ item.linkText }}
             </b-link>
           </div>
         </b-col>
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 import ServiceIndicator from './InventoryServiceIndicator';
 import TableSystem from './InventoryTableSystem';
 import TablePowerSupplies from './InventoryTablePowerSupplies';
@@ -59,10 +59,9 @@ import TableBmcManager from './InventoryTableBmcManager';
 import TableChassis from './InventoryTableChassis';
 import TableProcessors from './InventoryTableProcessors';
 import TableAssembly from './InventoryTableAssembly';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import PageSection from '@/components/Global/PageSection';
-import JumpLink16 from '@carbon/icons-vue/es/jump-link/16';
-import JumpLinkMixin from '@/components/Mixins/JumpLinkMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
+import JumpLinkMixin from '@/components/_sila/Mixins/JumpLinkMixin';
 import { chunk } from 'lodash';
 
 export default {
@@ -78,7 +77,6 @@ export default {
     TableProcessors,
     TableAssembly,
     PageSection,
-    JumpLink: JumpLink16,
   },
   mixins: [LoadingBarMixin, JumpLinkMixin],
   beforeRouteLeave(to, from, next) {
@@ -148,6 +146,7 @@ export default {
     },
   },
   created() {
+    console.log(123456, process.env.VUE_APP_ENV_NAME);
     this.startLoader();
     const bmcManagerTablePromise = new Promise((resolve) => {
       this.$root.$on('hardware-status-bmc-manager-complete', () => resolve());
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryServiceIndicator.vue b/src/views/_sila/Overview/Inventory/InventoryServiceIndicator.vue
index 01f4a446..b4531be7 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryServiceIndicator.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryServiceIndicator.vue
@@ -38,8 +38,8 @@
   </page-section>
 </template>
 <script>
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   components: { PageSection },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/_sila/Overview/Inventory/InventoryTableAssembly.vue
index b4010bfe..9c284533 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableAssembly.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableAssembly.vue
@@ -69,13 +69,13 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/_sila/Overview/Inventory/InventoryTableBmcManager.vue
index 48b914f4..e3375d57 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableBmcManager.vue
@@ -162,14 +162,14 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import StatusIcon from '@/components/Global/StatusIcon';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/_sila/Overview/Inventory/InventoryTableChassis.vue
index b49cec7f..a5eb5ae6 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableChassis.vue
@@ -114,15 +114,15 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import StatusIcon from '@/components/Global/StatusIcon';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
 
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue
index 65994810..14160502 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue
@@ -156,21 +156,21 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 
-import StatusIcon from '@/components/Global/StatusIcon';
-import TableCellCount from '@/components/Global/TableCellCount';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
 
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
-import Search from '@/components/Global/Search';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
+import Search from '@/components/_sila/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue
index fe788c53..068f41a4 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue
@@ -96,20 +96,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import TableCellCount from '@/components/Global/TableCellCount';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
 
-import StatusIcon from '@/components/Global/StatusIcon';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
-import Search from '@/components/Global/Search';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
+import Search from '@/components/_sila/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue
index aed7871a..a55b3e5e 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue
@@ -114,20 +114,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 
-import StatusIcon from '@/components/Global/StatusIcon';
-import TableCellCount from '@/components/Global/TableCellCount';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
-import Search from '@/components/Global/Search';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
+import Search from '@/components/_sila/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue
index 7d5dd700..c6c798cf 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableProcessors.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue
@@ -147,20 +147,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import StatusIcon from '@/components/Global/StatusIcon';
-import TableCellCount from '@/components/Global/TableCellCount';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import Search from '@/components/Global/Search';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import Search from '@/components/_sila/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_sila/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/_sila/Overview/Inventory/InventoryTableSystem.vue
index cf2cf020..eacc4a06 100644
--- a/src/views/_sila/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/_sila/Overview/Inventory/InventoryTableSystem.vue
@@ -147,16 +147,16 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import PageSection from '@/components/Global/PageSection';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 
-import StatusIcon from '@/components/Global/StatusIcon';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
 
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_sila/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_sila/HardwareStatus/Inventory/index.js b/src/views/_sila/Overview/Inventory/index.js
index c9fde8d2..c9fde8d2 100644
--- a/src/views/_sila/HardwareStatus/Inventory/index.js
+++ b/src/views/_sila/Overview/Inventory/index.js
diff --git a/src/views/_sila/Settings/Network/ModalDns.vue b/src/views/_sila/Overview/Network/ModalDns.vue
index 7f127173..342ebe5e 100644
--- a/src/views/_sila/Settings/Network/ModalDns.vue
+++ b/src/views/_sila/Overview/Network/ModalDns.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import { ipAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/ModalHostname.vue b/src/views/_sila/Overview/Network/ModalHostname.vue
index f3221ec7..3ad152c1 100644
--- a/src/views/_sila/Settings/Network/ModalHostname.vue
+++ b/src/views/_sila/Overview/Network/ModalHostname.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import { required, helpers } from 'vuelidate/lib/validators';
 
 const validateHostname = helpers.regex('validateHostname', /^\S{0,64}$/);
diff --git a/src/views/_sila/Settings/Network/ModalIpv4.vue b/src/views/_sila/Overview/Network/ModalIpv4.vue
index dcf4a579..00742a11 100644
--- a/src/views/_sila/Settings/Network/ModalIpv4.vue
+++ b/src/views/_sila/Overview/Network/ModalIpv4.vue
@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import { ipAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/ModalMacAddress.vue b/src/views/_sila/Overview/Network/ModalMacAddress.vue
index d563f4ce..98f4b019 100644
--- a/src/views/_sila/Settings/Network/ModalMacAddress.vue
+++ b/src/views/_sila/Overview/Network/ModalMacAddress.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import { macAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/Network.vue b/src/views/_sila/Overview/Network/Network.vue
index 2abbcd7a..2321b1bd 100644
--- a/src/views/_sila/Settings/Network/Network.vue
+++ b/src/views/_sila/Overview/Network/Network.vue
@@ -40,17 +40,19 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
 import ModalMacAddress from './ModalMacAddress.vue';
 import ModalHostname from './ModalHostname.vue';
 import ModalIpv4 from './ModalIpv4.vue';
 import ModalDns from './ModalDns.vue';
 import NetworkGlobalSettings from './NetworkGlobalSettings.vue';
 import NetworkInterfaceSettings from './NetworkInterfaceSettings.vue';
-import PageSection from '@/components/Global/PageSection';
-import PageTitle from '@/components/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 import TableIpv4 from './TableIpv4.vue';
 import TableDns from './TableDns.vue';
 import { mapState } from 'vuex';
diff --git a/src/views/_sila/Settings/Network/NetworkGlobalSettings.vue b/src/views/_sila/Overview/Network/NetworkGlobalSettings.vue
index 30287673..44035ae6 100644
--- a/src/views/_sila/Settings/Network/NetworkGlobalSettings.vue
+++ b/src/views/_sila/Overview/Network/NetworkGlobalSettings.vue
@@ -77,10 +77,10 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import IconEdit from '@carbon/icons-vue/es/edit/16';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import PageSection from '@/components/Global/PageSection';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/NetworkInterfaceSettings.vue b/src/views/_sila/Overview/Network/NetworkInterfaceSettings.vue
index 023d29bc..657a2270 100644
--- a/src/views/_sila/Settings/Network/NetworkInterfaceSettings.vue
+++ b/src/views/_sila/Overview/Network/NetworkInterfaceSettings.vue
@@ -57,10 +57,10 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import IconEdit from '@carbon/icons-vue/es/edit/16';
-import PageSection from '@/components/Global/PageSection';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/TableDns.vue b/src/views/_sila/Overview/Network/TableDns.vue
index 569109f1..3b3cc4b4 100644
--- a/src/views/_sila/Settings/Network/TableDns.vue
+++ b/src/views/_sila/Overview/Network/TableDns.vue
@@ -39,12 +39,12 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
-import PageSection from '@/components/Global/PageSection';
-import TableRowAction from '@/components/Global/TableRowAction';
+import PageSection from '@/components/_sila/Global/PageSection';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/TableIpv4.vue b/src/views/_sila/Overview/Network/TableIpv4.vue
index 75870031..4f9f9df1 100644
--- a/src/views/_sila/Settings/Network/TableIpv4.vue
+++ b/src/views/_sila/Overview/Network/TableIpv4.vue
@@ -42,13 +42,13 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import PageSection from '@/components/Global/PageSection';
-import TableRowAction from '@/components/Global/TableRowAction';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import PageSection from '@/components/_sila/Global/PageSection';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/Settings/Network/index.js b/src/views/_sila/Overview/Network/index.js
index 97bf0397..97bf0397 100644
--- a/src/views/_sila/Settings/Network/index.js
+++ b/src/views/_sila/Overview/Network/index.js
diff --git a/src/views/_sila/Overview/Overview.vue b/src/views/_sila/Overview/Overview.vue
index 9960f373..9f97fb3e 100644
--- a/src/views/_sila/Overview/Overview.vue
+++ b/src/views/_sila/Overview/Overview.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import OverviewDumps from './OverviewDumps.vue';
 import OverviewEvents from './OverviewEvents.vue';
 import OverviewFirmware from './OverviewFirmware.vue';
@@ -35,8 +35,8 @@ import OverviewNetwork from './OverviewNetwork';
 import OverviewPower from './OverviewPower';
 import OverviewQuickLinks from './OverviewQuickLinks';
 import OverviewServer from './OverviewServer';
-import PageSection from '@/components/Global/PageSection';
-import PageTitle from '@/components/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 
 export default {
   name: 'Overview',
diff --git a/src/views/_sila/Overview/OverviewDumps.vue b/src/views/_sila/Overview/OverviewDumps.vue
index a2ae4e4e..27f5067d 100644
--- a/src/views/_sila/Overview/OverviewDumps.vue
+++ b/src/views/_sila/Overview/OverviewDumps.vue
@@ -20,7 +20,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Dumps',
diff --git a/src/views/_sila/Overview/OverviewEvents.vue b/src/views/_sila/Overview/OverviewEvents.vue
index b73c0b48..c54bc5b9 100644
--- a/src/views/_sila/Overview/OverviewEvents.vue
+++ b/src/views/_sila/Overview/OverviewEvents.vue
@@ -32,8 +32,8 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import StatusIcon from '@/components/Global/StatusIcon';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Events',
diff --git a/src/views/_sila/Overview/OverviewFirmware.vue b/src/views/_sila/Overview/OverviewFirmware.vue
index f1f9ce53..9167c75c 100644
--- a/src/views/_sila/Overview/OverviewFirmware.vue
+++ b/src/views/_sila/Overview/OverviewFirmware.vue
@@ -18,7 +18,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Firmware',
diff --git a/src/views/_sila/Overview/OverviewNetwork.vue b/src/views/_sila/Overview/OverviewNetwork.vue
index b81e5c73..7010b991 100644
--- a/src/views/_sila/Overview/OverviewNetwork.vue
+++ b/src/views/_sila/Overview/OverviewNetwork.vue
@@ -49,7 +49,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Network',
diff --git a/src/views/_sila/Overview/OverviewPower.vue b/src/views/_sila/Overview/OverviewPower.vue
index 0d84c76c..ffda495f 100644
--- a/src/views/_sila/Overview/OverviewPower.vue
+++ b/src/views/_sila/Overview/OverviewPower.vue
@@ -24,7 +24,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import { mapGetters } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/Overview/OverviewQuickLinks.vue b/src/views/_sila/Overview/OverviewQuickLinks.vue
index bc579b03..6f74fd91 100644
--- a/src/views/_sila/Overview/OverviewQuickLinks.vue
+++ b/src/views/_sila/Overview/OverviewQuickLinks.vue
@@ -27,7 +27,7 @@
 
 <script>
 import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   name: 'QuickLinks',
diff --git a/src/views/_sila/Overview/OverviewServer.vue b/src/views/_sila/Overview/OverviewServer.vue
index d066d391..7dded5ba 100644
--- a/src/views/_sila/Overview/OverviewServer.vue
+++ b/src/views/_sila/Overview/OverviewServer.vue
@@ -1,7 +1,7 @@
 <template>
   <overview-card
     :title="$t('pageOverview.serverInformation')"
-    :to="`/hardware-status/inventory`"
+    :to="`/hardware-inventory`"
   >
     <b-row class="mt-3">
       <b-col lg="6">
@@ -18,7 +18,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_sila/PageNotFound/PageNotFound.vue b/src/views/_sila/PageNotFound/PageNotFound.vue
index 91341dbb..bce56016 100644
--- a/src/views/_sila/PageNotFound/PageNotFound.vue
+++ b/src/views/_sila/PageNotFound/PageNotFound.vue
@@ -4,7 +4,7 @@
   </b-container>
 </template>
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 export default {
   name: 'PageNotFound',
   components: { PageTitle },
diff --git a/src/views/_sila/ProfileSettings/ProfileSettings.vue b/src/views/_sila/ProfileSettings/ProfileSettings.vue
index 8f01c59b..bc2b4702 100644
--- a/src/views/_sila/ProfileSettings/ProfileSettings.vue
+++ b/src/views/_sila/ProfileSettings/ProfileSettings.vue
@@ -128,14 +128,14 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
 import { maxLength, minLength, sameAs } from 'vuelidate/lib/validators';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin';
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import LocalTimezoneLabelMixin from '@/components/_sila/Mixins/LocalTimezoneLabelMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ProfileSettings',
diff --git a/src/views/_sila/ResourceManagement/Power.vue b/src/views/_sila/ResourceManagement/Power.vue
index cc0cc993..fce15442 100644
--- a/src/views/_sila/ResourceManagement/Power.vue
+++ b/src/views/_sila/ResourceManagement/Power.vue
@@ -84,10 +84,12 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import { requiredIf, between } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue b/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
index 0113b80a..27950b76 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
@@ -106,13 +106,13 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 
 import ModalGenerateCsr from './ModalGenerateCsr';
 import ModalUploadCertificate from './ModalUploadCertificate';
-import PageTitle from '@/components/Global/PageTitle';
-import TableRowAction from '@/components/Global/TableRowAction';
-import StatusIcon from '@/components/Global/StatusIcon';
-import Alert from '@/components/Global/Alert';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import Alert from '@/components/_sila/Global/Alert';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'Certificates',
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index d76f9fe1..5bfb81b4 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -380,8 +380,8 @@ import { required, requiredIf } from 'vuelidate/lib/validators';
 
 import { COUNTRY_LIST } from './CsrCountryCodes';
 import { CERTIFICATE_TYPES } from '@/store/modules/SecurityAndAccess/CertificatesStore';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ModalGenerateCsr',
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
index f4db7a26..5d58018f 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
@@ -70,9 +70,9 @@
 
 <script>
 import { required, requiredIf } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_sila/Global/FormFile';
 
 export default {
   components: { FormFile },
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
index 1f2108de..8374b653 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
@@ -234,13 +234,15 @@ import { mapGetters } from 'vuex';
 import { find } from 'lodash';
 import { requiredIf } from 'vuelidate/lib/validators';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import InfoTooltip from '@/components/Global/InfoTooltip';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import InfoTooltip from '@/components/_sila/Global/InfoTooltip';
 import TableRoleGroups from './TableRoleGroups';
 
 export default {
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index 6ea2561a..aa294ce3 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
@@ -81,7 +81,7 @@
 
 <script>
 import { required, requiredIf } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   mixins: [VuelidateMixin],
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
index 5ae3e3d1..ca52da13 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
@@ -97,17 +97,17 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 import { mapGetters } from 'vuex';
 
-import Alert from '@/components/Global/Alert';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableRowAction from '@/components/Global/TableRowAction';
+import Alert from '@/components/_sila/Global/Alert';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import ModalAddRoleGroup from './ModalAddRoleGroup';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
index 1dc197c7..c594bde5 100644
--- a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
+++ b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
@@ -109,10 +109,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   name: 'Policies',
diff --git a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
index 07ee725d..45579185 100644
--- a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
@@ -114,27 +114,27 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import Search from '@/components/Global/Search';
-import TableCellCount from '@/components/Global/TableCellCount';
-import TableRowAction from '@/components/Global/TableRowAction';
-import TableToolbar from '@/components/Global/TableToolbar';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import Search from '@/components/_sila/Global/Search';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_sila/Mixins/BVPaginationMixin';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
index 0f05123c..bbe3f53c 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import {
   required,
   requiredIf,
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
index 0f8757ce..c7aa56bb 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
@@ -231,9 +231,9 @@ import {
   helpers,
   requiredIf,
 } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
-import Alert from '@/components/Global/Alert';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
+import Alert from '@/components/_sila/Global/Alert';
 
 export default {
   components: { Alert, InputPasswordToggle },
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
index c6c556c8..423ce4c1 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -121,18 +121,18 @@ import IconChevron from '@carbon/icons-vue/es/chevron--up/20';
 
 import ModalUser from './ModalUser';
 import ModalSettings from './ModalSettings';
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 import TableRoles from './TableRoles';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableRowAction from '@/components/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'UserManagement',
diff --git a/src/views/_sila/Settings/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/_sila/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
index 06e30f3e..c357d47a 100644
--- a/src/views/_sila/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
+++ b/src/views/_sila/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
@@ -21,10 +21,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   name: 'PowerRestorePolicy',