diff --git a/packages/multiple-select-vanilla/build-prod.mjs b/packages/multiple-select-vanilla/build-prod.mjs
index e88edcff..cccecbc7 100644
--- a/packages/multiple-select-vanilla/build-prod.mjs
+++ b/packages/multiple-select-vanilla/build-prod.mjs
@@ -37,13 +37,16 @@ for (const format of buildFormats) {
     outfile: `dist/locales/multiple-select-all-locales.${extension}`,
   });
 
+  // - let's use TSUP to get valid hybrid (CJS/ESM) approach with are-the-types-wrong, however keep the rest of the build
   // finally, create a regular bundle as a standalone which will be accessible as MultipleSelect from the global window object
   // this file is basically a legacy alternative to import via a <script> tag
+  /*
   runBuild({
     format,
     globalName: 'MultipleSelect',
     outfile: `dist/browser/multiple-select.${extension}`,
   });
+  */
 }
 
 function runBuild(options) {
diff --git a/packages/multiple-select-vanilla/src/MultipleSelectInstance.ts b/packages/multiple-select-vanilla/src/MultipleSelectInstance.ts
index 84198d58..9ee519fa 100644
--- a/packages/multiple-select-vanilla/src/MultipleSelectInstance.ts
+++ b/packages/multiple-select-vanilla/src/MultipleSelectInstance.ts
@@ -2,10 +2,12 @@
  * @author zhixin wen <wenzhixin2010@gmail.com>
  */
 import Constants from './constants';
-import type { HtmlStruct, MultipleSelectLocales, OptGroupRowData, OptionDataObject, OptionRowData } from './interfaces';
-import type { CloseReason, MultipleSelectOption } from './interfaces/multipleSelectOption.interface';
-import { BindingEventService, VirtualScroll } from './services';
-import { compareObjects, deepCopy, findByParam, removeDiacritics, removeUndefined, setDataKeys, stripScripts } from './utils';
+import type { HtmlStruct, OptGroupRowData, OptionDataObject, OptionRowData } from './models/interfaces';
+import type { MultipleSelectLocales } from './models/locale.interface';
+import type { CloseReason, MultipleSelectOption } from './models/multipleSelectOption.interface';
+import { BindingEventService } from './services/binding-event.service';
+import { VirtualScroll } from './services/virtual-scroll';
+import { compareObjects, deepCopy, findByParam, removeDiacritics, removeUndefined, setDataKeys, stripScripts } from './utils/utils';
 import {
   calculateAvailableSpace,
   classNameToList,
diff --git a/packages/multiple-select-vanilla/src/constants.ts b/packages/multiple-select-vanilla/src/constants.ts
index b1d5817a..9f4f7779 100644
--- a/packages/multiple-select-vanilla/src/constants.ts
+++ b/packages/multiple-select-vanilla/src/constants.ts
@@ -1,4 +1,5 @@
-import type { LabelFilter, MultipleSelectOption, TextFilter } from './interfaces';
+import type { LabelFilter, TextFilter } from './models/interfaces';
+import type { MultipleSelectOption } from './models/multipleSelectOption.interface';
 import English from './locales/multiple-select-en-US';
 
 const BLOCK_ROWS = 50;
diff --git a/packages/multiple-select-vanilla/src/index.ts b/packages/multiple-select-vanilla/src/index.ts
index be94cee8..551e973c 100644
--- a/packages/multiple-select-vanilla/src/index.ts
+++ b/packages/multiple-select-vanilla/src/index.ts
@@ -1,6 +1,36 @@
-export * from './services';
-export * from './constants';
-export * from './interfaces';
-export * from './utils';
-export * from './multiple-select';
-export * from './MultipleSelectInstance';
+export type * from './models/interfaces';
+export type * from './models/locale.interface';
+export type * from './models/multipleSelectOption.interface';
+export { BindingEventService, type ElementEventListener } from './services/binding-event.service';
+export { VirtualScroll } from './services/virtual-scroll';
+export {
+  type HtmlElementPosition,
+  calculateAvailableSpace,
+  classNameToList,
+  convertItemRowToHtml,
+  createDomElement,
+  createDomStructure,
+  emptyElement,
+  findParent,
+  getElementOffset,
+  getElementSize,
+  insertAfter,
+  omitProp,
+  toggleElement,
+  toggleElementClass,
+  windowScrollPosition,
+} from './utils/domUtils';
+export {
+  compareObjects,
+  deepCopy,
+  findByParam,
+  isDefined,
+  objectRemoveEmptyProps,
+  removeDiacritics,
+  removeUndefined,
+  setDataKeys,
+  stripScripts,
+  toCamelCase,
+} from './utils/utils';
+export { multipleSelect } from './multiple-select';
+export { MultipleSelectInstance } from './MultipleSelectInstance';
diff --git a/packages/multiple-select-vanilla/src/interfaces/index.ts b/packages/multiple-select-vanilla/src/interfaces/index.ts
deleted file mode 100644
index c6187e1c..00000000
--- a/packages/multiple-select-vanilla/src/interfaces/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './interfaces';
-export * from './locale.interface';
-export * from './multipleSelectOption.interface';
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-cz-CS.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-cz-CS.ts
index ea848749..e8f6f1c0 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-cz-CS.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-cz-CS.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-da-DK.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-da-DK.ts
index c6117348..f6536f7a 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-da-DK.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-da-DK.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-de-DE.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-de-DE.ts
index f1936485..d0fee62f 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-de-DE.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-de-DE.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-en-US.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-en-US.ts
index 43f7477b..25e523dd 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-en-US.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-en-US.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-es-ES.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-es-ES.ts
index 6a80fd09..a6d26c2e 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-es-ES.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-es-ES.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-fr-FR.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-fr-FR.ts
index 12d4ade9..da95c8f2 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-fr-FR.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-fr-FR.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-hu-HU.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-hu-HU.ts
index d86a3502..124e6eb8 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-hu-HU.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-hu-HU.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-it-IT.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-it-IT.ts
index ad7b1127..028abb4b 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-it-IT.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-it-IT.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-ja-JP.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-ja-JP.ts
index 8c25bfd0..3863e8d1 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-ja-JP.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-ja-JP.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-pt-BR.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-pt-BR.ts
index 091fe21a..e4a2e8af 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-pt-BR.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-pt-BR.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-ru-RU.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-ru-RU.ts
index 5f0d241b..304cea9f 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-ru-RU.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-ru-RU.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-vi-VN.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-vi-VN.ts
index fce5d5c9..69876c6c 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-vi-VN.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-vi-VN.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-zh-CN.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-zh-CN.ts
index 53fda329..c9eb0732 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-zh-CN.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-zh-CN.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/locales/multiple-select-zh-TW.ts b/packages/multiple-select-vanilla/src/locales/multiple-select-zh-TW.ts
index d60f1643..be09c646 100644
--- a/packages/multiple-select-vanilla/src/locales/multiple-select-zh-TW.ts
+++ b/packages/multiple-select-vanilla/src/locales/multiple-select-zh-TW.ts
@@ -4,7 +4,7 @@
  */
 
 import type { MultipleSelectInstance } from '../MultipleSelectInstance';
-import type { MultipleSelectLocale, MultipleSelectLocales } from '../interfaces';
+import type { MultipleSelectLocale, MultipleSelectLocales } from '../models/locale.interface';
 
 const ms =
   typeof window !== 'undefined' && window.multipleSelect !== undefined
diff --git a/packages/multiple-select-vanilla/src/interfaces/interfaces.ts b/packages/multiple-select-vanilla/src/models/interfaces.ts
similarity index 100%
rename from packages/multiple-select-vanilla/src/interfaces/interfaces.ts
rename to packages/multiple-select-vanilla/src/models/interfaces.ts
diff --git a/packages/multiple-select-vanilla/src/interfaces/locale.interface.ts b/packages/multiple-select-vanilla/src/models/locale.interface.ts
similarity index 100%
rename from packages/multiple-select-vanilla/src/interfaces/locale.interface.ts
rename to packages/multiple-select-vanilla/src/models/locale.interface.ts
diff --git a/packages/multiple-select-vanilla/src/interfaces/multipleSelectOption.interface.ts b/packages/multiple-select-vanilla/src/models/multipleSelectOption.interface.ts
similarity index 100%
rename from packages/multiple-select-vanilla/src/interfaces/multipleSelectOption.interface.ts
rename to packages/multiple-select-vanilla/src/models/multipleSelectOption.interface.ts
diff --git a/packages/multiple-select-vanilla/src/multiple-select.ts b/packages/multiple-select-vanilla/src/multiple-select.ts
index 66d4916e..3b7f2a14 100644
--- a/packages/multiple-select-vanilla/src/multiple-select.ts
+++ b/packages/multiple-select-vanilla/src/multiple-select.ts
@@ -5,8 +5,8 @@
 
 import { MultipleSelectInstance } from './MultipleSelectInstance';
 import Constants from './constants';
-import type { MultipleSelectLocales } from './interfaces';
-import type { MultipleSelectOption } from './interfaces/multipleSelectOption.interface';
+import type { MultipleSelectLocales } from './models/locale.interface';
+import type { MultipleSelectOption } from './models/multipleSelectOption.interface';
 import English from './locales/multiple-select-en-US';
 
 /**
diff --git a/packages/multiple-select-vanilla/src/services/index.ts b/packages/multiple-select-vanilla/src/services/index.ts
deleted file mode 100644
index 592f314f..00000000
--- a/packages/multiple-select-vanilla/src/services/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './binding-event.service';
-export * from './virtual-scroll';
diff --git a/packages/multiple-select-vanilla/src/services/virtual-scroll.ts b/packages/multiple-select-vanilla/src/services/virtual-scroll.ts
index b8b30a9b..1ccf76a7 100644
--- a/packages/multiple-select-vanilla/src/services/virtual-scroll.ts
+++ b/packages/multiple-select-vanilla/src/services/virtual-scroll.ts
@@ -1,6 +1,6 @@
 import Constants from '../constants';
-import type { HtmlStruct, VirtualCache, VirtualScrollOption } from '../interfaces';
-import { convertItemRowToHtml, emptyElement } from '../utils';
+import type { HtmlStruct, VirtualCache, VirtualScrollOption } from '../models/interfaces';
+import { convertItemRowToHtml, emptyElement } from '../utils/domUtils';
 
 export class VirtualScroll {
   protected clusterRows?: number;
diff --git a/packages/multiple-select-vanilla/src/utils/domUtils.ts b/packages/multiple-select-vanilla/src/utils/domUtils.ts
index 591a4374..e645df22 100644
--- a/packages/multiple-select-vanilla/src/utils/domUtils.ts
+++ b/packages/multiple-select-vanilla/src/utils/domUtils.ts
@@ -1,4 +1,4 @@
-import type { HtmlStruct, InferDOMType } from '../interfaces';
+import type { HtmlStruct, InferDOMType } from '../models/interfaces';
 import { objectRemoveEmptyProps } from './utils';
 
 export interface HtmlElementPosition {
diff --git a/packages/multiple-select-vanilla/src/utils/index.ts b/packages/multiple-select-vanilla/src/utils/index.ts
deleted file mode 100644
index 7e1f1090..00000000
--- a/packages/multiple-select-vanilla/src/utils/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './domUtils';
-export * from './utils';
diff --git a/packages/multiple-select-vanilla/tsup.config.ts b/packages/multiple-select-vanilla/tsup.config.ts
index cfbb8ade..b2b3b200 100644
--- a/packages/multiple-select-vanilla/tsup.config.ts
+++ b/packages/multiple-select-vanilla/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from 'tsup';
 export default defineConfig(options => [
   // for bundlers like vite, rollup, esbuild, webpack etc
   {
-    entry: ['src/**.ts'],
+    entry: ['src/index.ts'],
     format: ['esm'],
     splitting: false,
     sourcemap: true,
@@ -27,17 +27,17 @@ export default defineConfig(options => [
   },
 
   // IIFE bundle js for cdn (window object for legacy <script>)
-  // {
-  //   entry: {
-  //     'multiple-select': 'src/index.ts',
-  //   },
-  //   format: ['iife'],
-  //   globalName: 'MultipleSelect',
-  //   splitting: false,
-  //   sourcemap: true,
-  //   clean: true,
-  //   outExtension: ({ format }) => ({
-  //     js: '.iife.js',
-  //   }),
-  // },
+  {
+    entry: {
+      'browser/multiple-select': 'src/index.ts',
+    },
+    format: ['iife'],
+    globalName: 'MultipleSelect',
+    splitting: false,
+    sourcemap: true,
+    // clean: true,
+    outExtension: ({ format }) => ({
+      js: '.iife.js',
+    }),
+  },
 ]);