diff --git a/resources/scripts/admin/components/custom-fields/types/DropdownType.vue b/resources/scripts/admin/components/custom-fields/types/DropdownType.vue
index 8430640a..49bca990 100644
--- a/resources/scripts/admin/components/custom-fields/types/DropdownType.vue
+++ b/resources/scripts/admin/components/custom-fields/types/DropdownType.vue
@@ -10,7 +10,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   modelValue: {
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
index d5537b3f..aa0c5bc3 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
@@ -19,7 +19,7 @@
       >
         <template #singlelabel="{ value }">
           <div class="absolute left-3.5">
-            {{ value.name }} - 
+            {{ value.name }} -
             <template v-if="value.calculation_type === 'fixed'">
               <BaseFormatMoney :amount="value.fixed_amount" :currency="currency" />
             </template>
@@ -30,7 +30,7 @@
         </template>
 
         <template #option="{ option }">
-          {{ option.name }} - 
+          {{ option.name }} -
           <template v-if="option.calculation_type === 'fixed'">
             <BaseFormatMoney :amount="option.fixed_amount" :currency="currency" />
           </template>
@@ -80,7 +80,7 @@ import { useI18n } from 'vue-i18n'
 import { useUserStore } from '@/scripts/admin/stores/user'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   ability: {
@@ -165,7 +165,7 @@ const taxAmount = computed(() => {
   if(localTax.calculation_type === 'fixed') {
     return localTax.fixed_amount
   }
-  
+
   if (props.discountedTotal) {
     const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
     const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'
diff --git a/resources/scripts/admin/components/modal-components/BackupModal.vue b/resources/scripts/admin/components/modal-components/BackupModal.vue
index bc2df06b..df519d9b 100644
--- a/resources/scripts/admin/components/modal-components/BackupModal.vue
+++ b/resources/scripts/admin/components/modal-components/BackupModal.vue
@@ -99,7 +99,7 @@ import { required, helpers } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseModal from '@/scripts/components/base/BaseModal.vue'
diff --git a/resources/scripts/admin/components/modal-components/CompanyModal.vue b/resources/scripts/admin/components/modal-components/CompanyModal.vue
index cb1e7212..97c986e2 100644
--- a/resources/scripts/admin/components/modal-components/CompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/CompanyModal.vue
@@ -139,7 +139,7 @@ import { useGlobalStore } from '@/scripts/admin/stores/global'
 import { useRouter } from 'vue-router'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'
diff --git a/resources/scripts/admin/components/modal-components/CustomerModal.vue b/resources/scripts/admin/components/modal-components/CustomerModal.vue
index 5c1c147a..b88aa4bf 100644
--- a/resources/scripts/admin/components/modal-components/CustomerModal.vue
+++ b/resources/scripts/admin/components/modal-components/CustomerModal.vue
@@ -482,7 +482,7 @@ import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseTab from '@/scripts/components/base/BaseTab.vue'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseTabGroup from '@/scripts/components/base/BaseTabGroup.vue'
diff --git a/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue b/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
index a5f50c50..4dd8debc 100644
--- a/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
+++ b/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
@@ -205,7 +205,7 @@ import BaseInfoAlert from '@/scripts/components/base/BaseInfoAlert.vue'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseModal from '@/scripts/components/base/BaseModal.vue'
 
diff --git a/resources/scripts/admin/components/modal-components/ItemModal.vue b/resources/scripts/admin/components/modal-components/ItemModal.vue
index b2ae87a7..7a563b28 100644
--- a/resources/scripts/admin/components/modal-components/ItemModal.vue
+++ b/resources/scripts/admin/components/modal-components/ItemModal.vue
@@ -141,7 +141,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
@@ -217,15 +217,15 @@ const v$ = useVuelidate(
 
 const getTaxTypes = computed(() => {
   return taxTypeStore.taxTypes.map((tax) => {
-    const amount = tax.calculation_type === 'fixed' 
+    const amount = tax.calculation_type === 'fixed'
       ? new Intl.NumberFormat(undefined, {
           style: 'currency',
           currency: companyStore.selectedCompanyCurrency.code
         }).format(tax.fixed_amount / 100)
       : `${tax.percent}%`
-    
-    return { 
-      ...tax, 
+
+    return {
+      ...tax,
       tax_name: `${tax.name} (${amount})`
     }
   })
diff --git a/resources/scripts/admin/components/modal-components/NoteModal.vue b/resources/scripts/admin/components/modal-components/NoteModal.vue
index f883a246..b776b401 100644
--- a/resources/scripts/admin/components/modal-components/NoteModal.vue
+++ b/resources/scripts/admin/components/modal-components/NoteModal.vue
@@ -119,7 +119,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseCustomInput from '@/scripts/components/base/BaseCustomInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseModal from '@/scripts/components/base/BaseModal.vue'
diff --git a/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue b/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
index ec62ed50..9dd313f4 100644
--- a/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
+++ b/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
@@ -226,7 +226,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseModal from '@/scripts/components/base/BaseModal.vue'
diff --git a/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue b/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
index 6952cad0..67789dd1 100644
--- a/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
@@ -173,7 +173,7 @@ import { required, url, helpers } from '@vuelidate/validators'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 export default {
   components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },
diff --git a/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue b/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue
index 127db0db..6233df0f 100644
--- a/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue
@@ -152,7 +152,7 @@ import { required, helpers } from '@vuelidate/validators'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 export default {
   components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },
diff --git a/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue b/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue
index 2c53ab42..cf44a1ae 100644
--- a/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue
@@ -83,7 +83,7 @@ import { required, helpers } from '@vuelidate/validators'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 
 export default {
diff --git a/resources/scripts/admin/components/modal-components/disks/S3CompatDisk.vue b/resources/scripts/admin/components/modal-components/disks/S3CompatDisk.vue
index 1f17674a..d26b9707 100644
--- a/resources/scripts/admin/components/modal-components/disks/S3CompatDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/S3CompatDisk.vue
@@ -172,7 +172,7 @@ import { required, helpers } from '@vuelidate/validators'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 export default {
   components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },
diff --git a/resources/scripts/admin/components/modal-components/disks/S3Disk.vue b/resources/scripts/admin/components/modal-components/disks/S3Disk.vue
index f11b6e53..d953c0a8 100644
--- a/resources/scripts/admin/components/modal-components/disks/S3Disk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/S3Disk.vue
@@ -154,7 +154,7 @@ import { required, helpers } from '@vuelidate/validators'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 export default {
   components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },
diff --git a/resources/scripts/admin/views/customers/Create.vue b/resources/scripts/admin/views/customers/Create.vue
index 3ad08f45..f47668a3 100644
--- a/resources/scripts/admin/views/customers/Create.vue
+++ b/resources/scripts/admin/views/customers/Create.vue
@@ -597,7 +597,7 @@ import BaseDivider from '@/scripts/components/base/BaseDivider.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
diff --git a/resources/scripts/admin/views/customers/partials/CustomerChart.vue b/resources/scripts/admin/views/customers/partials/CustomerChart.vue
index e47c4516..495ce4bd 100644
--- a/resources/scripts/admin/views/customers/partials/CustomerChart.vue
+++ b/resources/scripts/admin/views/customers/partials/CustomerChart.vue
@@ -130,7 +130,7 @@ import { useCompanyStore } from '@/scripts/admin/stores/company'
 import ChartPlaceholder from './CustomerChartPlaceholder.vue'
 import { useI18n } from 'vue-i18n'
 import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseCard from '@/scripts/components/base/BaseCard.vue'
 
diff --git a/resources/scripts/admin/views/dashboard/DashboardChart.vue b/resources/scripts/admin/views/dashboard/DashboardChart.vue
index 5c27f1bc..58665734 100644
--- a/resources/scripts/admin/views/dashboard/DashboardChart.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardChart.vue
@@ -158,7 +158,7 @@ import abilities from '@/scripts/admin/stub/abilities'
 import { useUserStore } from '@/scripts/admin/stores/user'
 import { useI18n } from 'vue-i18n'
 import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 
 const dashboardStore = useDashboardStore()
diff --git a/resources/scripts/admin/views/estimates/Index.vue b/resources/scripts/admin/views/estimates/Index.vue
index bc3477f2..254d5f0c 100644
--- a/resources/scripts/admin/views/estimates/Index.vue
+++ b/resources/scripts/admin/views/estimates/Index.vue
@@ -266,7 +266,7 @@ import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/admin/views/expenses/Create.vue b/resources/scripts/admin/views/expenses/Create.vue
index fa6dd285..7be260e2 100644
--- a/resources/scripts/admin/views/expenses/Create.vue
+++ b/resources/scripts/admin/views/expenses/Create.vue
@@ -302,7 +302,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseSelectAction from '@/scripts/components/base/BaseSelectAction.vue'
diff --git a/resources/scripts/admin/views/expenses/Index.vue b/resources/scripts/admin/views/expenses/Index.vue
index 61988ba6..f73fb67a 100644
--- a/resources/scripts/admin/views/expenses/Index.vue
+++ b/resources/scripts/admin/views/expenses/Index.vue
@@ -239,7 +239,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/admin/views/installation/Step0SetLanguage.vue b/resources/scripts/admin/views/installation/Step0SetLanguage.vue
index d3ff6911..f7700209 100644
--- a/resources/scripts/admin/views/installation/Step0SetLanguage.vue
+++ b/resources/scripts/admin/views/installation/Step0SetLanguage.vue
@@ -44,7 +44,7 @@ import { onMounted, ref } from 'vue'
 import { useInstallationStore } from '@/scripts/admin/stores/installation.js'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseWizardStep from '@/scripts/components/base/BaseWizardStep.vue'
 
diff --git a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
index ed8b4551..071237b6 100644
--- a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
+++ b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
@@ -173,7 +173,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'
 import BaseWizardStep from '@/scripts/components/base/BaseWizardStep.vue'
 
diff --git a/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue b/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue
index 1e2877fd..107532fa 100644
--- a/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue
+++ b/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue
@@ -157,7 +157,7 @@ import { useNotificationStore } from '@/scripts/stores/notification'
 import { useRouter } from 'vue-router'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseWizardStep from '@/scripts/components/base/BaseWizardStep.vue'
 
diff --git a/resources/scripts/admin/views/installation/database/MysqlDatabase.vue b/resources/scripts/admin/views/installation/database/MysqlDatabase.vue
index cfb2a704..9b5479a7 100644
--- a/resources/scripts/admin/views/installation/database/MysqlDatabase.vue
+++ b/resources/scripts/admin/views/installation/database/MysqlDatabase.vue
@@ -116,7 +116,7 @@ import BaseCheckbox from '@/scripts/components/base/BaseCheckbox.vue'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   configData: {
diff --git a/resources/scripts/admin/views/installation/database/PgsqlDatabase.vue b/resources/scripts/admin/views/installation/database/PgsqlDatabase.vue
index 14c60c6e..ef2a771a 100644
--- a/resources/scripts/admin/views/installation/database/PgsqlDatabase.vue
+++ b/resources/scripts/admin/views/installation/database/PgsqlDatabase.vue
@@ -136,7 +136,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   configData: {
diff --git a/resources/scripts/admin/views/installation/database/SqliteDatabase.vue b/resources/scripts/admin/views/installation/database/SqliteDatabase.vue
index daacfa38..c30cdadd 100644
--- a/resources/scripts/admin/views/installation/database/SqliteDatabase.vue
+++ b/resources/scripts/admin/views/installation/database/SqliteDatabase.vue
@@ -80,7 +80,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   configData: {
diff --git a/resources/scripts/admin/views/installation/mail-driver/BasicMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/BasicMailDriver.vue
index 27be6153..4ca201b0 100644
--- a/resources/scripts/admin/views/installation/mail-driver/BasicMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/BasicMailDriver.vue
@@ -84,7 +84,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   isSaving: {
diff --git a/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
index 04d8b929..8074d830 100644
--- a/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
@@ -154,7 +154,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   isSaving: {
diff --git a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
index b921f735..d53d3985 100644
--- a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
@@ -213,7 +213,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   isSaving: {
diff --git a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
index fc58c91c..4791abd3 100644
--- a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
@@ -180,7 +180,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   isSaving: {
diff --git a/resources/scripts/admin/views/invoices/Index.vue b/resources/scripts/admin/views/invoices/Index.vue
index 26f993e8..07a091bc 100644
--- a/resources/scripts/admin/views/invoices/Index.vue
+++ b/resources/scripts/admin/views/invoices/Index.vue
@@ -295,7 +295,7 @@ import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/admin/views/items/Create.vue b/resources/scripts/admin/views/items/Create.vue
index 16876b7d..cd080f82 100644
--- a/resources/scripts/admin/views/items/Create.vue
+++ b/resources/scripts/admin/views/items/Create.vue
@@ -149,7 +149,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseSelectAction from '@/scripts/components/base/BaseSelectAction.vue'
 import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
diff --git a/resources/scripts/admin/views/items/Index.vue b/resources/scripts/admin/views/items/Index.vue
index 9651a203..4efc678d 100644
--- a/resources/scripts/admin/views/items/Index.vue
+++ b/resources/scripts/admin/views/items/Index.vue
@@ -211,7 +211,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder.vue'
 import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/admin/views/payments/Create.vue b/resources/scripts/admin/views/payments/Create.vue
index d94a20fb..4a35ab09 100644
--- a/resources/scripts/admin/views/payments/Create.vue
+++ b/resources/scripts/admin/views/payments/Create.vue
@@ -275,7 +275,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseCustomInput from '@/scripts/components/base/BaseCustomInput.vue'
 import BaseSelectAction from '@/scripts/components/base/BaseSelectAction.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
diff --git a/resources/scripts/admin/views/payments/Index.vue b/resources/scripts/admin/views/payments/Index.vue
index d2bf967f..17290391 100644
--- a/resources/scripts/admin/views/payments/Index.vue
+++ b/resources/scripts/admin/views/payments/Index.vue
@@ -222,7 +222,7 @@ import BaseDropdownItem from '@/scripts/components/base/BaseDropdownItem.vue'
 import BaseDropdown from '@/scripts/components/base/BaseDropdown.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
diff --git a/resources/scripts/admin/views/recurring-invoices/Index.vue b/resources/scripts/admin/views/recurring-invoices/Index.vue
index 7b4a988b..2e1edd1f 100644
--- a/resources/scripts/admin/views/recurring-invoices/Index.vue
+++ b/resources/scripts/admin/views/recurring-invoices/Index.vue
@@ -279,7 +279,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseCustomerSelectInput from '@/scripts/components/base/BaseCustomerSelectInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue b/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
index 985c14ce..a9623b4c 100644
--- a/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
+++ b/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
@@ -191,7 +191,7 @@ import { useI18n } from 'vue-i18n'
 import ExchangeRateConverter from '@/scripts/admin/components/estimate-invoice-common/ExchangeRateConverter.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
 import BaseCustomerSelectPopup from '@/scripts/components/base/BaseCustomerSelectPopup.vue'
diff --git a/resources/scripts/admin/views/reports/ExpensesReport.vue b/resources/scripts/admin/views/reports/ExpensesReport.vue
index dc5ec2ec..0c9215b7 100644
--- a/resources/scripts/admin/views/reports/ExpensesReport.vue
+++ b/resources/scripts/admin/views/reports/ExpensesReport.vue
@@ -98,7 +98,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const globalStore = useGlobalStore()
 const companyStore = useCompanyStore()
diff --git a/resources/scripts/admin/views/reports/ProfitLossReport.vue b/resources/scripts/admin/views/reports/ProfitLossReport.vue
index e7d81add..6d32d563 100644
--- a/resources/scripts/admin/views/reports/ProfitLossReport.vue
+++ b/resources/scripts/admin/views/reports/ProfitLossReport.vue
@@ -96,7 +96,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const globalStore = useGlobalStore()
 const companyStore = useCompanyStore()
diff --git a/resources/scripts/admin/views/reports/SalesReports.vue b/resources/scripts/admin/views/reports/SalesReports.vue
index bb58e8dd..ecc1a6e7 100644
--- a/resources/scripts/admin/views/reports/SalesReports.vue
+++ b/resources/scripts/admin/views/reports/SalesReports.vue
@@ -108,7 +108,7 @@ import { useI18n } from 'vue-i18n'
 import { useGlobalStore } from '@/scripts/admin/stores/global'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 
diff --git a/resources/scripts/admin/views/reports/TaxReport.vue b/resources/scripts/admin/views/reports/TaxReport.vue
index 2375c3df..fc48c356 100644
--- a/resources/scripts/admin/views/reports/TaxReport.vue
+++ b/resources/scripts/admin/views/reports/TaxReport.vue
@@ -95,7 +95,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseDatePicker from '@/scripts/components/base/BaseDatePicker.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const globalStore = useGlobalStore()
 
diff --git a/resources/scripts/admin/views/settings/AccountSetting.vue b/resources/scripts/admin/views/settings/AccountSetting.vue
index 9805a11e..e8433ccc 100644
--- a/resources/scripts/admin/views/settings/AccountSetting.vue
+++ b/resources/scripts/admin/views/settings/AccountSetting.vue
@@ -106,7 +106,7 @@ import { useVuelidate } from '@vuelidate/core'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'
diff --git a/resources/scripts/admin/views/settings/BackupSetting.vue b/resources/scripts/admin/views/settings/BackupSetting.vue
index e28e13a1..23fcce4a 100644
--- a/resources/scripts/admin/views/settings/BackupSetting.vue
+++ b/resources/scripts/admin/views/settings/BackupSetting.vue
@@ -79,7 +79,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseDropdownItem from '@/scripts/components/base/BaseDropdownItem.vue'
 import BaseDropdown from '@/scripts/components/base/BaseDropdown.vue'
 import BaseTable from '@/scripts/components/base/base-table/BaseTable.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseSettingCard from '@/scripts/components/base/BaseSettingCard.vue'
diff --git a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
index 7fcc9a9b..28b6b069 100644
--- a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
+++ b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
@@ -148,7 +148,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'
 import BaseSettingCard from '@/scripts/components/base/BaseSettingCard.vue'
diff --git a/resources/scripts/admin/views/settings/PreferencesSetting.vue b/resources/scripts/admin/views/settings/PreferencesSetting.vue
index 6fba92f0..ceed97d8 100644
--- a/resources/scripts/admin/views/settings/PreferencesSetting.vue
+++ b/resources/scripts/admin/views/settings/PreferencesSetting.vue
@@ -214,7 +214,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseSettingCard from '@/scripts/components/base/BaseSettingCard.vue'
 
diff --git a/resources/scripts/admin/views/settings/SettingsIndex.vue b/resources/scripts/admin/views/settings/SettingsIndex.vue
index 18785fdd..cbd32858 100644
--- a/resources/scripts/admin/views/settings/SettingsIndex.vue
+++ b/resources/scripts/admin/views/settings/SettingsIndex.vue
@@ -58,7 +58,7 @@ import BaseList from '@/scripts/components/list/BaseList.vue'
 import BaseListItem from '@/scripts/components/list/BaseListItem.vue'
 import { useI18n } from 'vue-i18n'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
 import BaseBreadcrumb from '@/scripts/components/base/BaseBreadcrumb.vue'
 import BasePageHeader from '@/scripts/components/base/BasePageHeader.vue'
diff --git a/resources/scripts/admin/views/settings/mail-driver/BasicMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/BasicMailDriver.vue
index fee2bbe9..fcc16926 100644
--- a/resources/scripts/admin/views/settings/mail-driver/BasicMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/BasicMailDriver.vue
@@ -86,7 +86,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 
 const props = defineProps({
diff --git a/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
index 1aefd61d..df1d1628 100644
--- a/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
@@ -152,7 +152,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 
 const props = defineProps({
diff --git a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
index f22b9b18..6b349a1b 100644
--- a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
@@ -211,7 +211,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 
 const props = defineProps({
diff --git a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
index 4c1544df..32d2be38 100644
--- a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
@@ -178,7 +178,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 
 const props = defineProps({
diff --git a/resources/scripts/admin/views/users/Create.vue b/resources/scripts/admin/views/users/Create.vue
index 2609dfa7..77de41a0 100644
--- a/resources/scripts/admin/views/users/Create.vue
+++ b/resources/scripts/admin/views/users/Create.vue
@@ -174,7 +174,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
 import BaseCard from '@/scripts/components/base/BaseCard.vue'
 import BaseBreadcrumbItem from '@/scripts/components/base/BaseBreadcrumbItem.vue'
diff --git a/resources/scripts/components/base/BaseCustomerSelectInput.vue b/resources/scripts/components/base/BaseCustomerSelectInput.vue
index 668795ba..b688e4b5 100644
--- a/resources/scripts/components/base/BaseCustomerSelectInput.vue
+++ b/resources/scripts/components/base/BaseCustomerSelectInput.vue
@@ -43,7 +43,7 @@ import { useUserStore } from '@/scripts/admin/stores/user'
 import abilities from '@/scripts/admin/stub/abilities'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseSelectAction from '@/scripts/components/base/BaseSelectAction.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   modelValue: {
diff --git a/resources/scripts/components/base/BaseItemSelect.vue b/resources/scripts/components/base/BaseItemSelect.vue
index e994d10a..3bd60a78 100644
--- a/resources/scripts/components/base/BaseItemSelect.vue
+++ b/resources/scripts/components/base/BaseItemSelect.vue
@@ -92,7 +92,7 @@ import abilities from '@/scripts/admin/stub/abilities'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseSelectAction from '@/scripts/components/base/BaseSelectAction.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 
 const props = defineProps({
   contentLoading: {
diff --git a/resources/scripts/components/base-select/BaseMultiselect.d.ts b/resources/scripts/components/base/base-select/BaseMultiselect.d.ts
similarity index 100%
rename from resources/scripts/components/base-select/BaseMultiselect.d.ts
rename to resources/scripts/components/base/base-select/BaseMultiselect.d.ts
diff --git a/resources/scripts/components/base-select/BaseMultiselect.vue b/resources/scripts/components/base/base-select/BaseMultiselect.vue
similarity index 97%
rename from resources/scripts/components/base-select/BaseMultiselect.vue
rename to resources/scripts/components/base/base-select/BaseMultiselect.vue
index f2c3dc33..359ac1fa 100755
--- a/resources/scripts/components/base-select/BaseMultiselect.vue
+++ b/resources/scripts/components/base/base-select/BaseMultiselect.vue
@@ -227,16 +227,16 @@
 </template>
 
 <script>
-import useData from './composables/useData'
-import useValue from './composables/useValue'
-import useSearch from './composables/useSearch'
-import usePointer from './composables/usePointer'
-import useOptions from './composables/useOptions'
-import usePointerAction from './composables/usePointerAction'
-import useDropdown from './composables/useDropdown'
-import useMultiselect from './composables/useMultiselect'
-import useKeyboard from './composables/useKeyboard'
-import useClasses from './composables/useClasses'
+import useData from './composables/useData.js'
+import useValue from './composables/useValue.js'
+import useSearch from './composables/useSearch.js'
+import usePointer from './composables/usePointer.js'
+import useOptions from './composables/useOptions.js'
+import usePointerAction from './composables/usePointerAction.js'
+import useDropdown from './composables/useDropdown.js'
+import useMultiselect from './composables/useMultiselect.js'
+import useKeyboard from './composables/useKeyboard.js'
+import useClasses from './composables/useClasses.js'
 import BaseContentPlaceholdersBox from '@/scripts/components/base/BaseContentPlaceholdersBox.vue'
 import BaseContentPlaceholders from '@/scripts/components/base/BaseContentPlaceholders.vue'
 
diff --git a/resources/scripts/components/base-select/composables/useClasses.js b/resources/scripts/components/base/base-select/composables/useClasses.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useClasses.js
rename to resources/scripts/components/base/base-select/composables/useClasses.js
diff --git a/resources/scripts/components/base-select/composables/useData.js b/resources/scripts/components/base/base-select/composables/useData.js
similarity index 96%
rename from resources/scripts/components/base-select/composables/useData.js
rename to resources/scripts/components/base/base-select/composables/useData.js
index 3e7d21c9..09e6a52e 100644
--- a/resources/scripts/components/base-select/composables/useData.js
+++ b/resources/scripts/components/base/base-select/composables/useData.js
@@ -1,5 +1,5 @@
 import { toRefs } from 'vue'
-import isNullish from './../utils/isNullish'
+import isNullish from '../utils/isNullish.js'
 
 export default function useData(props, context, dep) {
   const { object, valueProp, mode } = toRefs(props)
diff --git a/resources/scripts/components/base-select/composables/useDropdown.js b/resources/scripts/components/base/base-select/composables/useDropdown.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useDropdown.js
rename to resources/scripts/components/base/base-select/composables/useDropdown.js
diff --git a/resources/scripts/components/base-select/composables/useKeyboard.js b/resources/scripts/components/base/base-select/composables/useKeyboard.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useKeyboard.js
rename to resources/scripts/components/base/base-select/composables/useKeyboard.js
diff --git a/resources/scripts/components/base-select/composables/useMultiselect.js b/resources/scripts/components/base/base-select/composables/useMultiselect.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useMultiselect.js
rename to resources/scripts/components/base/base-select/composables/useMultiselect.js
diff --git a/resources/scripts/components/base-select/composables/useOptions.js b/resources/scripts/components/base/base-select/composables/useOptions.js
similarity index 98%
rename from resources/scripts/components/base-select/composables/useOptions.js
rename to resources/scripts/components/base/base-select/composables/useOptions.js
index d143f255..86cb7789 100644
--- a/resources/scripts/components/base-select/composables/useOptions.js
+++ b/resources/scripts/components/base/base-select/composables/useOptions.js
@@ -1,8 +1,8 @@
 import { ref, toRefs, computed, watch, nextTick } from 'vue'
-import normalize from './../utils/normalize'
-import isObject from './../utils/isObject'
-import isNullish from './../utils/isNullish'
-import arraysEqual from './../utils/arraysEqual'
+import normalize from '../utils/normalize.js'
+import isObject from '../utils/isObject.js'
+import isNullish from '../utils/isNullish.js'
+import arraysEqual from '../utils/arraysEqual.js'
 
 export default function useOptions(props, context, dep) {
   const {
diff --git a/resources/scripts/components/base-select/composables/usePointer.js b/resources/scripts/components/base/base-select/composables/usePointer.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/usePointer.js
rename to resources/scripts/components/base/base-select/composables/usePointer.js
diff --git a/resources/scripts/components/base-select/composables/usePointerAction.js b/resources/scripts/components/base/base-select/composables/usePointerAction.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/usePointerAction.js
rename to resources/scripts/components/base/base-select/composables/usePointerAction.js
diff --git a/resources/scripts/components/base-select/composables/useSearch.js b/resources/scripts/components/base/base-select/composables/useSearch.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useSearch.js
rename to resources/scripts/components/base/base-select/composables/useSearch.js
diff --git a/resources/scripts/components/base-select/composables/useValue.js b/resources/scripts/components/base/base-select/composables/useValue.js
similarity index 100%
rename from resources/scripts/components/base-select/composables/useValue.js
rename to resources/scripts/components/base/base-select/composables/useValue.js
diff --git a/resources/scripts/components/base-select/index.d.ts b/resources/scripts/components/base/base-select/index.d.ts
similarity index 100%
rename from resources/scripts/components/base-select/index.d.ts
rename to resources/scripts/components/base/base-select/index.d.ts
diff --git a/resources/scripts/components/base-select/utils/arraysEqual.js b/resources/scripts/components/base/base-select/utils/arraysEqual.js
similarity index 100%
rename from resources/scripts/components/base-select/utils/arraysEqual.js
rename to resources/scripts/components/base/base-select/utils/arraysEqual.js
diff --git a/resources/scripts/components/base-select/utils/isNullish.js b/resources/scripts/components/base/base-select/utils/isNullish.js
similarity index 100%
rename from resources/scripts/components/base-select/utils/isNullish.js
rename to resources/scripts/components/base/base-select/utils/isNullish.js
diff --git a/resources/scripts/components/base-select/utils/isObject.js b/resources/scripts/components/base/base-select/utils/isObject.js
similarity index 100%
rename from resources/scripts/components/base-select/utils/isObject.js
rename to resources/scripts/components/base/base-select/utils/isObject.js
diff --git a/resources/scripts/components/base-select/utils/normalize.js b/resources/scripts/components/base/base-select/utils/normalize.js
similarity index 100%
rename from resources/scripts/components/base-select/utils/normalize.js
rename to resources/scripts/components/base/base-select/utils/normalize.js
diff --git a/resources/scripts/customer/views/payments/Index.vue b/resources/scripts/customer/views/payments/Index.vue
index c012e48a..97de5003 100644
--- a/resources/scripts/customer/views/payments/Index.vue
+++ b/resources/scripts/customer/views/payments/Index.vue
@@ -139,7 +139,7 @@ import { useGlobalStore } from '@/scripts/customer/stores/global'
 import { useRoute } from 'vue-router'
 import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
 import BaseEmptyPlaceholder from '@/scripts/components/base/BaseEmptyPlaceholder.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseFilterWrapper from '@/scripts/components/base/BaseFilterWrapper.vue'
diff --git a/resources/scripts/customer/views/settings/AddressInformation.vue b/resources/scripts/customer/views/settings/AddressInformation.vue
index bae96bff..33e5074b 100644
--- a/resources/scripts/customer/views/settings/AddressInformation.vue
+++ b/resources/scripts/customer/views/settings/AddressInformation.vue
@@ -252,7 +252,7 @@ import BaseButton from '@/scripts/components/base/BaseButton.vue'
 import BaseInput from '@/scripts/components/base/BaseInput.vue'
 import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
 import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
-import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
+import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
 import BaseDivider from '@/scripts/components/base/BaseDivider.vue'
 import BaseCard from '@/scripts/components/base/BaseCard.vue'