Merge branch 'sila' into sila-ui

71 files changed, 280 insertions, 280 deletions

diff --git a/src/components/_ibs/AppHeader/AppHeader.vue b/src/components/_ibs/AppHeader/AppHeader.vue
index 1c5dbd3a..e6791f0a 100644
--- a/src/components/_ibs/AppHeader/AppHeader.vue
+++ b/src/components/_ibs/AppHeader/AppHeader.vue
@@ -108,13 +108,13 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import IconAvatar from '@carbon/icons-vue/es/user--avatar/20';
 import IconClose from '@carbon/icons-vue/es/close/20';
 import IconMenu from '@carbon/icons-vue/es/menu/20';
 import IconRenew from '@carbon/icons-vue/es/renew/20';
-import StatusIcon from '@/components/Global/StatusIcon';
-import LoadingBar from '@/components/Global/LoadingBar';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
+import LoadingBar from '@/components/_ibs/Global/LoadingBar';
 
 export default {
   name: 'AppHeader',
diff --git a/src/components/_ibs/Global/Alert.vue b/src/components/_ibs/Global/Alert.vue
index e8de9e27..a3f31f61 100644
--- a/src/components/_ibs/Global/Alert.vue
+++ b/src/components/_ibs/Global/Alert.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import StatusIcon from '@/components/Global/StatusIcon';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
 import { BAlert } from 'bootstrap-vue';
 
 export default {
diff --git a/src/components/_ibs/Global/PageContainer.vue b/src/components/_ibs/Global/PageContainer.vue
index f598be7b..ac1de332 100644
--- a/src/components/_ibs/Global/PageContainer.vue
+++ b/src/components/_ibs/Global/PageContainer.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import JumpLinkMixin from '@/components/Mixins/JumpLinkMixin';
+import JumpLinkMixin from '@/components/_ibs/Mixins/JumpLinkMixin';
 export default {
   name: 'PageContainer',
   mixins: [JumpLinkMixin],
diff --git a/src/components/_ibs/Global/TableDateFilter.vue b/src/components/_ibs/Global/TableDateFilter.vue
index aa10cb5c..cbb8cb1f 100644
--- a/src/components/_ibs/Global/TableDateFilter.vue
+++ b/src/components/_ibs/Global/TableDateFilter.vue
@@ -101,7 +101,7 @@
 import IconCalendar from '@carbon/icons-vue/es/calendar/20';
 import { helpers } from 'vuelidate/lib/validators';
 
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 const isoDateRegex = /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/;
 
diff --git a/src/views/_ibs/ChangePassword/ChangePassword.vue b/src/views/_ibs/ChangePassword/ChangePassword.vue
index 2440ace1..b2ebc3b0 100644
--- a/src/views/_ibs/ChangePassword/ChangePassword.vue
+++ b/src/views/_ibs/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/_ibs/Global/Alert';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin';
+import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 
 export default {
   name: 'ChangePassword',
diff --git a/src/views/_ibs/HardwareStatus/Inventory/Inventory.vue b/src/views/_ibs/HardwareStatus/Inventory/Inventory.vue
index 0cc542e7..7c32eddc 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/Inventory.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/Inventory.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 import ServiceIndicator from './InventoryServiceIndicator';
 import TableSystem from './InventoryTableSystem';
 import TablePowerSupplies from './InventoryTablePowerSupplies';
@@ -61,10 +61,10 @@ 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 LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import PageSection from '@/components/_ibs/Global/PageSection';
 import JumpLink16 from '@carbon/icons-vue/es/jump-link/16';
-import JumpLinkMixin from '@/components/Mixins/JumpLinkMixin';
+import JumpLinkMixin from '@/components/_ibs/Mixins/JumpLinkMixin';
 import { chunk } from 'lodash';
 
 export default {
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryServiceIndicator.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryServiceIndicator.vue
index 01f4a446..ba3f2735 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryServiceIndicator.vue
+++ b/src/views/_ibs/HardwareStatus/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/_ibs/Global/PageSection';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 
 export default {
   components: { PageSection },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableAssembly.vue
index b4010bfe..d1b2c6b9 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableAssembly.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableAssembly.vue
@@ -69,13 +69,13 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index 48b914f4..f157f271 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -162,14 +162,14 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/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/_ibs/Global/StatusIcon';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableChassis.vue
index b49cec7f..1165ec7b 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -114,15 +114,15 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/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/_ibs/Mixins/BVToastMixin';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
 
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index 65994810..1748ca16 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -156,21 +156,21 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/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/_ibs/Global/StatusIcon';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
 
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
-import TableSortMixin from '@/components/Mixins/TableSortMixin';
-import Search from '@/components/Global/Search';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
+import Search from '@/components/_ibs/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableFans.vue
index fe788c53..33077a5a 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -96,20 +96,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
-import TableCellCount from '@/components/Global/TableCellCount';
+import TableCellCount from '@/components/_ibs/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/_ibs/Global/StatusIcon';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
+import Search from '@/components/_ibs/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index aed7871a..e760e85e 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -114,20 +114,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/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/_ibs/Global/StatusIcon';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
+import Search from '@/components/_ibs/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableProcessors.vue
index 7d5dd700..a4c6dbef 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableProcessors.vue
+++ b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableProcessors.vue
@@ -147,20 +147,20 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/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/_ibs/Global/StatusIcon';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import Search from '@/components/_ibs/Global/Search';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount },
diff --git a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/_ibs/HardwareStatus/Inventory/InventoryTableSystem.vue
index cf2cf020..6b028e3d 100644
--- a/src/views/_ibs/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/_ibs/HardwareStatus/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/_ibs/Mixins/BVToastMixin';
+import PageSection from '@/components/_ibs/Global/PageSection';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 
-import StatusIcon from '@/components/Global/StatusIcon';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
 
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   components: { IconChevron, PageSection, StatusIcon },
diff --git a/src/views/_ibs/HardwareStatus/Sensors/Sensors.vue b/src/views/_ibs/HardwareStatus/Sensors/Sensors.vue
index 6329d9d8..1ef6bfdb 100644
--- a/src/views/_ibs/HardwareStatus/Sensors/Sensors.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import Search from '@/components/_ibs/Global/Search';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
+import TableFilter from '@/components/_ibs/Global/TableFilter';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
+import TableToolbarExport from '@/components/_ibs/Global/TableToolbarExport';
+import TableCellCount from '@/components/_ibs/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/_ibs/Mixins/BVTableSelectableMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_ibs/Mixins/TableFilterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 
 export default {
   name: 'Sensors',
diff --git a/src/views/_ibs/Login/Login.vue b/src/views/_ibs/Login/Login.vue
index bd79d09b..4413b6bc 100644
--- a/src/views/_ibs/Login/Login.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/VuelidateMixin.js';
 import i18n from '@/i18n';
-import Alert from '@/components/Global/Alert';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
+import Alert from '@/components/_ibs/Global/Alert';
+import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle';
 
 export default {
   name: 'Login',
diff --git a/src/views/_ibs/Logs/Dumps/Dumps.vue b/src/views/_ibs/Logs/Dumps/Dumps.vue
index 81c9de04..6c7945b0 100644
--- a/src/views/_ibs/Logs/Dumps/Dumps.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageSection';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
+import Search from '@/components/_ibs/Global/Search';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import TableDateFilter from '@/components/_ibs/Global/TableDateFilter';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+} from '@/components/_ibs/Mixins/BVPaginationMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
-import TableFilter from '@/components/Global/TableFilter';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
+import TableFilter from '@/components/_ibs/Global/TableFilter';
+import TableFilterMixin from '@/components/_ibs/Mixins/TableFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_ibs/Logs/Dumps/DumpsForm.vue b/src/views/_ibs/Logs/Dumps/DumpsForm.vue
index 07f4a060..60c5219f 100644
--- a/src/views/_ibs/Logs/Dumps/DumpsForm.vue
+++ b/src/views/_ibs/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/_ibs/Global/Alert';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   components: { Alert, ModalConfirmation },
diff --git a/src/views/_ibs/Logs/Dumps/DumpsModalConfirmation.vue b/src/views/_ibs/Logs/Dumps/DumpsModalConfirmation.vue
index f8e20cfd..9d9d3a6f 100644
--- a/src/views/_ibs/Logs/Dumps/DumpsModalConfirmation.vue
+++ b/src/views/_ibs/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/_ibs/Global/StatusIcon';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   components: { StatusIcon },
diff --git a/src/views/_ibs/Logs/EventLogs/EventLogs.vue b/src/views/_ibs/Logs/EventLogs/EventLogs.vue
index e7fc507b..bb7d6726 100644
--- a/src/views/_ibs/Logs/EventLogs/EventLogs.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
+import Search from '@/components/_ibs/Global/Search';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import TableDateFilter from '@/components/_ibs/Global/TableDateFilter';
+import TableFilter from '@/components/_ibs/Global/TableFilter';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
+import TableToolbarExport from '@/components/_ibs/Global/TableToolbarExport';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import TableFilterMixin from '@/components/Mixins/TableFilterMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_ibs/Mixins/TableFilterMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_ibs/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/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_ibs/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/_ibs/Logs/PostCodeLogs/PostCodeLogs.vue
index ea3d54ab..e1c24a5d 100644
--- a/src/views/_ibs/Logs/PostCodeLogs/PostCodeLogs.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import Search from '@/components/_ibs/Global/Search';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import TableDateFilter from '@/components/_ibs/Global/TableDateFilter';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
+import TableToolbarExport from '@/components/_ibs/Global/TableToolbarExport';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import TableFilterMixin from '@/components/_ibs/Mixins/TableFilterMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_ibs/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/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import TableSortMixin from '@/components/_ibs/Mixins/TableSortMixin';
 import TableRowExpandMixin, {
   expandRowLabel,
-} from '@/components/Mixins/TableRowExpandMixin';
+} from '@/components/_ibs/Mixins/TableRowExpandMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_ibs/Operations/FactoryReset/FactoryReset.vue b/src/views/_ibs/Operations/FactoryReset/FactoryReset.vue
index 897348fc..4b454a42 100644
--- a/src/views/_ibs/Operations/FactoryReset/FactoryReset.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 import ModalReset from './FactoryResetModal';
 
 export default {
diff --git a/src/views/_ibs/Operations/FactoryReset/FactoryResetModal.vue b/src/views/_ibs/Operations/FactoryReset/FactoryResetModal.vue
index 170bf284..378dd671 100644
--- a/src/views/_ibs/Operations/FactoryReset/FactoryResetModal.vue
+++ b/src/views/_ibs/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/_ibs/Global/StatusIcon';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin';
 
 export default {
   components: { StatusIcon },
diff --git a/src/views/_ibs/Operations/Firmware/Firmware.vue b/src/views/_ibs/Operations/Firmware/Firmware.vue
index b4024323..6e65b848 100644
--- a/src/views/_ibs/Operations/Firmware/Firmware.vue
+++ b/src/views/_ibs/Operations/Firmware/Firmware.vue
@@ -41,8 +41,8 @@ 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/_ibs/Global/PageSection';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 
 import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
 
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareAlertServerPower.vue b/src/views/_ibs/Operations/Firmware/FirmwareAlertServerPower.vue
index 24aa1d69..6446cc07 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareAlertServerPower.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareAlertServerPower.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_ibs/Global/Alert';
 
 export default {
   components: { Alert },
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue b/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
index d79a8769..76d67f96 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
@@ -53,9 +53,9 @@
 
 <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/_ibs/Global/PageSection';
+import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 
 import ModalSwitchToRunning from './FirmwareModalSwitchToRunning';
 
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareCardsHost.vue b/src/views/_ibs/Operations/Firmware/FirmwareCardsHost.vue
index b4a8e90d..a4af7310 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareCardsHost.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareCardsHost.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import PageSection from '@/components/Global/PageSection';
+import PageSection from '@/components/_ibs/Global/PageSection';
 
 export default {
   components: { PageSection },
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue b/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
index ac4b23fc..875ce283 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
@@ -75,11 +75,11 @@
 <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/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_ibs/Global/FormFile';
 import ModalUpdateFirmware from './FirmwareModalUpdateFirmware';
 
 export default {
diff --git a/src/views/_ibs/Operations/KeyClear/KeyClear.vue b/src/views/_ibs/Operations/KeyClear/KeyClear.vue
index 2524da10..5a4280c5 100644
--- a/src/views/_ibs/Operations/KeyClear/KeyClear.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import Alert from '@/components/_ibs/Global/Alert';
 
 export default {
   name: 'KeyClear',
diff --git a/src/views/_ibs/Operations/Kvm/Kvm.vue b/src/views/_ibs/Operations/Kvm/Kvm.vue
index 1a41baaf..0f1e8bfc 100644
--- a/src/views/_ibs/Operations/Kvm/Kvm.vue
+++ b/src/views/_ibs/Operations/Kvm/Kvm.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 import KvmConsole from './KvmConsole';
 
 export default {
diff --git a/src/views/_ibs/Operations/Kvm/KvmConsole.vue b/src/views/_ibs/Operations/Kvm/KvmConsole.vue
index c028a9fc..c671a4b9 100644
--- a/src/views/_ibs/Operations/Kvm/KvmConsole.vue
+++ b/src/views/_ibs/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/_ibs/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/_ibs/Operations/RebootBmc/RebootBmc.vue b/src/views/_ibs/Operations/RebootBmc/RebootBmc.vue
index 900619cd..1e00d90d 100644
--- a/src/views/_ibs/Operations/RebootBmc/RebootBmc.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 
 export default {
   name: 'RebootBmc',
diff --git a/src/views/_ibs/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/_ibs/Operations/SerialOverLan/SerialOverLanConsole.vue
index cb462a59..6393006a 100644
--- a/src/views/_ibs/Operations/SerialOverLan/SerialOverLanConsole.vue
+++ b/src/views/_ibs/Operations/SerialOverLan/SerialOverLanConsole.vue
@@ -38,13 +38,13 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_ibs/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/_ibs/Global/StatusIcon';
 
 export default {
   name: 'SerialOverLanConsole',
diff --git a/src/views/_ibs/Operations/ServerPowerOperations/BootSettings.vue b/src/views/_ibs/Operations/ServerPowerOperations/BootSettings.vue
index 4896286b..59b7b19c 100644
--- a/src/views/_ibs/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 
 export default {
   name: 'BootSettings',
diff --git a/src/views/_ibs/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/_ibs/Operations/ServerPowerOperations/ServerPowerOperations.vue
index e6b685f4..b017d24a 100644
--- a/src/views/_ibs/Operations/ServerPowerOperations/ServerPowerOperations.vue
+++ b/src/views/_ibs/Operations/ServerPowerOperations/ServerPowerOperations.vue
@@ -148,12 +148,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/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import BootSettings from './BootSettings';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import Alert from '@/components/Global/Alert';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import Alert from '@/components/_ibs/Global/Alert';
 
 export default {
   name: 'ServerPowerOperations',
diff --git a/src/views/_ibs/Operations/VirtualMedia/ModalConfigureConnection.vue b/src/views/_ibs/Operations/VirtualMedia/ModalConfigureConnection.vue
index b0bcfb2b..fb079218 100644
--- a/src/views/_ibs/Operations/VirtualMedia/ModalConfigureConnection.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   mixins: [VuelidateMixin],
diff --git a/src/views/_ibs/Operations/VirtualMedia/VirtualMedia.vue b/src/views/_ibs/Operations/VirtualMedia/VirtualMedia.vue
index fc8369d4..bfd87b8a 100644
--- a/src/views/_ibs/Operations/VirtualMedia/VirtualMedia.vue
+++ b/src/views/_ibs/Operations/VirtualMedia/VirtualMedia.vue
@@ -111,13 +111,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/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 import ModalConfigureConnection from './ModalConfigureConnection';
 import NbdServer from '@/utilities/NBDServer';
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_ibs/Global/FormFile';
 
 export default {
   name: 'VirtualMedia',
diff --git a/src/views/_ibs/Overview/Overview.vue b/src/views/_ibs/Overview/Overview.vue
index 9960f373..df0a4f49 100644
--- a/src/views/_ibs/Overview/Overview.vue
+++ b/src/views/_ibs/Overview/Overview.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_ibs/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/_ibs/Global/PageSection';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 
 export default {
   name: 'Overview',
diff --git a/src/views/_ibs/Overview/OverviewDumps.vue b/src/views/_ibs/Overview/OverviewDumps.vue
index a2ae4e4e..e313c8e0 100644
--- a/src/views/_ibs/Overview/OverviewDumps.vue
+++ b/src/views/_ibs/Overview/OverviewDumps.vue
@@ -20,7 +20,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Dumps',
diff --git a/src/views/_ibs/Overview/OverviewEvents.vue b/src/views/_ibs/Overview/OverviewEvents.vue
index b73c0b48..3fd76690 100644
--- a/src/views/_ibs/Overview/OverviewEvents.vue
+++ b/src/views/_ibs/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/_ibs/Global/StatusIcon';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Events',
diff --git a/src/views/_ibs/Overview/OverviewFirmware.vue b/src/views/_ibs/Overview/OverviewFirmware.vue
index f1f9ce53..d9244a21 100644
--- a/src/views/_ibs/Overview/OverviewFirmware.vue
+++ b/src/views/_ibs/Overview/OverviewFirmware.vue
@@ -18,7 +18,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Firmware',
diff --git a/src/views/_ibs/Overview/OverviewNetwork.vue b/src/views/_ibs/Overview/OverviewNetwork.vue
index b81e5c73..eb9024c7 100644
--- a/src/views/_ibs/Overview/OverviewNetwork.vue
+++ b/src/views/_ibs/Overview/OverviewNetwork.vue
@@ -49,7 +49,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Network',
diff --git a/src/views/_ibs/Overview/OverviewPower.vue b/src/views/_ibs/Overview/OverviewPower.vue
index 0d84c76c..8b084479 100644
--- a/src/views/_ibs/Overview/OverviewPower.vue
+++ b/src/views/_ibs/Overview/OverviewPower.vue
@@ -24,7 +24,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 import { mapGetters } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/Overview/OverviewQuickLinks.vue b/src/views/_ibs/Overview/OverviewQuickLinks.vue
index bc579b03..0faab856 100644
--- a/src/views/_ibs/Overview/OverviewQuickLinks.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/BVToastMixin';
 
 export default {
   name: 'QuickLinks',
diff --git a/src/views/_ibs/Overview/OverviewServer.vue b/src/views/_ibs/Overview/OverviewServer.vue
index d066d391..f688dc64 100644
--- a/src/views/_ibs/Overview/OverviewServer.vue
+++ b/src/views/_ibs/Overview/OverviewServer.vue
@@ -18,7 +18,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/PageNotFound/PageNotFound.vue b/src/views/_ibs/PageNotFound/PageNotFound.vue
index 91341dbb..287f5074 100644
--- a/src/views/_ibs/PageNotFound/PageNotFound.vue
+++ b/src/views/_ibs/PageNotFound/PageNotFound.vue
@@ -4,7 +4,7 @@
   </b-container>
 </template>
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 export default {
   name: 'PageNotFound',
   components: { PageTitle },
diff --git a/src/views/_ibs/ProfileSettings/ProfileSettings.vue b/src/views/_ibs/ProfileSettings/ProfileSettings.vue
index 8f01c59b..79500ff3 100644
--- a/src/views/_ibs/ProfileSettings/ProfileSettings.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/BVToastMixin';
+import InputPasswordToggle from '@/components/_ibs/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/_ibs/Mixins/LoadingBarMixin';
+import LocalTimezoneLabelMixin from '@/components/_ibs/Mixins/LocalTimezoneLabelMixin';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ProfileSettings',
diff --git a/src/views/_ibs/ResourceManagement/Power.vue b/src/views/_ibs/ResourceManagement/Power.vue
index cc0cc993..6e04d6cc 100644
--- a/src/views/_ibs/ResourceManagement/Power.vue
+++ b/src/views/_ibs/ResourceManagement/Power.vue
@@ -84,10 +84,10 @@
 </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/_ibs/Global/PageTitle';
+import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import { requiredIf, between } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 
diff --git a/src/views/_ibs/SecurityAndAccess/Certificates/Certificates.vue b/src/views/_ibs/SecurityAndAccess/Certificates/Certificates.vue
index 0113b80a..761d09be 100644
--- a/src/views/_ibs/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
+import StatusIcon from '@/components/_ibs/Global/StatusIcon';
+import Alert from '@/components/_ibs/Global/Alert';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 
 export default {
   name: 'Certificates',
diff --git a/src/views/_ibs/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/_ibs/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index d76f9fe1..83e3110b 100644
--- a/src/views/_ibs/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ModalGenerateCsr',
diff --git a/src/views/_ibs/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/_ibs/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
index f4db7a26..f13c174d 100644
--- a/src/views/_ibs/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/VuelidateMixin.js';
 
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_ibs/Global/FormFile';
 
 export default {
   components: { FormFile },
diff --git a/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
index b4eba281..32247ee0 100644
--- a/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
@@ -236,13 +236,13 @@ 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/_ibs/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin';
+import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import InfoTooltip from '@/components/_ibs/Global/InfoTooltip';
 import TableRoleGroups from './TableRoleGroups';
 
 export default {
diff --git a/src/views/_ibs/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/_ibs/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index 6ea2561a..ea35da04 100644
--- a/src/views/_ibs/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/VuelidateMixin.js';
 
 export default {
   mixins: [VuelidateMixin],
diff --git a/src/views/_ibs/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/_ibs/SecurityAndAccess/Ldap/TableRoleGroups.vue
index 5ae3e3d1..c5e08973 100644
--- a/src/views/_ibs/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/_ibs/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/_ibs/Global/Alert';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import ModalAddRoleGroup from './ModalAddRoleGroup';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 
 export default {
   components: {
diff --git a/src/views/_ibs/SecurityAndAccess/Policies/Policies.vue b/src/views/_ibs/SecurityAndAccess/Policies/Policies.vue
index 1dc197c7..99cc3722 100644
--- a/src/views/_ibs/SecurityAndAccess/Policies/Policies.vue
+++ b/src/views/_ibs/SecurityAndAccess/Policies/Policies.vue
@@ -109,10 +109,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 
 export default {
   name: 'Policies',
diff --git a/src/views/_ibs/SecurityAndAccess/Sessions/Sessions.vue b/src/views/_ibs/SecurityAndAccess/Sessions/Sessions.vue
index 07ee725d..6e10c09c 100644
--- a/src/views/_ibs/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import Search from '@/components/_ibs/Global/Search';
+import TableCellCount from '@/components/_ibs/Global/TableCellCount';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_ibs/Mixins/BVPaginationMixin';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_ibs/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue
index 0f05123c..4ba13f13 100644
--- a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue
+++ b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 import {
   required,
   requiredIf,
diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue
index 0f8757ce..823bf765 100644
--- a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue
+++ b/src/views/_ibs/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/_ibs/Mixins/VuelidateMixin.js';
+import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle';
+import Alert from '@/components/_ibs/Global/Alert';
 
 export default {
   components: { Alert, InputPasswordToggle },
diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue
index c6c556c8..623ca31f 100644
--- a/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
 import TableRoles from './TableRoles';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableRowAction from '@/components/Global/TableRowAction';
+import TableToolbar from '@/components/_ibs/Global/TableToolbar';
+import TableRowAction from '@/components/_ibs/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/_ibs/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
 
 export default {
   name: 'UserManagement',
diff --git a/src/views/_ibs/Settings/DateTime/DateTime.vue b/src/views/_ibs/Settings/DateTime/DateTime.vue
index f5e063d1..4f187eed 100644
--- a/src/views/_ibs/Settings/DateTime/DateTime.vue
+++ b/src/views/_ibs/Settings/DateTime/DateTime.vue
@@ -197,15 +197,15 @@
 </template>
 
 <script>
-import Alert from '@/components/Global/Alert';
+import Alert from '@/components/_ibs/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/_ibs/Global/PageTitle';
+import PageSection from '@/components/_ibs/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/_ibs/Mixins/BVToastMixin';
+import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LocalTimezoneLabelMixin from '@/components/_ibs/Mixins/LocalTimezoneLabelMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 
 import { mapState } from 'vuex';
 import { requiredIf, helpers } from 'vuelidate/lib/validators';
diff --git a/src/views/_ibs/Settings/Network/ModalDns.vue b/src/views/_ibs/Settings/Network/ModalDns.vue
index 7f127173..9a370809 100644
--- a/src/views/_ibs/Settings/Network/ModalDns.vue
+++ b/src/views/_ibs/Settings/Network/ModalDns.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 import { ipAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/ModalHostname.vue b/src/views/_ibs/Settings/Network/ModalHostname.vue
index f3221ec7..0567fe61 100644
--- a/src/views/_ibs/Settings/Network/ModalHostname.vue
+++ b/src/views/_ibs/Settings/Network/ModalHostname.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 import { required, helpers } from 'vuelidate/lib/validators';
 
 const validateHostname = helpers.regex('validateHostname', /^\S{0,64}$/);
diff --git a/src/views/_ibs/Settings/Network/ModalIpv4.vue b/src/views/_ibs/Settings/Network/ModalIpv4.vue
index dcf4a579..c3c7b311 100644
--- a/src/views/_ibs/Settings/Network/ModalIpv4.vue
+++ b/src/views/_ibs/Settings/Network/ModalIpv4.vue
@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 import { ipAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/ModalMacAddress.vue b/src/views/_ibs/Settings/Network/ModalMacAddress.vue
index d563f4ce..ae30d17a 100644
--- a/src/views/_ibs/Settings/Network/ModalMacAddress.vue
+++ b/src/views/_ibs/Settings/Network/ModalMacAddress.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
 import { macAddress, required } from 'vuelidate/lib/validators';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/Network.vue b/src/views/_ibs/Settings/Network/Network.vue
index 2abbcd7a..d21ce2ec 100644
--- a/src/views/_ibs/Settings/Network/Network.vue
+++ b/src/views/_ibs/Settings/Network/Network.vue
@@ -40,17 +40,17 @@
 </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/_ibs/Mixins/BVToastMixin';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
+import LoadingBarMixin, { loading } from '@/components/_ibs/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/_ibs/Global/PageSection';
+import PageTitle from '@/components/_ibs/Global/PageTitle';
 import TableIpv4 from './TableIpv4.vue';
 import TableDns from './TableDns.vue';
 import { mapState } from 'vuex';
diff --git a/src/views/_ibs/Settings/Network/NetworkGlobalSettings.vue b/src/views/_ibs/Settings/Network/NetworkGlobalSettings.vue
index 30287673..3f35a4d9 100644
--- a/src/views/_ibs/Settings/Network/NetworkGlobalSettings.vue
+++ b/src/views/_ibs/Settings/Network/NetworkGlobalSettings.vue
@@ -77,10 +77,10 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/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/_ibs/Mixins/DataFormatterMixin';
+import PageSection from '@/components/_ibs/Global/PageSection';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/NetworkInterfaceSettings.vue b/src/views/_ibs/Settings/Network/NetworkInterfaceSettings.vue
index 023d29bc..64a9c76c 100644
--- a/src/views/_ibs/Settings/Network/NetworkInterfaceSettings.vue
+++ b/src/views/_ibs/Settings/Network/NetworkInterfaceSettings.vue
@@ -57,10 +57,10 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/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/_ibs/Global/PageSection';
+import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/TableDns.vue b/src/views/_ibs/Settings/Network/TableDns.vue
index 569109f1..01252db3 100644
--- a/src/views/_ibs/Settings/Network/TableDns.vue
+++ b/src/views/_ibs/Settings/Network/TableDns.vue
@@ -39,12 +39,12 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/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/_ibs/Global/PageSection';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/Settings/Network/TableIpv4.vue b/src/views/_ibs/Settings/Network/TableIpv4.vue
index 75870031..a8a0486d 100644
--- a/src/views/_ibs/Settings/Network/TableIpv4.vue
+++ b/src/views/_ibs/Settings/Network/TableIpv4.vue
@@ -42,13 +42,13 @@
 </template>
 
 <script>
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import BVToastMixin from '@/components/_ibs/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/_ibs/Mixins/LoadingBarMixin';
+import PageSection from '@/components/_ibs/Global/PageSection';
+import TableRowAction from '@/components/_ibs/Global/TableRowAction';
 import { mapState } from 'vuex';
 
 export default {
diff --git a/src/views/_ibs/Settings/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/_ibs/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
index 06e30f3e..2c0f70f4 100644
--- a/src/views/_ibs/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
+++ b/src/views/_ibs/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/_ibs/Global/PageTitle';
+import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin';
+import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
 
 export default {
   name: 'PowerRestorePolicy',