diff --git a/.changeset/tiny-lamps-melt.md b/.changeset/tiny-lamps-melt.md
index 11a575df1..28a442a2b 100644
--- a/.changeset/tiny-lamps-melt.md
+++ b/.changeset/tiny-lamps-melt.md
@@ -1,5 +1,5 @@
 ---
-"@lion/calendar": patch
+'@lion/calendar': patch
 ---
 
 Fix: calendar translation de.js strings corrected
diff --git a/.eslintrc.js b/.eslintrc.js
index 78a316bd6..4fe48cde5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +1,5 @@
+const path = require('path');
+
 module.exports = {
   extends: ['@open-wc/eslint-config', 'eslint-config-prettier'].map(require.resolve),
   overrides: [
@@ -40,4 +42,9 @@ module.exports = {
       },
     },
   ],
+  settings: {
+    'import/resolver': {
+      [path.resolve('./scripts/eslint-resolver.cjs')]: {},
+    },
+  },
 };
diff --git a/.lintstagedrc.js b/.lintstagedrc.js
index ea67de30d..8cc602a3d 100644
--- a/.lintstagedrc.js
+++ b/.lintstagedrc.js
@@ -3,7 +3,7 @@ module.exports = {
   '*.js': ['eslint --fix', 'prettier --write', 'git add'],
   '*.md': [
     'prettier --write',
-    "markdownlint --ignore '{.github/**/*.md,.changeset/*.md,**/CHANGELOG.md}'",
+    "markdownlint --ignore '{.github/**/*.md,.changeset/*.md,**/CHANGELOG.md,packages/ui/_legacy-changelogs/*.md}'",
     'git add',
   ],
   'package-lock.json': ['node ./scripts/lock-scan.js'],
diff --git a/.prettierignore b/.prettierignore
index 6a88a053a..d7d4e8748 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,3 +7,5 @@ _site-dev
 
 /docs/_assets/scoped-custom-element-registry.min.js
 /docs/_assets/scoped-custom-element-registry.min.js.map
+
+/packages/ui/_legacy-changelogs
diff --git a/README.md b/README.md
index 736ffafc6..c65d635b7 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ npm i @lion/<package-name>
 **This is the main use case for lion**. To import component classes, and extend them for your own design system's components.
 
 ```js
-import { css } from '@lion/core';
+import { css } from 'lit';
 import { LionInput } from '@lion/input';
 
 class MyInput extends LionInput {
diff --git a/bundlesize/all.js b/bundlesize/all.js
deleted file mode 100644
index c95fa9709..000000000
--- a/bundlesize/all.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import '../packages/accordion/index.js';
-import '../packages/ajax/index.js';
-import '../packages/button/index.js';
-import '../packages/calendar/index.js';
-import '../packages/checkbox-group/index.js';
-import '../packages/collapsible/index.js';
-import '../packages/combobox/index.js';
-import '../packages/core/index.js';
-import '../packages/dialog/index.js';
-import '../packages/fieldset/index.js';
-import '../packages/form/index.js';
-import '../packages/form-core/index.js';
-import '../packages/icon/index.js';
-import '../packages/input/index.js';
-import '../packages/input-amount/index.js';
-import '../packages/input-date/index.js';
-import '../packages/input-email/index.js';
-import '../packages/input-iban/index.js';
-import '../packages/input-range/index.js';
-import '../packages/input-stepper/index.js';
-import '../packages/listbox/index.js';
-import '../packages/localize/index.js';
-import '../packages/overlays/index.js';
-import '../packages/pagination/index.js';
-import '../packages/progress-indicator/index.js';
-import '../packages/radio-group/index.js';
-import '../packages/select/index.js';
-import '../packages/select-rich/index.js';
-import '../packages/steps/index.js';
-import '../packages/switch/index.js';
-import '../packages/tabs/index.js';
-import '../packages/textarea/index.js';
-import '../packages/tooltip/index.js';
-import '../packages/validate-messages/index.js';
diff --git a/bundlesize/core.js b/bundlesize/core.js
deleted file mode 100644
index 659c6f924..000000000
--- a/bundlesize/core.js
+++ /dev/null
@@ -1 +0,0 @@
-import '../packages/core/index.js';
diff --git a/bundlesize/rollup.config.js b/bundlesize/rollup.config.js
index a054ebaac..00116feab 100644
--- a/bundlesize/rollup.config.js
+++ b/bundlesize/rollup.config.js
@@ -1,11 +1,24 @@
 import { createBasicConfig } from '@open-wc/building-rollup';
+import { readdirSync } from 'fs';
+import path from 'path';
 
-export default ['core', 'all'].map(name => {
+const entrypoints = readdirSync(new URL('../packages/ui/exports', import.meta.url), {
+  withFileTypes: true,
+});
+const entrypointNames = [];
+for (const entry of entrypoints) {
+  const { name } = entry;
+  if (entry.isFile() && name.endsWith('.js') && !name.endsWith('-test-suites.js')) {
+    entrypointNames.push(name);
+  }
+}
+
+export default entrypointNames.map(name => {
   const config = createBasicConfig();
 
   return {
     ...config,
-    input: `bundlesize/${name}.js`,
+    input: path.resolve(`./packages/ui/exports/${name}`),
     treeshake: false,
     output: {
       ...config.output,
diff --git a/docs/_includes/_joiningBlocks/header/25-search-input.njk b/docs/_includes/_joiningBlocks/header/25-search-input.njk
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/blog/ing-open-sources-lion.md b/docs/blog/ing-open-sources-lion.md
index a7432ffc7..be5bf0493 100644
--- a/docs/blog/ing-open-sources-lion.md
+++ b/docs/blog/ing-open-sources-lion.md
@@ -150,7 +150,7 @@ npm i lit-element @lion/tabs
 Create a `lea-tabs` component by reusing the functionality of Lion. This gives Lea all the functionality and accessible core that she needs for his custom tabs component.
 
 ```js
-import { css } from 'lit-element';
+import { css } from 'lit';
 import { LionTabs } from '@lion/tabs';
 
 export class LeaTabs extends LionTabs {
diff --git a/docs/blog/lion-without-polyfills.md b/docs/blog/lion-without-polyfills.md
index 019b3ecd2..7a6176873 100644
--- a/docs/blog/lion-without-polyfills.md
+++ b/docs/blog/lion-without-polyfills.md
@@ -22,7 +22,8 @@ This means that you can use a Lion Component like `lion-listbox` (which uses com
 To clarify: within Lion class files we never import files that run `customElement.define`
 
 ```js
-import { LitElement, html, ScopedElementsMixin } from '@lion/core';
+import { LitElement, html } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
 import { MyCardHeader } from './MyCardHeader.js';
 
 export class MyCard extends ScopedElementsMixin(LitElement) {
@@ -76,7 +77,8 @@ If you extend Lion components and you imperatively create scoped custom elements
 Be sure to always define **ALL** the sub elements you are using in your template within your `scopedElements` property.
 
 ```js
-import { LitElement, html, ScopedElementsMixin } from '@lion/core';
+import { LitElement, html } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
 import { MyCardHeader } from './MyCardHeader.js';
 
 export class MyCard extends ScopedElementsMixin(LitElement) {
diff --git a/docs/components/accordion/overview.md b/docs/components/accordion/overview.md
index 26ba74897..349645d43 100644
--- a/docs/components/accordion/overview.md
+++ b/docs/components/accordion/overview.md
@@ -7,8 +7,9 @@ import { html as previewHtml } from '@mdjs/mdjs-preview';
 ```
 
 ```js preview-story
-import { html, LitElement, ScopedElementsMixin } from '@lion/core';
-import { LionAccordion } from '@lion/accordion';
+import { html, LitElement } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { LionAccordion } from '@lion/ui/accordion.js';
 
 class MyComponent extends ScopedElementsMixin(LitElement) {
   static get scopedElements() {
@@ -75,14 +76,15 @@ export const overview = () => previewHtml`<my-component></my-component>`;
 1. Install
 
 ```bash
-npm i --save @lion/accordion
+npm i --save @lion/ui
 ```
 
 2. Use scoped registry
 
 ```js
-import { html, LitElement, ScopedElementsMixin } from '@lion/core';
-import { LionAccordion } from '@lion/accordion';
+import { html, LitElement } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { LionAccordion } from '@lion/ui/accordion.js';
 
 class MyComponent extends ScopedElementsMixin(LitElement) {
   static get scopedElements() {
@@ -110,7 +112,7 @@ class MyComponent extends ScopedElementsMixin(LitElement) {
 
 ```html
 <script type="module">
-  import '@lion/accordion/define';
+  import '@lion/ui/define/lion-accordion.js';
 </script>
 
 <lion-accordion>
diff --git a/docs/components/accordion/use-cases.md b/docs/components/accordion/use-cases.md
index 66285741f..f3d6a1fde 100644
--- a/docs/components/accordion/use-cases.md
+++ b/docs/components/accordion/use-cases.md
@@ -3,7 +3,7 @@
 ```js script
 import { html as previewHtml } from '@mdjs/mdjs-preview';
 
-import '@lion/accordion/define';
+import '@lion/ui/define/lion-accordion.js';
 ```
 
 ## Default Accordion collapsed
@@ -168,7 +168,7 @@ One way is by creating the DOM elements and appending them as needed. For how th
 Another way is by adding data to the Lit property that you loop over in your template. See `__handlePushClick` for an example.
 
 ```js preview-story
-import { html, LitElement } from '@lion/core';
+import { html, LitElement } from 'lit';
 
 export const distributeNewElement = () => {
   class DemoDistribute extends LitElement {
diff --git a/docs/components/button/examples.md b/docs/components/button/examples.md
index a22559e42..c0b2dc607 100644
--- a/docs/components/button/examples.md
+++ b/docs/components/button/examples.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/button/define';
+import '@lion/ui/define/lion-button.js';
 import iconSvg from './src/icon.svg.js';
 ```
 
diff --git a/docs/components/button/overview.md b/docs/components/button/overview.md
index 28c071a31..ef30f9fec 100644
--- a/docs/components/button/overview.md
+++ b/docs/components/button/overview.md
@@ -4,7 +4,7 @@ A button web component that is easily stylable and accessible.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/button/define';
+import '@lion/ui/define/lion-button.js';
 ```
 
 ```js preview-story
@@ -20,11 +20,11 @@ export const main = () => html` <lion-button>Default</lion-button> `;
 ## Installation
 
 ```bash
-npm i --save @lion/button
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionButton, LionButtonReset, LionButtonSubmit } from '@lion/button';
+import { LionButton, LionButtonReset, LionButtonSubmit } from '@lion/ui/button.js';
 // or
-import '@lion/button/define';
+import '@lion/ui/define/lion-button.js';
 ```
diff --git a/docs/components/button/use-cases.md b/docs/components/button/use-cases.md
index 2aede299d..494f810f4 100644
--- a/docs/components/button/use-cases.md
+++ b/docs/components/button/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/button/define';
+import '@lion/ui/define/lion-button.js';
 ```
 
 ## With click handler
diff --git a/docs/components/calendar/overview.md b/docs/components/calendar/overview.md
index c44c68c15..f4eeecc76 100644
--- a/docs/components/calendar/overview.md
+++ b/docs/components/calendar/overview.md
@@ -4,7 +4,7 @@ A reusable and accessible calendar view web component.
 
 ```js script
 import { html, css } from '@mdjs/mdjs-preview';
-import '@lion/calendar/define';
+import '@lion/ui/define/lion-calendar.js';
 ```
 
 ```js preview-story
@@ -41,9 +41,9 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/calendar
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/calendar/define';
+import '@lion/ui/define/lion-calendar.js';
 ```
diff --git a/docs/components/calendar/use-cases.md b/docs/components/calendar/use-cases.md
index e2253e3cb..24f37edf0 100644
--- a/docs/components/calendar/use-cases.md
+++ b/docs/components/calendar/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html, css } from '@mdjs/mdjs-preview';
-import '@lion/calendar/define';
+import '@lion/ui/define/lion-calendar.js';
 ```
 
 ## Selected date
diff --git a/docs/components/checkbox-group/overview.md b/docs/components/checkbox-group/overview.md
index 173226212..555dded8f 100644
--- a/docs/components/checkbox-group/overview.md
+++ b/docs/components/checkbox-group/overview.md
@@ -7,7 +7,8 @@ Its purpose is to provide a way for users to check **multiple** options amongst
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/checkbox-group/define';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox.js';
 ```
 
 ```js preview-story
@@ -30,9 +31,10 @@ it has all the features a fieldset has.
 ## Installation
 
 ```bash
-npm i --save @lion/checkbox-group
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/checkbox-group/define';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox.js';
 ```
diff --git a/docs/components/checkbox-group/use-cases.md b/docs/components/checkbox-group/use-cases.md
index 515049862..949333f0b 100644
--- a/docs/components/checkbox-group/use-cases.md
+++ b/docs/components/checkbox-group/use-cases.md
@@ -2,7 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/checkbox-group/define';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox.js';
 ```
 
 ## Model value
diff --git a/docs/components/collapsible/assets/CustomCollapsible.js b/docs/components/collapsible/assets/CustomCollapsible.js
index 09df418b6..1bed17454 100644
--- a/docs/components/collapsible/assets/CustomCollapsible.js
+++ b/docs/components/collapsible/assets/CustomCollapsible.js
@@ -1,4 +1,4 @@
-import { LionCollapsible } from '@lion/collapsible';
+import { LionCollapsible } from '@lion/ui/collapsible.js';
 
 const EVENT = {
   TRANSITION_END: 'transitionend',
diff --git a/docs/components/collapsible/assets/applyDemoCollapsibleStyles.js b/docs/components/collapsible/assets/applyDemoCollapsibleStyles.js
index d34334d2c..caba2de06 100644
--- a/docs/components/collapsible/assets/applyDemoCollapsibleStyles.js
+++ b/docs/components/collapsible/assets/applyDemoCollapsibleStyles.js
@@ -1,4 +1,4 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 const applyDemoCollapsibleStyles = () => {
   const demoCollapsibleStyles = css`
diff --git a/docs/components/collapsible/examples.md b/docs/components/collapsible/examples.md
index fb2752557..a0c42d608 100644
--- a/docs/components/collapsible/examples.md
+++ b/docs/components/collapsible/examples.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/collapsible/define';
-import '@lion/button/define';
+import '@lion/ui/define/lion-collapsible.js';
+import '@lion/ui/define/lion-button.js';
 import './assets/CustomCollapsible.js';
 import './assets/applyDemoCollapsibleStyles.js';
 ```
diff --git a/docs/components/collapsible/overview.md b/docs/components/collapsible/overview.md
index b1e45c141..60cd88cc5 100644
--- a/docs/components/collapsible/overview.md
+++ b/docs/components/collapsible/overview.md
@@ -4,7 +4,7 @@ A combination of a button (the invoker) and a chunk of 'extra content'. This web
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/collapsible/define';
+import '@lion/ui/define/lion-collapsible.js';
 ```
 
 ```js preview-story
@@ -29,11 +29,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/collapsible
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionCollapsible } from '@lion/collapsible';
+import { LionCollapsible } from '@lion/ui/collapsible.js';
 // or
-import '@lion/collapsible/define';
+import '@lion/ui/define/lion-collapsible.js';
 ```
diff --git a/docs/components/collapsible/use-cases.md b/docs/components/collapsible/use-cases.md
index 1f89ceeb0..554edf5e4 100644
--- a/docs/components/collapsible/use-cases.md
+++ b/docs/components/collapsible/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/collapsible/define';
+import '@lion/ui/define/lion-collapsible.js';
 ```
 
 ## Default open
diff --git a/docs/components/combobox/overview.md b/docs/components/combobox/overview.md
index e5f1ff26e..957b21646 100644
--- a/docs/components/combobox/overview.md
+++ b/docs/components/combobox/overview.md
@@ -15,8 +15,8 @@ availability of the pop-up.
 ```js script
 import { html } from '@mdjs/mdjs-preview';
 import { listboxData } from '../listbox/src/listboxData.js';
-import '@lion/listbox/define';
-import '@lion/combobox/define';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-option.js';
 import { lazyRender } from './src/lazyRender.js';
 ```
 
@@ -42,10 +42,10 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/combobox
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/combobox/define';
-import '@lion/listbox/lion-option.js';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-option.js';
 ```
diff --git a/docs/components/combobox/src/LinkMixin.js b/docs/components/combobox/src/LinkMixin.js
index 305abc5b5..99378104d 100644
--- a/docs/components/combobox/src/LinkMixin.js
+++ b/docs/components/combobox/src/LinkMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 /**
  * @typedef {import('lit-element').PropertyValues } changedProperties
diff --git a/docs/components/combobox/src/demo-selection-display.js b/docs/components/combobox/src/demo-selection-display.js
index 1ab2c09e8..0b16a9fed 100644
--- a/docs/components/combobox/src/demo-selection-display.js
+++ b/docs/components/combobox/src/demo-selection-display.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-import { LitElement, html, css, nothing } from '@lion/core';
+import { LitElement, html, css, nothing } from 'lit';
 
 /**
  * Disclaimer: this is just an example component demoing the selection display of LionCombobox
diff --git a/docs/components/combobox/src/gh-combobox/gh-button.js b/docs/components/combobox/src/gh-combobox/gh-button.js
index c90190b61..c24f2d33a 100644
--- a/docs/components/combobox/src/gh-combobox/gh-button.js
+++ b/docs/components/combobox/src/gh-combobox/gh-button.js
@@ -1,5 +1,5 @@
-import { css, html } from '@lion/core';
-import { LionButton } from '@lion/button';
+import { css, html } from 'lit';
+import { LionButton } from '@lion/ui/button.js';
 
 export class GhButton extends LionButton {
   static get properties() {
diff --git a/docs/components/combobox/src/gh-combobox/gh-combobox.js b/docs/components/combobox/src/gh-combobox/gh-combobox.js
index 0964f3c20..5b40a91f3 100644
--- a/docs/components/combobox/src/gh-combobox/gh-combobox.js
+++ b/docs/components/combobox/src/gh-combobox/gh-combobox.js
@@ -1,8 +1,8 @@
-import { css, html } from '@lion/core';
-import { LionOption } from '@lion/listbox';
-import { renderLitAsNode } from '@lion/helpers';
-// import { withModalDialogConfig } from '@lion/overlays';
-import { LionCombobox } from '@lion/combobox';
+import { css, html } from 'lit';
+import { LionOption } from '@lion/ui/listbox.js';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+// import { withModalDialogConfig } from '@lion/ui/overlays.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 import './gh-button.js';
 
 export class GhOption extends LionOption {
diff --git a/docs/components/combobox/src/google-combobox/assets/google-clear-icon.js b/docs/components/combobox/src/google-combobox/assets/google-clear-icon.js
index d31ec2637..af73cee2c 100644
--- a/docs/components/combobox/src/google-combobox/assets/google-clear-icon.js
+++ b/docs/components/combobox/src/google-combobox/assets/google-clear-icon.js
@@ -1,4 +1,4 @@
-import { html } from '@lion/core';
+import { html } from 'lit';
 
 export default html`
   <svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
diff --git a/docs/components/combobox/src/google-combobox/assets/google-search-icon.js b/docs/components/combobox/src/google-combobox/assets/google-search-icon.js
index 8ceaa571e..bd89b44dd 100644
--- a/docs/components/combobox/src/google-combobox/assets/google-search-icon.js
+++ b/docs/components/combobox/src/google-combobox/assets/google-search-icon.js
@@ -1,4 +1,4 @@
-import { html } from '@lion/core';
+import { html } from 'lit';
 
 export default html`
   <svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
diff --git a/docs/components/combobox/src/google-combobox/assets/google-voice-search-icon.js b/docs/components/combobox/src/google-combobox/assets/google-voice-search-icon.js
index c439b89c7..72bf95009 100644
--- a/docs/components/combobox/src/google-combobox/assets/google-voice-search-icon.js
+++ b/docs/components/combobox/src/google-combobox/assets/google-voice-search-icon.js
@@ -1,4 +1,4 @@
-import { html } from '@lion/core';
+import { html } from 'lit';
 
 export default html`
   <svg class="HPVvwb" focusable="false" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/docs/components/combobox/src/google-combobox/google-combobox.js b/docs/components/combobox/src/google-combobox/google-combobox.js
index 4d77a3ab4..4876b543f 100644
--- a/docs/components/combobox/src/google-combobox/google-combobox.js
+++ b/docs/components/combobox/src/google-combobox/google-combobox.js
@@ -1,7 +1,7 @@
-import { css, html } from '@lion/core';
-import { LionOption } from '@lion/listbox';
-import { renderLitAsNode } from '@lion/helpers';
-import { LionCombobox } from '@lion/combobox';
+import { css, html } from 'lit';
+import { LionOption } from '@lion/ui/listbox.js';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 import { LinkMixin } from '../LinkMixin.js';
 import googleSearchIcon from './assets/google-search-icon.js';
 import googleVoiceSearchIcon from './assets/google-voice-search-icon.js';
diff --git a/docs/components/combobox/src/md-combobox/MdFieldMixin.js b/docs/components/combobox/src/md-combobox/MdFieldMixin.js
index 7dd5586a5..1c813f9c9 100644
--- a/docs/components/combobox/src/md-combobox/MdFieldMixin.js
+++ b/docs/components/combobox/src/md-combobox/MdFieldMixin.js
@@ -1,4 +1,5 @@
-import { html, css, dedupeMixin } from '@lion/core';
+import { html, css } from 'lit';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 export const MdFieldMixin = dedupeMixin(
   superclass =>
diff --git a/docs/components/combobox/src/md-combobox/md-combobox.js b/docs/components/combobox/src/md-combobox/md-combobox.js
index 0b8bdbc3c..81250a5dd 100644
--- a/docs/components/combobox/src/md-combobox/md-combobox.js
+++ b/docs/components/combobox/src/md-combobox/md-combobox.js
@@ -1,6 +1,6 @@
-import { css, html } from '@lion/core';
-import { LionOption } from '@lion/listbox';
-import { LionCombobox } from '@lion/combobox';
+import { css, html } from 'lit';
+import { LionOption } from '@lion/ui/listbox.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 import { MdFieldMixin } from './MdFieldMixin.js';
 import './style/md-ripple.js';
 import './style/load-roboto.js';
diff --git a/docs/components/combobox/src/md-combobox/md-input.js b/docs/components/combobox/src/md-combobox/md-input.js
index 6ff5675b4..11e7648ec 100644
--- a/docs/components/combobox/src/md-combobox/md-input.js
+++ b/docs/components/combobox/src/md-combobox/md-input.js
@@ -1,4 +1,4 @@
-import { LionInput } from '@lion/input';
+import { LionInput } from '@lion/ui/input.js';
 import { MdFieldMixin } from './MdFieldMixin.js';
 
 export class MdInput extends MdFieldMixin(LionInput) {}
diff --git a/docs/components/combobox/src/md-combobox/style/md-ripple.js b/docs/components/combobox/src/md-combobox/style/md-ripple.js
index 3b175f24f..ea98f6ef0 100644
--- a/docs/components/combobox/src/md-combobox/style/md-ripple.js
+++ b/docs/components/combobox/src/md-combobox/style/md-ripple.js
@@ -1,4 +1,4 @@
-import { html, css, LitElement } from '@lion/core';
+import { html, css, LitElement } from 'lit';
 
 /**
  * Material Design Ripple Element
diff --git a/docs/components/combobox/src/wa-combobox/wa-combobox.js b/docs/components/combobox/src/wa-combobox/wa-combobox.js
index 43baf56a8..5c5ff4383 100644
--- a/docs/components/combobox/src/wa-combobox/wa-combobox.js
+++ b/docs/components/combobox/src/wa-combobox/wa-combobox.js
@@ -1,7 +1,7 @@
-import { html, css } from '@lion/core';
-import { renderLitAsNode } from '@lion/helpers';
-import { LionOption } from '@lion/listbox';
-import { LionCombobox } from '@lion/combobox';
+import { html, css } from 'lit';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+import { LionOption } from '@lion/ui/listbox.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 
 class WaOption extends LionOption {
   static get properties() {
diff --git a/docs/components/combobox/use-cases.md b/docs/components/combobox/use-cases.md
index 923f7b4d2..870eb507f 100644
--- a/docs/components/combobox/use-cases.md
+++ b/docs/components/combobox/use-cases.md
@@ -15,9 +15,9 @@ availability of the popup.
 ```js script
 import { LitElement, html, repeat } from '@mdjs/mdjs-preview';
 import { listboxData } from '../listbox/src/listboxData.js';
-import { LionCombobox } from '@lion/combobox';
-import '@lion/listbox/define';
-import '@lion/combobox/define';
+import { LionCombobox } from '@lion/ui/combobox.js';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-option.js';
 import './src/demo-selection-display.js';
 import { lazyRender } from './src/lazyRender.js';
 import levenshtein from './src/levenshtein.js';
diff --git a/docs/components/dialog/overview.md b/docs/components/dialog/overview.md
index 7ad20e8c4..34bf02e94 100644
--- a/docs/components/dialog/overview.md
+++ b/docs/components/dialog/overview.md
@@ -5,7 +5,7 @@ Its purpose is to make it easy to use our Overlay System declaratively.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
 
 import { demoStyle } from './src/demoStyle.js';
 ```
@@ -39,13 +39,13 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/dialog
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionDialog } from '@lion/dialog';
+import { LionDialog } from '@lion/ui/dialog.js';
 // or
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
 ```
 
 - Your `slot="content"` node will be moved to the global overlay container during initialization.
diff --git a/docs/components/dialog/src/demo-dialog-style.js b/docs/components/dialog/src/demo-dialog-style.js
index dc8f34cb7..33b081365 100644
--- a/docs/components/dialog/src/demo-dialog-style.js
+++ b/docs/components/dialog/src/demo-dialog-style.js
@@ -1,3 +1,3 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 export default css``;
diff --git a/docs/components/dialog/src/demoStyle.js b/docs/components/dialog/src/demoStyle.js
index 1a477caee..0be789d4d 100644
--- a/docs/components/dialog/src/demoStyle.js
+++ b/docs/components/dialog/src/demoStyle.js
@@ -1,4 +1,4 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 export const demoStyle = css`
   .demo-box {
diff --git a/docs/components/dialog/src/slots-dialog-content.js b/docs/components/dialog/src/slots-dialog-content.js
index ea7224cec..6b481427d 100644
--- a/docs/components/dialog/src/slots-dialog-content.js
+++ b/docs/components/dialog/src/slots-dialog-content.js
@@ -1,4 +1,4 @@
-import { LitElement, html, css } from '@lion/core';
+import { LitElement, html, css } from 'lit';
 
 class SlotsDialogContent extends LitElement {
   static get styles() {
diff --git a/docs/components/dialog/src/styled-dialog-content.js b/docs/components/dialog/src/styled-dialog-content.js
index 13d480123..799dae2e8 100644
--- a/docs/components/dialog/src/styled-dialog-content.js
+++ b/docs/components/dialog/src/styled-dialog-content.js
@@ -1,4 +1,4 @@
-import { LitElement, html, css } from '@lion/core';
+import { LitElement, html, css } from 'lit';
 
 class StyledDialogContent extends LitElement {
   static get styles() {
diff --git a/docs/components/dialog/use-cases.md b/docs/components/dialog/use-cases.md
index 71b6b7d86..eef2dd85d 100644
--- a/docs/components/dialog/use-cases.md
+++ b/docs/components/dialog/use-cases.md
@@ -5,7 +5,7 @@ Its purpose is to make it easy to use our Overlay System declaratively.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
 
 import { demoStyle } from './src/demoStyle.js';
 import './src/styled-dialog-content.js';
diff --git a/docs/components/fieldset/overview.md b/docs/components/fieldset/overview.md
index 988ae03a4..d835cf0cf 100644
--- a/docs/components/fieldset/overview.md
+++ b/docs/components/fieldset/overview.md
@@ -3,8 +3,8 @@
 ```js script
 import { html } from '@mdjs/mdjs-preview';
 
-import '@lion/input/define';
-import '@lion/fieldset/define';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-fieldset.js';
 ```
 
 A web component that can be used to group multiple input fields or other fieldsets together.
@@ -39,11 +39,11 @@ Our fieldset instead has a label attribute or you can add a label with a div- or
 ## Installation
 
 ```bash
-npm i --save @lion/fieldset
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionFieldset } from '@lion/fieldset';
+import { LionFieldset } from '@lion/ui/fieldset.js';
 // or
-import '@lion/fieldset/define';
+import '@lion/ui/define/lion-fieldset.js';
 ```
diff --git a/docs/components/fieldset/use-cases.md b/docs/components/fieldset/use-cases.md
index 9d2d966e8..ca8428153 100644
--- a/docs/components/fieldset/use-cases.md
+++ b/docs/components/fieldset/use-cases.md
@@ -2,12 +2,12 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { localize } from '@lion/localize';
-import { MinLength, Validator, Required } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { localize } from '@lion/ui/localize.js';
+import { MinLength, Validator, Required } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 
-import '@lion/input/define';
-import '@lion/fieldset/define';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-fieldset.js';
 ```
 
 ## With Data
diff --git a/docs/components/form/overview.md b/docs/components/form/overview.md
index a3460da8b..02225f2ae 100644
--- a/docs/components/form/overview.md
+++ b/docs/components/form/overview.md
@@ -3,8 +3,8 @@
 ```js script
 import { html } from '@mdjs/mdjs-preview';
 
-import '@lion/input/define';
-import '@lion/form/define';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-form.js';
 ```
 
 A web component that enhances the functionality of the native `form` component.
@@ -35,9 +35,9 @@ For more information about fields that are designed for our `form`, please read
 ## Installation
 
 ```bash
-npm i --save @lion/form
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/form/define';
+import '@lion/ui/define/lion-form.js';
 ```
diff --git a/docs/components/form/use-cases.md b/docs/components/form/use-cases.md
index 4c3d706ee..da031a593 100644
--- a/docs/components/form/use-cases.md
+++ b/docs/components/form/use-cases.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { Required } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import '@lion/input/define';
-import '@lion/form/define';
+import { Required } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-form.js';
 ```
 
 ## Submit & Reset
diff --git a/docs/components/icon/overview.md b/docs/components/icon/overview.md
index a0c91e599..9a348a70c 100644
--- a/docs/components/icon/overview.md
+++ b/docs/components/icon/overview.md
@@ -4,8 +4,8 @@ A web component for displaying icons.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { icons } from '@lion/icon';
-import '@lion/icon/define';
+import { icons } from '@lion/ui/icon.js';
+import '@lion/ui/define/lion-icon.js';
 
 icons.addIconResolver('lion', (iconset, name) => {
   switch (iconset) {
@@ -30,11 +30,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/icon
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionIcon } from '@lion/icon';
+import { LionIcon } from '@lion/ui/icon.js';
 // or
-import '@lion/icon/define';
+import '@lion/ui/define/lion-icon.js';
 ```
diff --git a/docs/components/icon/use-cases.md b/docs/components/icon/use-cases.md
index 984562570..bb76ef702 100644
--- a/docs/components/icon/use-cases.md
+++ b/docs/components/icon/use-cases.md
@@ -2,12 +2,12 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { icons } from '@lion/icon';
+import { icons } from '@lion/ui/icon.js';
 import './assets/iconset-bugs.js';
 import './assets/iconset-misc.js';
 import * as spaceSet from './assets/iconset-space.js';
 
-import '@lion/icon/define';
+import '@lion/ui/define/lion-icon.js';
 
 icons.addIconResolver('lion', (iconset, name) => {
   switch (iconset) {
diff --git a/docs/components/input-amount/overview.md b/docs/components/input-amount/overview.md
index b30c6a6e5..158121389 100644
--- a/docs/components/input-amount/overview.md
+++ b/docs/components/input-amount/overview.md
@@ -11,7 +11,7 @@ If there are no valid characters in the input whatsoever, it will provide an err
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-amount/define';
+import '@lion/ui/define/lion-input-amount.js';
 ```
 
 ```js preview-story
@@ -39,11 +39,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-amount
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputAmount } from '@lion/input-amount';
+import { LionInputAmount } from '@lion/ui/input-amount.js';
 // or
-import '@lion/input-amount/define';
+import '@lion/ui/define/lion-input-amount.js';
 ```
diff --git a/docs/components/input-amount/use-cases.md b/docs/components/input-amount/use-cases.md
index 83f3a0945..232495304 100644
--- a/docs/components/input-amount/use-cases.md
+++ b/docs/components/input-amount/use-cases.md
@@ -2,12 +2,12 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { MaxLength } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { MaxLength } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 
-import '@lion/input-amount/define';
+import '@lion/ui/define/lion-input-amount.js';
 ```
 
 ## Negative Number
@@ -61,7 +61,7 @@ Separator characters include:
 - , (comma)
 
 ```js preview-story
-import { preprocessAmount } from '@lion/input-amount';
+import { preprocessAmount } from '@lion/ui/input-amount.js';
 
 export const forceDigits = () => html`
   <lion-input-amount label="Amount" .preprocessor=${preprocessAmount}></lion-input-amount>
diff --git a/docs/components/input-date/overview.md b/docs/components/input-date/overview.md
index abcf96e0d..cac209771 100644
--- a/docs/components/input-date/overview.md
+++ b/docs/components/input-date/overview.md
@@ -4,10 +4,10 @@ A web component based on the generic text input field. Its purpose is to provide
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { MinDate, MinMaxDate, MaxDate } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { formatDate } from '@lion/localize';
-import '@lion/input-date/define';
+import { MinDate, MinMaxDate, MaxDate } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { formatDate } from '@lion/ui/localize.js';
+import '@lion/ui/define/lion-input-date.js';
 ```
 
 ```js preview-story
@@ -29,11 +29,11 @@ export const main = () => html` <lion-input-date label="Date"></lion-input-date>
 ## Installation
 
 ```bash
-npm i --save @lion/input-date
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputDate } from '@lion/input-date';
+import { LionInputDate } from '@lion/ui/input-date.js';
 // or
-import '@lion/input-date/define';
+import '@lion/ui/define/lion-input-date.js';
 ```
diff --git a/docs/components/input-date/use-cases.md b/docs/components/input-date/use-cases.md
index 7b215c80a..6fc04b327 100644
--- a/docs/components/input-date/use-cases.md
+++ b/docs/components/input-date/use-cases.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { MinDate, MinMaxDate, MaxDate } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { formatDate } from '@lion/localize';
-import '@lion/input-date/define';
+import { MinDate, MinMaxDate, MaxDate } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { formatDate } from '@lion/ui/localize.js';
+import '@lion/ui/define/lion-input-date.js';
 ```
 
 ## Is a date
diff --git a/docs/components/input-datepicker/overview.md b/docs/components/input-datepicker/overview.md
index 674f8ce34..4a2607b92 100644
--- a/docs/components/input-datepicker/overview.md
+++ b/docs/components/input-datepicker/overview.md
@@ -6,7 +6,7 @@ We encourage using our standard [input-date](../input-date/overview.md) for this
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-datepicker/define';
+import '@lion/ui/define/lion-input-datepicker.js';
 ```
 
 ```js preview-story
@@ -32,11 +32,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-datepicker
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputDatepicker } from '@lion/input-datepicker';
+import { LionInputDatepicker } from '@lion/ui/input-datepicker.js';
 // or
-import '@lion/input-datepicker/define';
+import '@lion/ui/define/lion-input-datepicker.js';
 ```
diff --git a/docs/components/input-datepicker/use-cases.md b/docs/components/input-datepicker/use-cases.md
index 90e306fb4..f968371ac 100644
--- a/docs/components/input-datepicker/use-cases.md
+++ b/docs/components/input-datepicker/use-cases.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { MinMaxDate, IsDateDisabled } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { formatDate } from '@lion/localize';
-import '@lion/input-datepicker/define';
+import { MinMaxDate, IsDateDisabled } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { formatDate } from '@lion/ui/localize.js';
+import '@lion/ui/define/lion-input-datepicker.js';
 ```
 
 ## Minimum and maximum date
diff --git a/docs/components/input-email/overview.md b/docs/components/input-email/overview.md
index 0ab225aa7..54ced4708 100644
--- a/docs/components/input-email/overview.md
+++ b/docs/components/input-email/overview.md
@@ -4,7 +4,7 @@ A web component based on the generic text input field. Its purpose is to provide
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-email/define';
+import '@lion/ui/define/lion-input-email.js';
 ```
 
 ```js preview-story
@@ -22,11 +22,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-email
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputEmail } from '@lion/input-email';
+import { LionInputEmail } from '@lion/ui/input-email.js';
 // or
-import '@lion/input-email/define';
+import '@lion/ui/define/lion-input-email.js';
 ```
diff --git a/docs/components/input-email/use-cases.md b/docs/components/input-email/use-cases.md
index a295f905f..5f98e8d79 100644
--- a/docs/components/input-email/use-cases.md
+++ b/docs/components/input-email/use-cases.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { Validator } from '@lion/form-core';
-import '@lion/input-email/define';
+import { Validator } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-input-email.js';
 ```
 
 ## Faulty Prefilled
diff --git a/docs/components/input-iban/overview.md b/docs/components/input-iban/overview.md
index 1e712699d..e76a2e6da 100644
--- a/docs/components/input-iban/overview.md
+++ b/docs/components/input-iban/overview.md
@@ -5,7 +5,7 @@ Its purpose is to provide a way for users to fill in an IBAN (International Bank
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-iban/define';
+import '@lion/ui/define/lion-input-iban.js';
 ```
 
 ```js preview-story
@@ -27,11 +27,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-amount
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputIban } from '@lion/input-iban';
+import { LionInputIban } from '@lion/ui/input-iban.js';
 // or
-import '@lion/input-amount/define';
+import '@lion/ui/define/lion-input-amount.js';
 ```
diff --git a/docs/components/input-iban/use-cases.md b/docs/components/input-iban/use-cases.md
index 0af5e555f..786b6df41 100644
--- a/docs/components/input-iban/use-cases.md
+++ b/docs/components/input-iban/use-cases.md
@@ -2,9 +2,9 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { IsCountryIBAN, IsNotCountryIBAN } from '@lion/input-iban';
-import '@lion/input-iban/define';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { IsCountryIBAN, IsNotCountryIBAN } from '@lion/ui/input-iban.js';
+import '@lion/ui/define/lion-input-iban.js';
 ```
 
 ## Prefilled
diff --git a/docs/components/input-range/overview.md b/docs/components/input-range/overview.md
index 225d32949..fc6a4f0e6 100644
--- a/docs/components/input-range/overview.md
+++ b/docs/components/input-range/overview.md
@@ -4,7 +4,7 @@ A web component based on the native range input. Its purpose is to provide a way
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-range/define';
+import '@lion/ui/define/lion-input-range.js';
 ```
 
 ```js preview-story
@@ -24,11 +24,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/input-range
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputRange } from '@lion/input-range';
+import { LionInputRange } from '@lion/ui/input-range.js';
 // or
-import '@lion/input-range/define';
+import '@lion/ui/define/lion-input-range.js';
 ```
diff --git a/docs/components/input-range/use-cases.md b/docs/components/input-range/use-cases.md
index 012be82d0..4bd92f233 100644
--- a/docs/components/input-range/use-cases.md
+++ b/docs/components/input-range/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-range/define';
+import '@lion/ui/define/lion-input-range.js';
 ```
 
 ## Units
diff --git a/docs/components/input-stepper/overview.md b/docs/components/input-stepper/overview.md
index 219967edf..a6e7b6794 100644
--- a/docs/components/input-stepper/overview.md
+++ b/docs/components/input-stepper/overview.md
@@ -4,7 +4,7 @@ A web component that enables the user to increase and decrease a numeric value b
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-stepper/define';
+import '@lion/ui/define/lion-input-stepper.js';
 ```
 
 ```js preview-story
@@ -26,11 +26,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/input-stepper
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputStepper } from '@lion/input-stepper';
+import { LionInputStepper } from '@lion/ui/input-stepper.js';
 // or
-import '@lion/input-stepper/define';
+import '@lion/ui/define/lion-input-stepper.js';
 ```
diff --git a/docs/components/input-stepper/use-cases.md b/docs/components/input-stepper/use-cases.md
index ad3afd76f..fa739ad25 100644
--- a/docs/components/input-stepper/use-cases.md
+++ b/docs/components/input-stepper/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-stepper/define';
+import '@lion/ui/define/lion-input-stepper.js';
 ```
 
 ## Default with no specification
diff --git a/docs/components/input-tel-dropdown/examples.md b/docs/components/input-tel-dropdown/examples.md
index 04c013249..3413eb696 100644
--- a/docs/components/input-tel-dropdown/examples.md
+++ b/docs/components/input-tel-dropdown/examples.md
@@ -2,9 +2,9 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/select-rich/define';
+import '@lion/ui/define/lion-select-rich.js';
 import './src/intl-input-tel-dropdown.js';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 ```
 
 ## Input Tel International
diff --git a/docs/components/input-tel-dropdown/overview.md b/docs/components/input-tel-dropdown/overview.md
index 79e89adcc..d7b766519 100644
--- a/docs/components/input-tel-dropdown/overview.md
+++ b/docs/components/input-tel-dropdown/overview.md
@@ -4,8 +4,8 @@ Extension of Input Tel that prefixes a dropdown list that shows all possible reg
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-tel-dropdown/define';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 ```
 
 ```js preview-story
@@ -28,11 +28,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-tel-dropdown
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputTelDropdown } from '@lion/input-tel-dropdown';
+import { LionInputTelDropdown } from '@lion/ui/input-tel-dropdown.js';
 // or
-import '@lion/input-tel-dropdown/define';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
 ```
diff --git a/docs/components/input-tel-dropdown/src/intl-input-tel-dropdown.js b/docs/components/input-tel-dropdown/src/intl-input-tel-dropdown.js
index 08bdefb21..771d7d8ac 100644
--- a/docs/components/input-tel-dropdown/src/intl-input-tel-dropdown.js
+++ b/docs/components/input-tel-dropdown/src/intl-input-tel-dropdown.js
@@ -1,5 +1,8 @@
-import { html, css, ScopedElementsMixin, ref, repeat } from '@lion/core';
-import { LionInputTelDropdown } from '@lion/input-tel-dropdown';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { html, css } from 'lit';
+import { ref } from 'lit/directives/ref.js';
+import { repeat } from 'lit/directives/repeat.js';
+import { LionInputTelDropdown } from '@lion/ui/input-tel-dropdown.js';
 import {
   IntlSelectRich,
   IntlOption,
@@ -7,7 +10,7 @@ import {
 } from '../../select-rich/src/intl-select-rich.js';
 
 /**
- * @typedef {import('@lion/input-tel-dropdown/types').TemplateDataForDropdownInputTel}TemplateDataForDropdownInputTel
+ * @typedef {import('@lion/ui/input-tel-dropdown/types.js').TemplateDataForDropdownInputTel}TemplateDataForDropdownInputTel
  */
 
 // Example implementation for https://intl-tel-input.com/
diff --git a/docs/components/input-tel-dropdown/use-cases.md b/docs/components/input-tel-dropdown/use-cases.md
index 70feaed1e..32013d136 100644
--- a/docs/components/input-tel-dropdown/use-cases.md
+++ b/docs/components/input-tel-dropdown/use-cases.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { ref, createRef } from '@lion/core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { PhoneUtilManager } from '@lion/input-tel';
-import '@lion/input-tel-dropdown/define';
+import { ref, createRef } from 'lit/directives/ref.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
 import '../../../docs/fundamentals/systems/form/assets/h-output.js';
 
 // TODO: make each example load/use the dependencies by default
diff --git a/docs/components/input-tel/overview.md b/docs/components/input-tel/overview.md
index c62780c1f..bf91a90a5 100644
--- a/docs/components/input-tel/overview.md
+++ b/docs/components/input-tel/overview.md
@@ -4,10 +4,11 @@ Input field for entering phone numbers, including validation, formatting and mob
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { ref, createRef } from '@lion/core';
-import { PhoneUtilManager } from '@lion/input-tel';
-import '@lion/input-tel/define';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { ref, createRef } from 'lit/directives/ref.js';
+
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
+import '@lion/ui/define/lion-input-tel.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 import '../../../docs/fundamentals/systems/form/assets/h-output.js';
 ```
 
@@ -51,11 +52,11 @@ export const main = () => {
 ## Installation
 
 ```bash
-npm i --save @lion/input-tel
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionInputTel } from '@lion/input-tel';
+import { LionInputTel } from '@lion/ui/input-tel.js';
 // or
-import '@lion/input-tel/define';
+import '@lion/ui/define/lion-input-tel.js';
 ```
diff --git a/docs/components/input-tel/src/h-region-code-table.js b/docs/components/input-tel/src/h-region-code-table.js
index 84c348a00..bffe63d2e 100644
--- a/docs/components/input-tel/src/h-region-code-table.js
+++ b/docs/components/input-tel/src/h-region-code-table.js
@@ -1,4 +1,6 @@
-import { LitElement, css, html, repeat, ScopedStylesController } from '@lion/core';
+import { LitElement, css, html } from 'lit';
+import { repeat } from 'lit/directives/repeat.js';
+import { ScopedStylesController } from '@lion/ui/core.js';
 import { regionMetaList } from '../../select-rich/src/regionMetaList.js';
 
 export class HRegionCodeTable extends LitElement {
diff --git a/docs/components/input-tel/use-cases.md b/docs/components/input-tel/use-cases.md
index dfd88b138..488c5dec5 100644
--- a/docs/components/input-tel/use-cases.md
+++ b/docs/components/input-tel/use-cases.md
@@ -2,12 +2,12 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { ref, createRef } from '@lion/core';
-import { Unparseable } from '@lion/form-core';
-import { localize } from '@lion/localize';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { PhoneUtilManager } from '@lion/input-tel';
-import '@lion/input-tel/define';
+import { ref, createRef } from 'lit/directives/ref.js';
+import { Unparseable } from '@lion/ui/form-core.js';
+import { localize } from '@lion/ui/localize.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
+import '@lion/ui/define/lion-input-tel.js';
 import './src/h-region-code-table.js';
 import '../../../docs/fundamentals/systems/form/assets/h-output.js';
 
diff --git a/docs/components/input/overview.md b/docs/components/input/overview.md
index 5d6583336..d26208bb0 100644
--- a/docs/components/input/overview.md
+++ b/docs/components/input/overview.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input/define';
+import '@lion/ui/define/lion-input.js';
 ```
 
 A web component that enhances the functionality of the native `<input>` element.
@@ -28,9 +28,9 @@ export const main = () => html`<lion-input label="First Name"></lion-input>`;
 ## Installation
 
 ```bash
-npm i --save @lion/input
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/input/define';
+import '@lion/ui/define/lion-input.js';
 ```
diff --git a/docs/components/input/use-cases.md b/docs/components/input/use-cases.md
index 9fd4d3102..613faa79a 100644
--- a/docs/components/input/use-cases.md
+++ b/docs/components/input/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input/define';
+import '@lion/ui/define/lion-input.js';
 ```
 
 ## Label
diff --git a/docs/components/listbox/overview.md b/docs/components/listbox/overview.md
index b9544168c..3708b2a62 100644
--- a/docs/components/listbox/overview.md
+++ b/docs/components/listbox/overview.md
@@ -8,7 +8,8 @@ multiple options to be selected is a `multi-select listbox`.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/listbox/define';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
 ```
 
 ```js preview-story
@@ -32,9 +33,10 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/listbox
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/listbox/define';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
 ```
diff --git a/docs/components/listbox/use-cases.md b/docs/components/listbox/use-cases.md
index 03bde9342..ee79f4215 100644
--- a/docs/components/listbox/use-cases.md
+++ b/docs/components/listbox/use-cases.md
@@ -3,7 +3,8 @@
 ```js script
 import { html } from '@mdjs/mdjs-preview';
 import { listboxData } from './src/listboxData.js';
-import '@lion/listbox/define';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
 ```
 
 ## Multiple choice
diff --git a/docs/components/pagination/overview.md b/docs/components/pagination/overview.md
index 1d4ed74d3..d59a42d5e 100644
--- a/docs/components/pagination/overview.md
+++ b/docs/components/pagination/overview.md
@@ -4,7 +4,7 @@ A web component that handles pagination.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/pagination/define';
+import '@lion/ui/define/lion-pagination.js';
 ```
 
 ```js preview-story
@@ -19,11 +19,11 @@ export const main = () => html` <lion-pagination count="20" current="10"></lion-
 ## Installation
 
 ```bash
-npm i --save @lion/pagination
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionPagination } from '@lion/pagination';
+import { LionPagination } from '@lion/ui/pagination.js';
 // or
-import '@lion/pagination/define';
+import '@lion/ui/define/lion-pagination.js';
 ```
diff --git a/docs/components/pagination/use-cases.md b/docs/components/pagination/use-cases.md
index e4ab98bc5..c917b2c56 100644
--- a/docs/components/pagination/use-cases.md
+++ b/docs/components/pagination/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/pagination/define';
+import '@lion/ui/define/lion-pagination.js';
 ```
 
 ## Without current defined
diff --git a/docs/components/progress-indicator/assets/my-determinate-progress-bar.js b/docs/components/progress-indicator/assets/my-determinate-progress-bar.js
index 1eff1d4e9..01c7da840 100644
--- a/docs/components/progress-indicator/assets/my-determinate-progress-bar.js
+++ b/docs/components/progress-indicator/assets/my-determinate-progress-bar.js
@@ -1,5 +1,5 @@
-import { css, html } from '@lion/core';
-import { LionProgressIndicator } from '@lion/progress-indicator';
+import { css, html } from 'lit';
+import { LionProgressIndicator } from '@lion/ui/progress-indicator.js';
 
 export class MyDeterminateProgressBar extends LionProgressIndicator {
   static get styles() {
diff --git a/docs/components/progress-indicator/assets/my-indeterminate-progress-spinner.js b/docs/components/progress-indicator/assets/my-indeterminate-progress-spinner.js
index f28930bdb..2c78b87b7 100644
--- a/docs/components/progress-indicator/assets/my-indeterminate-progress-spinner.js
+++ b/docs/components/progress-indicator/assets/my-indeterminate-progress-spinner.js
@@ -1,5 +1,5 @@
-import { html, css } from '@lion/core';
-import { LionProgressIndicator } from '@lion/progress-indicator';
+import { html, css } from 'lit';
+import { LionProgressIndicator } from '@lion/ui/progress-indicator.js';
 
 export class MyIndeterminateProgressSpinner extends LionProgressIndicator {
   static get styles() {
diff --git a/docs/components/progress-indicator/examples.md b/docs/components/progress-indicator/examples.md
index 4d5bcdfc3..1f91a1517 100644
--- a/docs/components/progress-indicator/examples.md
+++ b/docs/components/progress-indicator/examples.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/progress-indicator/define';
+import '@lion/ui/define/lion-progress-indicator.js';
 import './assets/my-indeterminate-progress-spinner.js';
 import './assets/my-determinate-progress-bar.js';
 
diff --git a/docs/components/progress-indicator/overview.md b/docs/components/progress-indicator/overview.md
index 93eefcd9b..d91926330 100644
--- a/docs/components/progress-indicator/overview.md
+++ b/docs/components/progress-indicator/overview.md
@@ -4,7 +4,7 @@ A web component that implements accessibility requirements for progress indicato
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/progress-indicator/define';
+import '@lion/ui/define/lion-progress-indicator.js';
 ```
 
 ```html
@@ -26,11 +26,11 @@ This component is designed to be extended in order to add visuals.
 ## Installation
 
 ```bash
-npm i --save @lion/progress-indicator
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionProgressIndicator } from '@lion/progress-indicator';
+import { LionProgressIndicator } from '@lion/ui/progress-indicator.js';
 // or
-import '@lion/progress-indicator/define';
+import '@lion/ui/define/lion-progress-indicator.js';
 ```
diff --git a/docs/components/radio-group/overview.md b/docs/components/radio-group/overview.md
index 742093bfb..761d6e593 100644
--- a/docs/components/radio-group/overview.md
+++ b/docs/components/radio-group/overview.md
@@ -6,7 +6,8 @@ You should use our `radio` inside this element.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/radio-group/define';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
 ```
 
 ```js preview-story
@@ -34,11 +35,12 @@ Since it extends from our [fieldset](../fieldset/overview.md), it has all the fe
 ## Installation
 
 ```bash
-npm i --save @lion/radio-group
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionRadioGroup, LionRadio } from '@lion/radio-group';
+import { LionRadioGroup, LionRadio } from '@lion/ui/radio-group.js';
 // or
-import '@lion/radio-group/define';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
 ```
diff --git a/docs/components/radio-group/use-cases.md b/docs/components/radio-group/use-cases.md
index 27c3bc845..732320ada 100644
--- a/docs/components/radio-group/use-cases.md
+++ b/docs/components/radio-group/use-cases.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/radio-group/define';
-import '@lion/radio-group/define';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
 ```
 
 ## Model value
diff --git a/docs/components/select-rich/examples.md b/docs/components/select-rich/examples.md
index 89425a4b6..02c27e25c 100644
--- a/docs/components/select-rich/examples.md
+++ b/docs/components/select-rich/examples.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { repeat } from '@lion/core';
-import '@lion/select-rich/define';
+import { repeat } from 'lit/directives/repeat.js';
+import '@lion/ui/define/lion-select-rich.js';
 import './src/intl-select-rich.js';
 import { regionMetaList } from './src/regionMetaList.js';
 ```
diff --git a/docs/components/select-rich/overview.md b/docs/components/select-rich/overview.md
index eee1f5df1..2573acd57 100644
--- a/docs/components/select-rich/overview.md
+++ b/docs/components/select-rich/overview.md
@@ -9,8 +9,8 @@ Its implementation is based on the following Design pattern:
 
 ```js script
 import { LitElement, html } from '@mdjs/mdjs-preview';
-import '@lion/listbox/define';
-import '@lion/select-rich/define';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-option.js';
 ```
 
 ```js preview-story
@@ -34,14 +34,13 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/select-rich
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionSelectRich, LionOptions, LionOption } from '@lion/select-rich';
+import { LionSelectRich } from '@lion/ui/select-rich.js';
+import { LionOptions, LionOption } from '@lion/ui/listbox.js';
 // or
-import '@lion/select-rich/define';
-import '@lion/listbox/define';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-option.js';
 ```
-
-> No need to npm install `@lion/option` separately, it comes with the rich select as a dependency
diff --git a/docs/components/select-rich/src/flagStyles.js b/docs/components/select-rich/src/flagStyles.js
index 03632c6fb..51bcbfa41 100644
--- a/docs/components/select-rich/src/flagStyles.js
+++ b/docs/components/select-rich/src/flagStyles.js
@@ -1,4 +1,4 @@
-import { css, unsafeCSS } from '@lion/core';
+import { css, unsafeCSS } from 'lit';
 
 const flagsImgUrl = unsafeCSS(new URL('./flags.png', import.meta.url).href);
 const flagsImg2xUrl = unsafeCSS(new URL('./flags@2x.png', import.meta.url).href);
diff --git a/docs/components/select-rich/src/intl-select-rich.js b/docs/components/select-rich/src/intl-select-rich.js
index 699f1247b..e6bb088cf 100644
--- a/docs/components/select-rich/src/intl-select-rich.js
+++ b/docs/components/select-rich/src/intl-select-rich.js
@@ -1,11 +1,12 @@
-import { html, css, LitElement } from '@lion/core';
-import { LionSelectRich, LionOption, LionSelectInvoker } from '@lion/select-rich';
+import { html, css, LitElement } from 'lit';
+import { LionSelectRich, LionSelectInvoker } from '@lion/ui/select-rich.js';
+import { LionOption } from '@lion/ui/listbox.js';
 import { flagStyles } from './flagStyles.js';
 
 /**
- * @typedef {import('@lion/core').RenderOptions} RenderOptions
- * @typedef {import('@lion/input-tel/types/types').RegionAndCountryCode} RegionAndCountryCode
- * @typedef {import('@lion/input-tel/types/types').TemplateDataForDropdownInputTel} TemplateDataForDropdownInputTel
+ * @typedef {import('@lion/ui/core.js').RenderOptions} RenderOptions
+ * @typedef {import('@lion/ui/input-tel/types/types.js').RegionAndCountryCode} RegionAndCountryCode
+ * @typedef {import('@lion/ui/input-tel/types/types.js').TemplateDataForDropdownInputTel} TemplateDataForDropdownInputTel
  * @typedef {{countryCode: string; regionCode: string; nameForRegion: string; nameForLocale: string}} RegionMetaList
  * @typedef {TemplateDataForDropdownInputTel & {data: {regionMetaList:RegionMetaList}}} TemplateDataForIntlInputTel
  */
diff --git a/docs/components/select-rich/use-cases.md b/docs/components/select-rich/use-cases.md
index 7f64fc5fa..c8674af5e 100644
--- a/docs/components/select-rich/use-cases.md
+++ b/docs/components/select-rich/use-cases.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { LitElement, html } from '@mdjs/mdjs-preview';
-import '@lion/listbox/define';
-import '@lion/select-rich/define';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-option.js';
 ```
 
 ## Model value
@@ -324,7 +324,7 @@ by putting it in light dom:
 ```
 
 ```js
-import { LionSelectInvoker } from '@lion/select-rich';
+import { LionSelectInvoker } from '@lion/ui/select-rich.js';
 
 class IntlSelectInvoker extends LionSelectInvoker {
   /**
diff --git a/docs/components/select/overview.md b/docs/components/select/overview.md
index 7a97bc0bc..8b7278551 100644
--- a/docs/components/select/overview.md
+++ b/docs/components/select/overview.md
@@ -7,7 +7,7 @@ Sets of options where each option name starts with the same word or phrase can a
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/select/define';
+import '@lion/ui/define/lion-select.js';
 ```
 
 ```js preview-story
@@ -34,11 +34,11 @@ For most other form elements we do this for you, because there's no need to put
 ## Installation
 
 ```bash
-npm i --save @lion/select
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionSelect } from '@lion/select';
+import { LionSelect } from '@lion/ui/select.js';
 // or
-import '@lion/select/define';
+import '@lion/ui/define/lion-select.js';
 ```
diff --git a/docs/components/select/use-cases.md b/docs/components/select/use-cases.md
index bd1fc3d4c..7f4592105 100644
--- a/docs/components/select/use-cases.md
+++ b/docs/components/select/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/select/define';
+import '@lion/ui/define/lion-select.js';
 ```
 
 ## Pre-select
diff --git a/docs/components/steps/overview.md b/docs/components/steps/overview.md
index 3ceb6fa60..23952ea33 100644
--- a/docs/components/steps/overview.md
+++ b/docs/components/steps/overview.md
@@ -4,7 +4,8 @@ A web component that can be used to break a single goal down into dependable sub
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/steps/define';
+import '@lion/ui/define/lion-steps.js';
+import '@lion/ui/define/lion-step.js';
 ```
 
 ```js preview-story
@@ -51,11 +52,12 @@ In many application you build multi-step workflows like multi-step forms where y
 ## Installation
 
 ```bash
-npm i --save @lion/steps
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionSteps, LionStep } from '@lion/steps';
+import { LionSteps, LionStep } from '@lion/ui/steps.js';
 // or
-import '@lion/steps/define';
+import '@lion/ui/define/lion-steps.js';
+import '@lion/ui/define/lion-step.js';
 ```
diff --git a/docs/components/steps/use-cases.md b/docs/components/steps/use-cases.md
index 748e0e833..e3fa66568 100644
--- a/docs/components/steps/use-cases.md
+++ b/docs/components/steps/use-cases.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/steps/define';
-import '@lion/steps/define';
+import '@lion/ui/define/lion-steps.js';
+import '@lion/ui/define/lion-step.js';
 ```
 
 ```js preview-story
diff --git a/docs/components/switch/overview.md b/docs/components/switch/overview.md
index 864d7503c..1ab3e80e2 100644
--- a/docs/components/switch/overview.md
+++ b/docs/components/switch/overview.md
@@ -4,12 +4,13 @@
 
 ```js script
 import { html as previewHtml } from '@mdjs/mdjs-preview';
-import '@lion/switch/define-switch';
+import '@lion/ui/define/lion-switch.js';
 ```
 
 ```js preview-story
-import { html, LitElement, ScopedElementsMixin } from '@lion/core';
-import { LionSwitch } from '@lion/switch';
+import { html, LitElement } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { LionSwitch } from '@lion/ui/switch.js';
 
 class MyComponent extends ScopedElementsMixin(LitElement) {
   static get scopedElements() {
@@ -43,14 +44,15 @@ export const main = () => previewHtml`<my-component></my-component>`;
 1. Install
 
 ```bash
-npm i --save @lion/switch
+npm i --save @lion/ui
 ```
 
 2. Use scoped registry
 
 ```js
-import { html, LitElement, ScopedElementsMixin } from '@lion/core';
-import { LionSwitch } from '@lion/switch';
+import { html, LitElement } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { LionSwitch } from '@lion/ui/switch.js';
 
 class MyComponent extends ScopedElementsMixin(LitElement) {
   static get scopedElements() {
@@ -66,7 +68,7 @@ class MyComponent extends ScopedElementsMixin(LitElement) {
 
 ```html
 <script type="module">
-  import '@lion/switch/define-switch';
+  import '@lion/ui/define/lion-switch.js';
 </script>
 
 <lion-switch></lion-switch>
diff --git a/docs/components/switch/use-cases.md b/docs/components/switch/use-cases.md
index c33bea2c8..e1dd92ead 100644
--- a/docs/components/switch/use-cases.md
+++ b/docs/components/switch/use-cases.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { Validator } from '@lion/form-core';
-import { LionSwitch } from '@lion/switch';
-import '@lion/switch/define';
-import '@lion/helpers/define-sb-action-logger';
+import { Validator } from '@lion/ui/form-core.js';
+import { LionSwitch } from '@lion/ui/switch.js';
+import '@lion/ui/define/lion-switch.js';
+import '@lion/ui/define-helpers/sb-action-logger.js';
 ```
 
 ## Disabled
diff --git a/docs/components/tabs/overview.md b/docs/components/tabs/overview.md
index 1b00680d0..a4a38e730 100644
--- a/docs/components/tabs/overview.md
+++ b/docs/components/tabs/overview.md
@@ -4,7 +4,7 @@ A web component that allows users to quickly move between a small number of equa
 
 ```js script
 import { LitElement, html } from '@mdjs/mdjs-preview';
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 ```
 
 ```js preview-story
@@ -21,13 +21,13 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/tabs
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionTabs } from '@lion/tabs';
+import { LionTabs } from '@lion/ui/tabs.js';
 // or
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 ```
 
 ## Rationale
diff --git a/docs/components/tabs/src/lea-tab-panel.js b/docs/components/tabs/src/lea-tab-panel.js
index 3584d24a5..dfe27f1e2 100644
--- a/docs/components/tabs/src/lea-tab-panel.js
+++ b/docs/components/tabs/src/lea-tab-panel.js
@@ -1,4 +1,4 @@
-import { LitElement, html, css } from '@lion/core';
+import { LitElement, html, css } from 'lit';
 
 export class LeaTabPanel extends LitElement {
   static get styles() {
diff --git a/docs/components/tabs/src/lea-tab.js b/docs/components/tabs/src/lea-tab.js
index 64b6940c7..752cd5a4d 100644
--- a/docs/components/tabs/src/lea-tab.js
+++ b/docs/components/tabs/src/lea-tab.js
@@ -1,4 +1,4 @@
-import { css, html, LitElement } from '@lion/core';
+import { css, html, LitElement } from 'lit';
 
 export class LeaTab extends LitElement {
   static get styles() {
diff --git a/docs/components/tabs/src/lea-tabs.js b/docs/components/tabs/src/lea-tabs.js
index 66c0a785c..06165f2ec 100644
--- a/docs/components/tabs/src/lea-tabs.js
+++ b/docs/components/tabs/src/lea-tabs.js
@@ -1,5 +1,5 @@
-import { css } from '@lion/core';
-import { LionTabs } from '@lion/tabs';
+import { css } from 'lit';
+import { LionTabs } from '@lion/ui/tabs.js';
 
 export class LeaTabs extends LionTabs {
   static get styles() {
diff --git a/docs/components/tabs/use-cases.md b/docs/components/tabs/use-cases.md
index 04d36c4cc..a9372a8ae 100644
--- a/docs/components/tabs/use-cases.md
+++ b/docs/components/tabs/use-cases.md
@@ -3,7 +3,7 @@
 ```js script
 import { LitElement, html } from '@mdjs/mdjs-preview';
 
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 ```
 
 ## Selected Index
diff --git a/docs/components/textarea/overview.md b/docs/components/textarea/overview.md
index 5de34cb57..490fc59ff 100644
--- a/docs/components/textarea/overview.md
+++ b/docs/components/textarea/overview.md
@@ -5,7 +5,7 @@ Its purpose is to provide a way for users to write text that is multiple lines l
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/textarea/define';
+import '@lion/ui/define/lion-textarea.js';
 ```
 
 ```js preview-story
@@ -25,11 +25,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/textarea
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionTextarea } from '@lion/textarea';
+import { LionTextarea } from '@lion/ui/textarea.js';
 // or
-import '@lion/textarea/define';
+import '@lion/ui/define/lion-textarea.js';
 ```
diff --git a/docs/components/textarea/use-cases.md b/docs/components/textarea/use-cases.md
index 6b2c33142..78226e08f 100644
--- a/docs/components/textarea/use-cases.md
+++ b/docs/components/textarea/use-cases.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/textarea/define';
+import '@lion/ui/define/lion-textarea.js';
 ```
 
 ## Prefilled
diff --git a/docs/components/tooltip/examples.md b/docs/components/tooltip/examples.md
index e3cfaea51..9e4c0f9d8 100644
--- a/docs/components/tooltip/examples.md
+++ b/docs/components/tooltip/examples.md
@@ -2,7 +2,7 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/tooltip/define';
+import '@lion/ui/define/lion-tooltip.js';
 ```
 
 ```js preview-story
diff --git a/docs/components/tooltip/overview.md b/docs/components/tooltip/overview.md
index 3166107dc..70dbd9ac4 100644
--- a/docs/components/tooltip/overview.md
+++ b/docs/components/tooltip/overview.md
@@ -5,7 +5,7 @@ Its purpose is to show content appearing when the user hovers over an invoker el
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/tooltip/define';
+import '@lion/ui/define/lion-tooltip.js';
 ```
 
 ```js preview-story
@@ -34,11 +34,11 @@ export const main = () => html`
 ## Installation
 
 ```bash
-npm i --save @lion/tooltip
+npm i --save @lion/ui
 ```
 
 ```js
-import { LionTooltip } from '@lion/tooltip';
+import { LionTooltip } from '@lion/ui/tooltip.js';
 // or
-import '@lion/tooltip/define';
+import '@lion/ui/define/lion-tooltip.js';
 ```
diff --git a/docs/components/tooltip/use-cases.md b/docs/components/tooltip/use-cases.md
index 29c99bac1..63960e8eb 100644
--- a/docs/components/tooltip/use-cases.md
+++ b/docs/components/tooltip/use-cases.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { css, html } from '@mdjs/mdjs-preview';
-import { LionTooltip } from '@lion/tooltip';
-import '@lion/tooltip/define';
+import { LionTooltip } from '@lion/ui/tooltip.js';
+import '@lion/ui/define/lion-tooltip.js';
 ```
 
 ## invokerRelation
diff --git a/docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md b/docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md
index c8147c80c..9ab7db930 100644
--- a/docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md
+++ b/docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md
@@ -83,7 +83,7 @@ paths: [
 We have an existing demo code which we want to reuse.
 
 ```js
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 import 'source-pkg/counter/define';
 class MyApp extends LitElement {
   render() {
@@ -112,7 +112,7 @@ tag: {
 ### Result of Replacement of tags
 
 ```js
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 import 'extension-pkg/counter/define';
 class MyApp extends LitElement {
   render() {
@@ -130,7 +130,7 @@ customElements.define('my-app', MyApp);
 We have an existing demo code which we want to reuse.
 
 ```js
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 import { SourceCounter } from 'source-pkg/counter';
 class TenCounter extends SourceCounter {
   inc() {
@@ -167,7 +167,7 @@ variable: {
 ### Result of Replacement of classes
 
 ```js
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 import { SourceCounter } from 'extension-pkg/counter';
 class TenCounter extends SourceCounter {
   inc() {
diff --git a/docs/fundamentals/node-tools/providence-analytics/LocalConfiguration.md b/docs/fundamentals/node-tools/providence-analytics/LocalConfiguration.md
index c886e5ca0..c271edc1b 100644
--- a/docs/fundamentals/node-tools/providence-analytics/LocalConfiguration.md
+++ b/docs/fundamentals/node-tools/providence-analytics/LocalConfiguration.md
@@ -20,7 +20,7 @@ export default {
     categoryConfig: [
       {
         // This is the name found in package.json
-        project: '@lion/root',
+        project: '@lion/ui/root.js',
         // These conditions will be run on overy filePath
         categories: {
           core: p => p.startsWith('./packages/core'),
@@ -45,7 +45,7 @@ export default {
 ### referenceCollections
 
 A list of file system paths. They can be defined relative from the current project root or they can be full paths.
-When a [MatchAnalyzer](../../../fundamentals/node-tools/providence-analytics/analyzer.md) like `match-imports` or `match-subclasses` is used, the default reference(s) can be configured here. For instance: ['/path/to/@lion/form']
+When a [MatchAnalyzer](../../../fundamentals/node-tools/providence-analytics/analyzer.md) like `match-imports` or `match-subclasses` is used, the default reference(s) can be configured here. For instance: ['/path/to/@lion/ui/form.js']
 
 An example:
 
diff --git a/docs/fundamentals/node-tools/providence-analytics/overview.md b/docs/fundamentals/node-tools/providence-analytics/overview.md
index ae75bb892..b91bc281c 100644
--- a/docs/fundamentals/node-tools/providence-analytics/overview.md
+++ b/docs/fundamentals/node-tools/providence-analytics/overview.md
@@ -38,7 +38,7 @@ npm i --save-dev providence-analytics
 
 ```json
 "scripts": {
-  "providence:match-imports": "providence analyze match-imports -r 'node_modules/@lion/*'",
+  "providence:match-imports": "providence analyze match-imports -r 'node_modules/@lion/ui/*.js'",
 }
 ```
 
diff --git a/docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md b/docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md
index c51fb40e8..81bd6e4b8 100644
--- a/docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md
+++ b/docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md
@@ -51,7 +51,7 @@ In it you do
 ````md
 # Tabs >> Overview ||10
 
-```js ::importSmallBlockContent('@lion/tabs/docs/overview.md', '# Tabs >> Overview ||10')
+```js ::importSmallBlockContent('@lion/ui/tabs/docs/overview.md', '# Tabs >> Overview ||10.js')
 
 ```
 
@@ -77,7 +77,7 @@ as an example this is a part of the lion docs for tabs
 ````md
 ```js script
 import { LitElement, html } from '@mdjs/mdjs-preview';
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 ```
 
 ```js preview-story
@@ -231,7 +231,7 @@ This rewrites the custom element definition side effects to
 
 ```js
 // from
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 
 // to
 import '#tabs/define';
diff --git a/docs/fundamentals/rationales/versioning.md b/docs/fundamentals/rationales/versioning.md
index 7128444e0..57586fe99 100644
--- a/docs/fundamentals/rationales/versioning.md
+++ b/docs/fundamentals/rationales/versioning.md
@@ -28,7 +28,7 @@ In the past, we used to have fixed versioning, our rationale was as follows:
 **However**, if semver is followed properly, users should never get the situation where they get diverging experiences, because that would only happen in a breaking change.
 Additionally, fixing the versions led to other problems:
 
-- Undedupable installations of the same package. If there are two installations of `@lion/button` and one is installed as a dependency of another lion package, this installation will never be able to be deduped to another version, even if they're on the same minor. This is because the dependency is set to a fixed version, so NPM will see the two installations as incompatible and not dedupe them. For Lion, this can definitely lead to problems, especially with packages like `@lion/form-core`, `@lion/localize`, `@lion/overlays`, due to the singleton nature of some of the parts in those packages.
+- Undedupable installations of the same package. If there are two installations of `@lion/ui/button` and one is installed as a dependency of another lion package, this installation will never be able to be deduped to another version, even if they.js're on the same minor. This is because the dependency is set to a fixed version, so NPM will see the two installations as incompatible and not dedupe them. For Lion, this can definitely lead to problems, especially with packages like `@lion/form-core`, `@lion/localize`, `@lion/overlays`, due to the singleton nature of some of the parts in those packages.
 - Importing directly from lion as an end user when consuming a subclasser package that uses lion under the hood is dangerous. This is because you will need to always match, **exactly**, the version that is installed by the subclasser package. This means syncing your lion version with the subclasser's installed lion version every time you upgrade.
 - Changesets will see (correctly) every bump in a `@lion` dependency as a semver-incompatible change for its `@lion` dependents and bump them as a result. This means a change to `@lion/core`, no matter how tiny, will bump almost every other `@lion` package "unnecessarily". This results in large changelogs that are mostly meaningless noise, hardly "human readable" which is the goal of changesets when used correctly.
 
diff --git a/docs/fundamentals/systems/core/overview.md b/docs/fundamentals/systems/core/overview.md
index 4aab78388..eb1816c79 100644
--- a/docs/fundamentals/systems/core/overview.md
+++ b/docs/fundamentals/systems/core/overview.md
@@ -7,7 +7,7 @@ To be sure a compatible version is used you should import it via this package.
 
 ```js
 // DO
-import { LitElement, html, render } from '@lion/core';
+import { LitElement, html, render } from 'lit';
 
 // DON'T
 import { LitElement, html, render } from 'lit-element';
@@ -26,11 +26,11 @@ import { LitElement, html, render } from 'lit-element';
 ## Installation
 
 ```bash
-npm i --save @lion/core
+npm i --save @lion/ui
 ```
 
 ```js
-import { dedupeMixin, LitElement } from '@lion/core';
+import { dedupeMixin, LitElement } from 'lit';
 ```
 
 ### Example
diff --git a/docs/fundamentals/systems/form/assets/h-output.js b/docs/fundamentals/systems/form/assets/h-output.js
index 7b159b685..dd161464b 100644
--- a/docs/fundamentals/systems/form/assets/h-output.js
+++ b/docs/fundamentals/systems/form/assets/h-output.js
@@ -1,6 +1,6 @@
-import { css, html, LitElement } from '@lion/core';
-import { LionField } from '@lion/form-core';
-import { LionFieldset } from '@lion/fieldset';
+import { css, html, LitElement } from 'lit';
+import { LionField } from '@lion/ui/form-core.js';
+import { LionFieldset } from '@lion/ui/fieldset.js';
 
 export class HelperOutput extends LitElement {
   static properties = {
diff --git a/docs/fundamentals/systems/form/formatting-and-parsing.md b/docs/fundamentals/systems/form/formatting-and-parsing.md
index 96a482911..99e3f9db1 100644
--- a/docs/fundamentals/systems/form/formatting-and-parsing.md
+++ b/docs/fundamentals/systems/form/formatting-and-parsing.md
@@ -2,9 +2,9 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input/define';
-import { Unparseable } from '@lion/form-core';
-import { liveFormatPhoneNumber } from '@lion/input-tel';
+import '@lion/ui/define/lion-input.js';
+import { Unparseable } from '@lion/ui/form-core.js';
+import { liveFormatPhoneNumber } from '@lion/ui/input-tel.js';
 import './assets/h-output.js';
 ```
 
diff --git a/docs/fundamentals/systems/form/interaction-states.md b/docs/fundamentals/systems/form/interaction-states.md
index f75c62083..2e675475d 100644
--- a/docs/fundamentals/systems/form/interaction-states.md
+++ b/docs/fundamentals/systems/form/interaction-states.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html, render } from '@mdjs/mdjs-preview';
-import { renderLitAsNode } from '@lion/helpers';
-import '@lion/input/define';
-import '@lion/input-date/define';
-import { Validator, Unparseable, MinDate, Required } from '@lion/form-core';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-input-date.js';
+import { Validator, Unparseable, MinDate, Required } from '@lion/ui/form-core.js';
 import './assets/h-output.js';
 ```
 
diff --git a/docs/fundamentals/systems/form/styling.md b/docs/fundamentals/systems/form/styling.md
index 66a1f29b6..7d0a9c342 100644
--- a/docs/fundamentals/systems/form/styling.md
+++ b/docs/fundamentals/systems/form/styling.md
@@ -2,8 +2,8 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input/define';
-import '@lion/button/define';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-button.js';
 ```
 
 ## Label
diff --git a/docs/fundamentals/systems/form/use-cases.md b/docs/fundamentals/systems/form/use-cases.md
index 8578403a6..3c985e5d2 100644
--- a/docs/fundamentals/systems/form/use-cases.md
+++ b/docs/fundamentals/systems/form/use-cases.md
@@ -5,28 +5,28 @@ For usage and installation please see the appropriate packages.
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/button/define';
-import '@lion/checkbox-group/define';
-import '@lion/combobox/define';
-import '@lion/fieldset/define';
-import '@lion/form/define';
-import '@lion/input-amount/define';
-import '@lion/input-date/define';
-import '@lion/input-datepicker/define';
-import '@lion/input-email/define';
-import '@lion/input-tel/define';
-import '@lion/input-iban/define';
-import '@lion/input-range/define';
-import '@lion/input-stepper/define';
-import '@lion/input/define';
-import '@lion/listbox/define';
-import '@lion/radio-group/define';
-import '@lion/select/define';
-import '@lion/select-rich/define';
-import '@lion/switch/define';
-import '@lion/textarea/define';
-import { MinLength, Required } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import '@lion/ui/define/lion-button.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-input-tel.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-input-stepper.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-select.js';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-switch.js';
+import '@lion/ui/define/lion-textarea.js';
+import { MinLength, Required } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 ```
 
 ## Umbrella Form
diff --git a/docs/fundamentals/systems/form/validate.md b/docs/fundamentals/systems/form/validate.md
index ae2f3820d..66b0249f4 100644
--- a/docs/fundamentals/systems/form/validate.md
+++ b/docs/fundamentals/systems/form/validate.md
@@ -2,30 +2,30 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { LionInput } from '@lion/input';
-import '@lion/checkbox-group/define';
-import '@lion/checkbox-group/define';
-import '@lion/combobox/define';
-import '@lion/fieldset/define';
-import '@lion/form/define';
-import '@lion/input-amount/define';
-import '@lion/input-date/define';
-import '@lion/input-datepicker/define';
-import '@lion/input-email/define';
-import '@lion/input-iban/define';
-import '@lion/input-range/define';
-import '@lion/input-stepper/define';
-import '@lion/input/define';
-import '@lion/listbox/define';
-import '@lion/listbox/define-listbox';
-import '@lion/listbox/define-option';
-import '@lion/listbox/define-options';
-import '@lion/radio-group/define';
-import '@lion/radio-group/define-radio-group';
-import '@lion/radio-group/define-radio';
-import '@lion/select/define';
-import '@lion/select-rich/define-select-rich';
-import '@lion/textarea/define';
+import { LionInput } from '@lion/ui/input.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-input-stepper.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-options.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
+import '@lion/ui/define/lion-select.js';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-textarea.js';
 import {
   DefaultSuccess,
   EqualsLength,
@@ -46,10 +46,10 @@ import {
   Validator,
   Pattern,
   Unparseable,
-} from '@lion/form-core';
-import { localize } from '@lion/localize';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { renderLitAsNode } from '@lion/helpers';
+} from '@lion/ui/form-core.js';
+import { localize } from '@lion/ui/localize.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
 ```
 
 ## When validation happens
@@ -171,12 +171,12 @@ class EnumOutComeValidator extends Validator {
 ## Installation
 
 ```bash
-npm i --save @lion/form-core
+npm i --save @lion/ui
 ```
 
 ```js
-import '@lion/input/define';
-import { %ValidatorName% } from '@lion/form-core';
+import '@lion/ui/define/lion-input.js';
+import { %ValidatorName% } from '@lion/ui/form-core.js';
 ```
 
 ## Default Validators
@@ -194,11 +194,11 @@ All validators return `false` if the required validity state is met.
 All validators are considered self explanatory due to their explicit namings.
 
 ```bash
-npm i --save @lion/validate-messages
+npm i --save @lion/ui
 ```
 
 ```js
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 ```
 
 ```js preview-story
diff --git a/docs/fundamentals/systems/icon/overview.md b/docs/fundamentals/systems/icon/overview.md
index 92b3f6302..45d69a58d 100644
--- a/docs/fundamentals/systems/icon/overview.md
+++ b/docs/fundamentals/systems/icon/overview.md
@@ -9,7 +9,7 @@ application, and you don't need to worry about carefully coordinating the dynami
 For security reasons, icons are defined using lit-html templates to guarantee XSS safety:
 
 ```js
-import { html } from '@lion/core';
+import { html } from 'lit';
 
 export default html` <svg focusable="false" ...>...</svg> `;
 ```
@@ -80,7 +80,7 @@ Icon resolvers are registered in the `IconManager` on a namespace. There can be
 make sure they are unique. A good idea is to use your package name as the namespace.
 
 ```js
-import { icons } from '@lion/icon';
+import { icons } from '@lion/ui/icon.js';
 
 function resolveLionIcon(iconset, name) {
   switch (iconset) {
@@ -103,7 +103,7 @@ icons.addIconResolver('lion', resolveLionIcon);
 After register an icon resolver, icons can be resolved from the manager:
 
 ```js
-import { icons } from '@lion/icon';
+import { icons } from '@lion/ui/icon.js';
 
 const spaceshipIcon = await icons.resolveIcon('lion', 'space', 'alienSpaceship');
 ```
@@ -111,7 +111,7 @@ const spaceshipIcon = await icons.resolveIcon('lion', 'space', 'alienSpaceship')
 Icons can also be resolved from a single string, using the pattern: `namespace:iconset:name`:
 
 ```js
-import { icons } from '@lion/icon';
+import { icons } from '@lion/ui/icon.js';
 
 const spaceshipIcon = await icons.resolveIconForId('lion:space:alienSpaceship');
 ```
diff --git a/docs/fundamentals/systems/localize/dates.md b/docs/fundamentals/systems/localize/dates.md
index a3c306a97..67e2e030a 100644
--- a/docs/fundamentals/systems/localize/dates.md
+++ b/docs/fundamentals/systems/localize/dates.md
@@ -13,7 +13,7 @@ The input value is `new Date('1987/05/12')`.
 
 ```js script
 import { css, html } from '@mdjs/mdjs-preview';
-import { formatNumber, formatNumberToParts, formatDate } from '@lion/localize';
+import { formatNumber, formatNumberToParts, formatDate } from '@lion/ui/localize.js';
 import allLocales from './assets/all-locales.js';
 
 const formatDateDemoStyle = css`
diff --git a/docs/fundamentals/systems/localize/numbers.md b/docs/fundamentals/systems/localize/numbers.md
index 8049fba3f..ff0240042 100644
--- a/docs/fundamentals/systems/localize/numbers.md
+++ b/docs/fundamentals/systems/localize/numbers.md
@@ -13,7 +13,7 @@ The input value is `1234.56`.
 
 ```js script
 import { html, css } from '@mdjs/mdjs-preview';
-import { formatNumber, formatNumberToParts } from '@lion/localize';
+import { formatNumber, formatNumberToParts } from '@lion/ui/localize.js';
 import allLocales from './assets/all-locales.js';
 
 const formatNumberDemoStyle = css`
diff --git a/docs/fundamentals/systems/localize/overview.md b/docs/fundamentals/systems/localize/overview.md
index 951c378ab..e26e71df9 100644
--- a/docs/fundamentals/systems/localize/overview.md
+++ b/docs/fundamentals/systems/localize/overview.md
@@ -22,11 +22,11 @@ Further examples and a more in depth description can be found at the [Use Cases
 ## Installation
 
 ```bash
-npm i --save @lion/localize
+npm i --save @lion/ui
 ```
 
 ```js
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 ```
 
 ### Example
@@ -37,7 +37,7 @@ The single source of truth for page's locale is `<html lang="my-LOCALE">`.
 At the same time the interaction should happen via `localize.locale` getter/setter to be able to notify and react to the change.
 
 ```js
-import { localize } from '@lion/localize.js';
+import { localize } from '@lion/ui/localize.js';
 
 localize.addEventListener('localeChanged', () => {
   // do smth when data is loaded for a new locale
diff --git a/docs/fundamentals/systems/localize/text.md b/docs/fundamentals/systems/localize/text.md
index 0b241c5f7..4f7e4fe12 100644
--- a/docs/fundamentals/systems/localize/text.md
+++ b/docs/fundamentals/systems/localize/text.md
@@ -4,8 +4,8 @@
 
 ```js script
 import { html, render, LitElement } from '@mdjs/mdjs-preview';
-import { localize, formatNumber, formatDate, LocalizeMixin } from '@lion/localize';
-import '@lion/helpers/define';
+import { localize, formatNumber, formatDate, LocalizeMixin } from '@lion/ui/localize.js';
+import '@lion/ui/define-helpers/sb-locale-switcher.js';
 ```
 
 ```js preview-story
diff --git a/docs/fundamentals/systems/localize/use-cases.md b/docs/fundamentals/systems/localize/use-cases.md
index 4ef6a97c4..5b5a00da6 100644
--- a/docs/fundamentals/systems/localize/use-cases.md
+++ b/docs/fundamentals/systems/localize/use-cases.md
@@ -11,7 +11,7 @@ It is exposed as a `localize` singleton instance.
 This ensures that the data can be cached in the single place and reused across different components and same component instances.
 
 ```js
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 // localize is the instance of LocalizeManager
 ```
 
@@ -275,7 +275,7 @@ If you want to optimize the page rendering and you can inline some of your local
 
 ```js
 // my-inlined-data.js
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 localize.addData('en-GB', 'my-namespace', {
   /* data */
 });
diff --git a/docs/fundamentals/systems/overlays/assets/applyDemoOverlayStyles.js b/docs/fundamentals/systems/overlays/assets/applyDemoOverlayStyles.js
index 04d12e498..fb9b4e7f9 100644
--- a/docs/fundamentals/systems/overlays/assets/applyDemoOverlayStyles.js
+++ b/docs/fundamentals/systems/overlays/assets/applyDemoOverlayStyles.js
@@ -1,4 +1,4 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 const applyDemoOverlayStyles = () => {
   const demoOverlaysStyle = css`
diff --git a/docs/fundamentals/systems/overlays/assets/demo-overlay-backdrop.js b/docs/fundamentals/systems/overlays/assets/demo-overlay-backdrop.js
index 7a6ece0f1..06aa651bf 100644
--- a/docs/fundamentals/systems/overlays/assets/demo-overlay-backdrop.js
+++ b/docs/fundamentals/systems/overlays/assets/demo-overlay-backdrop.js
@@ -1,4 +1,4 @@
-import { css, LitElement } from '@lion/core';
+import { css, LitElement } from 'lit';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/docs/fundamentals/systems/overlays/assets/demo-overlay-system.js b/docs/fundamentals/systems/overlays/assets/demo-overlay-system.js
index 819ee44cb..30c1ec87e 100644
--- a/docs/fundamentals/systems/overlays/assets/demo-overlay-system.js
+++ b/docs/fundamentals/systems/overlays/assets/demo-overlay-system.js
@@ -1,5 +1,5 @@
-import { html, LitElement } from '@lion/core';
-import { OverlayMixin } from '@lion/overlays';
+import { html, LitElement } from 'lit';
+import { OverlayMixin } from '@lion/ui/overlays.js';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/docs/fundamentals/systems/overlays/assets/ref.js b/docs/fundamentals/systems/overlays/assets/ref.js
index 734b69610..fed6d4307 100644
--- a/docs/fundamentals/systems/overlays/assets/ref.js
+++ b/docs/fundamentals/systems/overlays/assets/ref.js
@@ -1,7 +1,7 @@
-import { directive } from '@lion/core';
+import { directive } from 'lit/directive.js';
 
 /**
- * @typedef {import('@lion/core').PropertyPart} PropertyPart
+ * @typedef {import('@lion/ui/core.js').PropertyPart} PropertyPart
  */
 
 /** @type {WeakSet<Element>} */
diff --git a/docs/fundamentals/systems/overlays/assets/umbrella-form.js b/docs/fundamentals/systems/overlays/assets/umbrella-form.js
index 28d0d257e..58d5f7e13 100644
--- a/docs/fundamentals/systems/overlays/assets/umbrella-form.js
+++ b/docs/fundamentals/systems/overlays/assets/umbrella-form.js
@@ -1,26 +1,26 @@
-import { LitElement, html } from '@lion/core';
-import { Required, MinLength } from '@lion/form-core';
-import '@lion/form/define';
-import '@lion/fieldset/define';
-import '@lion/input/define';
-import '@lion/input-date/define';
-import '@lion/input-datepicker/define';
-import '@lion/input-amount/define';
-import '@lion/input-iban/define';
-import '@lion/input-email/define';
-import '@lion/checkbox-group/define';
-import '@lion/radio-group/define';
-import '@lion/select/define';
-import '@lion/select-rich/define';
-import '@lion/input-range/define';
-import '@lion/textarea/define';
-import '@lion/button/define';
-import '@lion/input-tel/define';
-import '@lion/input-tel-dropdown/define';
+import { LitElement, html } from 'lit';
+import { Required, MinLength } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-select.js';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-textarea.js';
+import '@lion/ui/define/lion-button.js';
+import '@lion/ui/define/lion-input-tel.js';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
 
 export class UmbrellaForm extends LitElement {
   get _lionFormNode() {
-    return /** @type {import('@lion/form').LionForm} */ (
+    return /** @type {import('@lion/ui/form.js').LionForm} */ (
       this.shadowRoot?.querySelector('lion-form')
     );
   }
diff --git a/docs/fundamentals/systems/overlays/form-integration.md b/docs/fundamentals/systems/overlays/form-integration.md
index 5f0938e51..42ca29b5c 100644
--- a/docs/fundamentals/systems/overlays/form-integration.md
+++ b/docs/fundamentals/systems/overlays/form-integration.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/input-datepicker/define';
-import '@lion/listbox/define';
-import '@lion/listbox/define';
-import '@lion/select-rich/define';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-select-rich.js';
 import './assets/demo-overlay-system.js';
 import './assets/applyDemoOverlayStyles.js';
 ```
diff --git a/docs/fundamentals/systems/overlays/overview.md b/docs/fundamentals/systems/overlays/overview.md
index b9823e6b6..c3f4be6bb 100644
--- a/docs/fundamentals/systems/overlays/overview.md
+++ b/docs/fundamentals/systems/overlays/overview.md
@@ -27,14 +27,13 @@ Usually you will use `lion-dialog` (or `lion-tooltip` if this makes more sense).
 ## Installation
 
 ```bash
-npm i --save @lion/overlays
-npm i --save @lion/dialog
+npm i --save @lion/ui
 ```
 
 ### Example
 
 ```js
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
 
 html`
   <lion-dialog .config=${{
@@ -57,7 +56,7 @@ html`
 Or by creating a controller yourself
 
 ```js
-import { OverlayController } from '@lion/overlays';
+import { OverlayController } from '@lion/ui/overlays.js';
 
 const ctrl = new OverlayController({
   ...withModalDialogConfig(),
@@ -69,8 +68,8 @@ const ctrl = new OverlayController({
 Or creating your own Web Component which uses the Overlay System
 
 ```js
-import { LitElement, html } from '@lion/core';
-import { OverlayMixin, withModalDialogConfig } from '@lion/overlays';
+import { LitElement, html } from 'lit';
+import { OverlayMixin, withModalDialogConfig } from '@lion/ui/overlays.js';
 
 class MyOverlayComponent extends OverlayMixin(LitElement) {
   _defineOverlayConfig() {
diff --git a/docs/fundamentals/systems/overlays/use-cases.md b/docs/fundamentals/systems/overlays/use-cases.md
index 0e082ea68..f51dec896 100644
--- a/docs/fundamentals/systems/overlays/use-cases.md
+++ b/docs/fundamentals/systems/overlays/use-cases.md
@@ -2,14 +2,14 @@
 
 ```js script
 import { html, render, LitElement } from '@mdjs/mdjs-preview';
-import { renderLitAsNode } from '@lion/helpers';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
 import {
   ArrowMixin,
   OverlayMixin,
   withBottomSheetConfig,
   withDropdownConfig,
   withModalDialogConfig,
-} from '@lion/overlays';
+} from '@lion/ui/overlays.js';
 
 import './assets/demo-overlay-system.js';
 import './assets/demo-overlay-backdrop.js';
@@ -482,7 +482,7 @@ By default, there are only a few `OverlayMixin` methods you need to override to
 
 ```js
 import { LitElement } from '@mdjs/mdjs-preview';
-import { OverlayMixin } from '@lion/overlays';
+import { OverlayMixin } from '@lion/ui/overlays.js';
 
 class MyOverlayWC extends OverlayMixin(LitElement) {
   _defineOverlayConfig() {
diff --git a/docs/fundamentals/tools/ajax/use-cases.md b/docs/fundamentals/tools/ajax/use-cases.md
index e4e20b37c..f6a6820b5 100644
--- a/docs/fundamentals/tools/ajax/use-cases.md
+++ b/docs/fundamentals/tools/ajax/use-cases.md
@@ -2,9 +2,9 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { renderLitAsNode } from '@lion/helpers';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
 import { ajax, createCacheInterceptors } from '@lion/ajax';
-import '@lion/helpers/define';
+import '@lion/ui/define-helpers/sb-action-logger.js';
 
 const getCacheIdentifier = () => {
   let userId = localStorage.getItem('lion-ajax-cache-demo-user-id');
diff --git a/docs/fundamentals/tools/helpers/action-logger.md b/docs/fundamentals/tools/helpers/action-logger.md
index 2da335c02..5ef9aed9b 100644
--- a/docs/fundamentals/tools/helpers/action-logger.md
+++ b/docs/fundamentals/tools/helpers/action-logger.md
@@ -4,7 +4,7 @@ A visual element to show action logs in demos `sb-action-logger`
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import '@lion/helpers/define';
+import '@lion/ui/define-helpers/sb-action-logger.js';
 ```
 
 ```js preview-story
diff --git a/docs/fundamentals/tools/helpers/overview.md b/docs/fundamentals/tools/helpers/overview.md
index eb3cfe039..b87018c4b 100644
--- a/docs/fundamentals/tools/helpers/overview.md
+++ b/docs/fundamentals/tools/helpers/overview.md
@@ -23,7 +23,7 @@ Example using the sb-action-logger helper component.
 
 ```html
 <script type="module">
-  import '@lion/helpers/define-sb-action-logger';
+  import '@lion/ui/define-helpers/sb-action-logger.js';
 </script>
 
 <sb-action-logger></sb-action-logger>
diff --git a/docs/fundamentals/tools/singleton-manager/example-complex/demo-app.js b/docs/fundamentals/tools/singleton-manager/example-complex/demo-app.js
index ded8f27a3..057392db9 100644
--- a/docs/fundamentals/tools/singleton-manager/example-complex/demo-app.js
+++ b/docs/fundamentals/tools/singleton-manager/example-complex/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from '@lion/core';
+import { LitElement, css, html } from 'lit';
 
 import './overlayCompatibility.js';
 
diff --git a/docs/fundamentals/tools/singleton-manager/example-fail/demo-app.js b/docs/fundamentals/tools/singleton-manager/example-fail/demo-app.js
index faf135488..802bb6d85 100644
--- a/docs/fundamentals/tools/singleton-manager/example-fail/demo-app.js
+++ b/docs/fundamentals/tools/singleton-manager/example-fail/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from '@lion/core';
+import { LitElement, css, html } from 'lit';
 
 import 'page-a/page-a.js';
 import 'page-b/page-b.js';
diff --git a/docs/fundamentals/tools/singleton-manager/example-success/demo-app.js b/docs/fundamentals/tools/singleton-manager/example-success/demo-app.js
index ded8f27a3..057392db9 100644
--- a/docs/fundamentals/tools/singleton-manager/example-success/demo-app.js
+++ b/docs/fundamentals/tools/singleton-manager/example-success/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from '@lion/core';
+import { LitElement, css, html } from 'lit';
 
 import './overlayCompatibility.js';
 
diff --git a/docs/guides/how-to/create-a-custom-field.md b/docs/guides/how-to/create-a-custom-field.md
index 6693976d3..d40794415 100644
--- a/docs/guides/how-to/create-a-custom-field.md
+++ b/docs/guides/how-to/create-a-custom-field.md
@@ -2,8 +2,10 @@
 
 ```js script
 import { html, css, LitElement } from '@mdjs/mdjs-preview';
-import { LionField } from '@lion/form-core';
-import '@lion/form-core/define';
+import { LionField } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
+
 import '../../fundamentals/systems/form/assets/h-output.js';
 
 // A) the custom [slot=input] or 'HTMLElementWithValue'
diff --git a/docs/guides/how-to/extend-a-native-input.md b/docs/guides/how-to/extend-a-native-input.md
index 44961ac02..8ef914e53 100644
--- a/docs/guides/how-to/extend-a-native-input.md
+++ b/docs/guides/how-to/extend-a-native-input.md
@@ -2,10 +2,10 @@
 
 ```js script
 import { html } from '@mdjs/mdjs-preview';
-import { LionInput } from '@lion/input';
-import { LionInputDate } from '@lion/input-date';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import '@lion/input/define';
+import { LionInput } from '@lion/ui/input.js';
+import { LionInputDate } from '@lion/ui/input-date.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
+import '@lion/ui/define/lion-input.js';
 import '../../fundamentals/systems/form/assets/h-output.js';
 
 loadDefaultFeedbackMessages();
diff --git a/docs/guides/how-to/get-started.md b/docs/guides/how-to/get-started.md
index 026bbe354..a46ea7f99 100644
--- a/docs/guides/how-to/get-started.md
+++ b/docs/guides/how-to/get-started.md
@@ -31,8 +31,8 @@ npm i @lion/<package-name>
 **This is the main use case for lion**. To import component classes, and extend them for your own design system's components.
 
 ```js
-import { css } from '@lion/core';
-import { LionInput } from '@lion/input';
+import { css } from 'lit';
+import { LionInput } from '@lion/ui/input.js';
 
 class MyInput extends LionInput {
   static get styles() {
@@ -70,7 +70,7 @@ You can also use the lion elements directly, although this is likely not a commo
 
 ```html
 <script type="module">
-  import '@lion/input/lion-input.js';
+  import '@lion/ui/define/lion-input.js';
 </script>
 
 <lion-input name="firstName" label="First name"></lion-input>
diff --git a/docs/guides/principles/scoped-elements.md b/docs/guides/principles/scoped-elements.md
index d65fd64a7..789cc161e 100644
--- a/docs/guides/principles/scoped-elements.md
+++ b/docs/guides/principles/scoped-elements.md
@@ -6,10 +6,11 @@ Whenever a lion component uses composition (meaning it uses another lion compone
 apply ScopedElementsMixin to make sure it uses the right version of this internal component.
 
 ```js
-import { ScopedElementsMixin, LitElement, html } from '@lion/core';
+import { LitElement, html } from '@lion/ui/core.js';
+import { ScopedElementsMixin, LitElement, html } from '@open-wc/scoped-elements';
 
-import { LionInput } from '@lion/input';
-import { LionButton } from '@lion/button';
+import { LionInput } from '@lion/ui/input.js';
+import { LionButton } from '@lion/ui/button.js';
 
 class MyElement extends ScopedElementsMixin(LitElement) {
   static get scopedElements() {
@@ -89,7 +90,8 @@ connectedCallback() {
 In a less complex case, we might just want to add a child node to the dom.
 
 ```js
-import { ScopedElementsMixin, LitElement, getScopedTagNamegetScopedTagName  } from '@lion/core';
+import { LitElement  } from 'lit';
+import { ScopedElementsMixin, getScopedTagName } from '@open-wc/scoped-elements';
 
 ...
 
diff --git a/package-lock.json b/package-lock.json
index 6072cbaf5..a7a7c3f68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,9 +45,9 @@
         "concurrently": "^5.2.0",
         "cross-env": "^7.0.2",
         "es6-promisify": "^6.1.1",
-        "eslint": "^8.5.0",
+        "eslint": "^8.26.0",
         "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-lit": "^1.6.1",
         "eslint-plugin-lit-a11y": "^2.2.0",
         "eslint-plugin-wc": "^1.3.2",
@@ -2731,9 +2731,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
+      "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2874,160 +2874,12 @@
         "node": ">= 8.0.0"
       }
     },
-    "node_modules/@lion/accordion": {
-      "resolved": "packages/accordion",
-      "link": true
-    },
     "node_modules/@lion/ajax": {
       "resolved": "packages/ajax",
       "link": true
     },
-    "node_modules/@lion/button": {
-      "resolved": "packages/button",
-      "link": true
-    },
-    "node_modules/@lion/calendar": {
-      "resolved": "packages/calendar",
-      "link": true
-    },
-    "node_modules/@lion/checkbox-group": {
-      "resolved": "packages/checkbox-group",
-      "link": true
-    },
-    "node_modules/@lion/collapsible": {
-      "resolved": "packages/collapsible",
-      "link": true
-    },
-    "node_modules/@lion/combobox": {
-      "resolved": "packages/combobox",
-      "link": true
-    },
-    "node_modules/@lion/core": {
-      "resolved": "packages/core",
-      "link": true
-    },
-    "node_modules/@lion/dialog": {
-      "resolved": "packages/dialog",
-      "link": true
-    },
-    "node_modules/@lion/fieldset": {
-      "resolved": "packages/fieldset",
-      "link": true
-    },
-    "node_modules/@lion/form": {
-      "resolved": "packages/form",
-      "link": true
-    },
-    "node_modules/@lion/form-core": {
-      "resolved": "packages/form-core",
-      "link": true
-    },
-    "node_modules/@lion/form-integrations": {
-      "resolved": "packages/form-integrations",
-      "link": true
-    },
-    "node_modules/@lion/helpers": {
-      "resolved": "packages/helpers",
-      "link": true
-    },
-    "node_modules/@lion/icon": {
-      "resolved": "packages/icon",
-      "link": true
-    },
-    "node_modules/@lion/input": {
-      "resolved": "packages/input",
-      "link": true
-    },
-    "node_modules/@lion/input-amount": {
-      "resolved": "packages/input-amount",
-      "link": true
-    },
-    "node_modules/@lion/input-date": {
-      "resolved": "packages/input-date",
-      "link": true
-    },
-    "node_modules/@lion/input-datepicker": {
-      "resolved": "packages/input-datepicker",
-      "link": true
-    },
-    "node_modules/@lion/input-email": {
-      "resolved": "packages/input-email",
-      "link": true
-    },
-    "node_modules/@lion/input-iban": {
-      "resolved": "packages/input-iban",
-      "link": true
-    },
-    "node_modules/@lion/input-range": {
-      "resolved": "packages/input-range",
-      "link": true
-    },
-    "node_modules/@lion/input-stepper": {
-      "resolved": "packages/input-stepper",
-      "link": true
-    },
-    "node_modules/@lion/input-tel": {
-      "resolved": "packages/input-tel",
-      "link": true
-    },
-    "node_modules/@lion/input-tel-dropdown": {
-      "resolved": "packages/input-tel-dropdown",
-      "link": true
-    },
-    "node_modules/@lion/listbox": {
-      "resolved": "packages/listbox",
-      "link": true
-    },
-    "node_modules/@lion/localize": {
-      "resolved": "packages/localize",
-      "link": true
-    },
-    "node_modules/@lion/overlays": {
-      "resolved": "packages/overlays",
-      "link": true
-    },
-    "node_modules/@lion/pagination": {
-      "resolved": "packages/pagination",
-      "link": true
-    },
-    "node_modules/@lion/progress-indicator": {
-      "resolved": "packages/progress-indicator",
-      "link": true
-    },
-    "node_modules/@lion/radio-group": {
-      "resolved": "packages/radio-group",
-      "link": true
-    },
-    "node_modules/@lion/select": {
-      "resolved": "packages/select",
-      "link": true
-    },
-    "node_modules/@lion/select-rich": {
-      "resolved": "packages/select-rich",
-      "link": true
-    },
-    "node_modules/@lion/steps": {
-      "resolved": "packages/steps",
-      "link": true
-    },
-    "node_modules/@lion/switch": {
-      "resolved": "packages/switch",
-      "link": true
-    },
-    "node_modules/@lion/tabs": {
-      "resolved": "packages/tabs",
-      "link": true
-    },
-    "node_modules/@lion/textarea": {
-      "resolved": "packages/textarea",
-      "link": true
-    },
-    "node_modules/@lion/tooltip": {
-      "resolved": "packages/tooltip",
-      "link": true
-    },
-    "node_modules/@lion/validate-messages": {
-      "resolved": "packages/validate-messages",
+    "node_modules/@lion/ui": {
+      "resolved": "packages/ui",
       "link": true
     },
     "node_modules/@lit/reactive-element": {
@@ -3696,6 +3548,7 @@
       "version": "2.11.6",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
       "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "dev": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -4280,14 +4133,6 @@
       "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
       "dev": true
     },
-    "node_modules/@types/autosize": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/autosize/-/autosize-3.0.7.tgz",
-      "integrity": "sha512-D46m3aBNg81QKk9ZigmDFuhXUkD4IpBSrkGUKpYo2QBETbUjqEe8msXNCcECaXLXv1O4ppdMpizgFRzpfrgOxA==",
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
     "node_modules/@types/babel__code-frame": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/babel__code-frame/-/babel__code-frame-7.0.3.tgz",
@@ -4600,14 +4445,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
-    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -4854,11 +4691,6 @@
       "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==",
       "dev": true
     },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="
-    },
     "node_modules/@types/trusted-types": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
@@ -6339,6 +6171,11 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/autosize": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
+      "integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
+    },
     "node_modules/awesome-phonenumber": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-3.4.0.tgz",
@@ -10284,14 +10121,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
+      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/config-array": "^0.11.6",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -10307,14 +10145,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
+        "glob-parent": "^6.0.2",
         "globals": "^13.15.0",
-        "globby": "^11.1.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -10677,26 +10515,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -13013,6 +12831,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -23531,6 +23358,7 @@
     "packages/accordion": {
       "name": "@lion/accordion",
       "version": "0.11.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23544,6 +23372,7 @@
     "packages/button": {
       "name": "@lion/button",
       "version": "0.18.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23552,6 +23381,7 @@
     "packages/calendar": {
       "name": "@lion/calendar",
       "version": "0.20.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23561,6 +23391,7 @@
     "packages/checkbox-group": {
       "name": "@lion/checkbox-group",
       "version": "0.21.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23571,6 +23402,7 @@
     "packages/collapsible": {
       "name": "@lion/collapsible",
       "version": "0.9.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23579,6 +23411,7 @@
     "packages/combobox": {
       "name": "@lion/combobox",
       "version": "0.11.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23587,9 +23420,26 @@
         "@lion/overlays": "^0.33.2"
       }
     },
+    "packages/components": {
+      "name": "@lion/ui",
+      "version": "0.0.1",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bundled-es-modules/message-format": "^6.0.4",
+        "@open-wc/dedupe-mixin": "^1.3.1",
+        "@open-wc/scoped-elements": "^2.1.3",
+        "autosize": "4.0.2",
+        "awesome-phonenumber": "^3.0.1",
+        "ibantools": "^2.2.0",
+        "lit": "^2.4.0",
+        "singleton-manager": "^1.5.0"
+      }
+    },
     "packages/core": {
       "name": "@lion/core",
       "version": "0.24.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
@@ -23600,6 +23450,7 @@
     "packages/dialog": {
       "name": "@lion/dialog",
       "version": "0.16.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23609,6 +23460,7 @@
     "packages/fieldset": {
       "name": "@lion/fieldset",
       "version": "0.22.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23618,6 +23470,7 @@
     "packages/form": {
       "name": "@lion/form",
       "version": "0.15.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/fieldset": "^0.22.0"
@@ -23626,6 +23479,7 @@
     "packages/form-core": {
       "name": "@lion/form-core",
       "version": "0.18.3",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23635,6 +23489,7 @@
     "packages/form-integrations": {
       "name": "@lion/form-integrations",
       "version": "0.12.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/button": "^0.18.1",
@@ -23665,6 +23520,7 @@
     "packages/helpers": {
       "name": "@lion/helpers",
       "version": "0.12.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23673,6 +23529,7 @@
     "packages/icon": {
       "name": "@lion/icon",
       "version": "0.16.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23682,6 +23539,7 @@
     "packages/input": {
       "name": "@lion/input",
       "version": "0.18.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/form-core": "^0.18.0"
@@ -23690,6 +23548,7 @@
     "packages/input-amount": {
       "name": "@lion/input-amount",
       "version": "0.18.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23702,6 +23561,7 @@
     "packages/input-date": {
       "name": "@lion/input-date",
       "version": "0.15.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23714,6 +23574,7 @@
     "packages/input-datepicker": {
       "name": "@lion/input-datepicker",
       "version": "0.26.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/calendar": "^0.20.1",
@@ -23728,6 +23589,7 @@
     "packages/input-email": {
       "name": "@lion/input-email",
       "version": "0.16.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23740,6 +23602,7 @@
     "packages/input-iban": {
       "name": "@lion/input-iban",
       "version": "0.19.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23753,6 +23616,7 @@
     "packages/input-range": {
       "name": "@lion/input-range",
       "version": "0.13.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23763,6 +23627,7 @@
     "packages/input-stepper": {
       "name": "@lion/input-stepper",
       "version": "0.9.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23773,6 +23638,7 @@
     "packages/input-tel": {
       "name": "@lion/input-tel",
       "version": "0.2.3",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23785,6 +23651,7 @@
     "packages/input-tel-dropdown": {
       "name": "@lion/input-tel-dropdown",
       "version": "0.2.3",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23795,6 +23662,7 @@
     "packages/listbox": {
       "name": "@lion/listbox",
       "version": "0.14.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23804,6 +23672,7 @@
     "packages/localize": {
       "name": "@lion/localize",
       "version": "0.26.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@bundled-es-modules/message-format": "6.0.4",
@@ -23814,6 +23683,7 @@
     "packages/overlays": {
       "name": "@lion/overlays",
       "version": "0.33.2",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23824,6 +23694,7 @@
     "packages/pagination": {
       "name": "@lion/pagination",
       "version": "0.9.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23833,6 +23704,7 @@
     "packages/progress-indicator": {
       "name": "@lion/progress-indicator",
       "version": "0.10.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23842,6 +23714,7 @@
     "packages/radio-group": {
       "name": "@lion/radio-group",
       "version": "0.21.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23852,6 +23725,7 @@
     "packages/select": {
       "name": "@lion/select",
       "version": "0.17.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23861,6 +23735,7 @@
     "packages/select-rich": {
       "name": "@lion/select-rich",
       "version": "0.31.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/button": "^0.18.1",
@@ -23877,6 +23752,7 @@
     "packages/steps": {
       "name": "@lion/steps",
       "version": "0.12.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23885,6 +23761,7 @@
     "packages/switch": {
       "name": "@lion/switch",
       "version": "0.21.2",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23894,6 +23771,7 @@
     "packages/tabs": {
       "name": "@lion/tabs",
       "version": "0.13.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0"
@@ -23902,6 +23780,7 @@
     "packages/textarea": {
       "name": "@lion/textarea",
       "version": "0.16.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
@@ -23910,23 +23789,34 @@
         "autosize": "4.0.2"
       }
     },
-    "packages/textarea/node_modules/autosize": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
-      "integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
-    },
     "packages/tooltip": {
       "name": "@lion/tooltip",
       "version": "0.24.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/core": "^0.24.0",
         "@lion/overlays": "^0.33.2"
       }
     },
+    "packages/ui": {
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@bundled-es-modules/message-format": "^6.0.4",
+        "@open-wc/dedupe-mixin": "^1.3.1",
+        "@open-wc/scoped-elements": "^2.1.3",
+        "autosize": "4.0.2",
+        "awesome-phonenumber": "^3.0.1",
+        "ibantools": "^2.2.0",
+        "lit": "^2.4.0",
+        "singleton-manager": "^1.5.0"
+      }
+    },
     "packages/validate-messages": {
       "name": "@lion/validate-messages",
       "version": "0.10.1",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@lion/form-core": "^0.18.3",
@@ -25904,9 +25794,9 @@
       }
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
+      "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -26017,332 +25907,22 @@
         "vary": "^1.1.2"
       }
     },
-    "@lion/accordion": {
-      "version": "file:packages/accordion",
-      "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
     "@lion/ajax": {
       "version": "file:packages/ajax"
     },
-    "@lion/button": {
-      "version": "file:packages/button",
+    "@lion/ui": {
+      "version": "file:packages/ui",
       "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
-    "@lion/calendar": {
-      "version": "file:packages/calendar",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/checkbox-group": {
-      "version": "file:packages/checkbox-group",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0"
-      }
-    },
-    "@lion/collapsible": {
-      "version": "file:packages/collapsible",
-      "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
-    "@lion/combobox": {
-      "version": "file:packages/combobox",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/listbox": "^0.14.1",
-        "@lion/overlays": "^0.33.2"
-      }
-    },
-    "@lion/core": {
-      "version": "file:packages/core",
-      "requires": {
-        "@open-wc/dedupe-mixin": "^1.3.0",
-        "@open-wc/scoped-elements": "^2.1.1",
-        "lit": "^2.0.2"
-      }
-    },
-    "@lion/dialog": {
-      "version": "file:packages/dialog",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/overlays": "^0.33.2"
-      }
-    },
-    "@lion/fieldset": {
-      "version": "file:packages/fieldset",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3"
-      }
-    },
-    "@lion/form": {
-      "version": "file:packages/form",
-      "requires": {
-        "@lion/fieldset": "^0.22.0"
-      }
-    },
-    "@lion/form-core": {
-      "version": "file:packages/form-core",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/form-integrations": {
-      "version": "file:packages/form-integrations",
-      "requires": {
-        "@lion/button": "^0.18.1",
-        "@lion/checkbox-group": "^0.21.1",
-        "@lion/combobox": "^0.11.1",
-        "@lion/core": "^0.24.0",
-        "@lion/fieldset": "^0.22.1",
-        "@lion/form": "^0.15.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/input-amount": "^0.18.0",
-        "@lion/input-date": "^0.15.1",
-        "@lion/input-datepicker": "^0.26.1",
-        "@lion/input-email": "^0.16.1",
-        "@lion/input-iban": "^0.19.1",
-        "@lion/input-range": "^0.13.1",
-        "@lion/input-stepper": "^0.9.1",
-        "@lion/listbox": "^0.14.1",
-        "@lion/localize": "^0.26.0",
-        "@lion/radio-group": "^0.21.1",
-        "@lion/select": "^0.17.1",
-        "@lion/select-rich": "^0.31.1",
-        "@lion/switch": "^0.21.2",
-        "@lion/textarea": "^0.16.1",
-        "@lion/validate-messages": "^0.10.1"
-      }
-    },
-    "@lion/helpers": {
-      "version": "file:packages/helpers",
-      "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
-    "@lion/icon": {
-      "version": "file:packages/icon",
-      "requires": {
-        "@lion/core": "^0.24.0",
+        "@bundled-es-modules/message-format": "^6.0.4",
+        "@open-wc/dedupe-mixin": "^1.3.1",
+        "@open-wc/scoped-elements": "^2.1.3",
+        "autosize": "4.0.2",
+        "awesome-phonenumber": "^3.0.1",
+        "ibantools": "^2.2.0",
+        "lit": "^2.4.0",
         "singleton-manager": "^1.5.0"
       }
     },
-    "@lion/input": {
-      "version": "file:packages/input",
-      "requires": {
-        "@lion/form-core": "^0.18.0"
-      }
-    },
-    "@lion/input-amount": {
-      "version": "file:packages/input-amount",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0",
-        "@lion/validate-messages": "^0.10.1"
-      }
-    },
-    "@lion/input-date": {
-      "version": "file:packages/input-date",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0",
-        "@lion/validate-messages": "^0.10.1"
-      }
-    },
-    "@lion/input-datepicker": {
-      "version": "file:packages/input-datepicker",
-      "requires": {
-        "@lion/calendar": "^0.20.1",
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input-date": "^0.15.1",
-        "@lion/localize": "^0.26.0",
-        "@lion/overlays": "^0.33.2",
-        "@lion/validate-messages": "^0.10.1"
-      }
-    },
-    "@lion/input-email": {
-      "version": "file:packages/input-email",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0",
-        "@lion/validate-messages": "^0.10.1"
-      }
-    },
-    "@lion/input-iban": {
-      "version": "file:packages/input-iban",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0",
-        "@lion/validate-messages": "^0.10.1",
-        "ibantools": "^2.2.0"
-      }
-    },
-    "@lion/input-range": {
-      "version": "file:packages/input-range",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/input-stepper": {
-      "version": "file:packages/input-stepper",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0"
-      }
-    },
-    "@lion/input-tel": {
-      "version": "file:packages/input-tel",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0",
-        "@lion/localize": "^0.26.0",
-        "awesome-phonenumber": "^3.0.1"
-      }
-    },
-    "@lion/input-tel-dropdown": {
-      "version": "file:packages/input-tel-dropdown",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/input-tel": "^0.2.3",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/listbox": {
-      "version": "file:packages/listbox",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3"
-      }
-    },
-    "@lion/localize": {
-      "version": "file:packages/localize",
-      "requires": {
-        "@bundled-es-modules/message-format": "6.0.4",
-        "@lion/core": "^0.24.0",
-        "singleton-manager": "^1.5.0"
-      }
-    },
-    "@lion/overlays": {
-      "version": "file:packages/overlays",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@popperjs/core": "^2.5.4",
-        "singleton-manager": "^1.5.0"
-      }
-    },
-    "@lion/pagination": {
-      "version": "file:packages/pagination",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/progress-indicator": {
-      "version": "file:packages/progress-indicator",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/localize": "^0.26.0"
-      }
-    },
-    "@lion/radio-group": {
-      "version": "file:packages/radio-group",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/input": "^0.18.0"
-      }
-    },
-    "@lion/select": {
-      "version": "file:packages/select",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3"
-      }
-    },
-    "@lion/select-rich": {
-      "version": "file:packages/select-rich",
-      "requires": {
-        "@lion/button": "^0.18.1",
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@lion/listbox": "^0.14.1",
-        "@lion/overlays": "^0.33.2"
-      }
-    },
-    "@lion/steps": {
-      "version": "file:packages/steps",
-      "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
-    "@lion/switch": {
-      "version": "file:packages/switch",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3"
-      }
-    },
-    "@lion/tabs": {
-      "version": "file:packages/tabs",
-      "requires": {
-        "@lion/core": "^0.24.0"
-      }
-    },
-    "@lion/textarea": {
-      "version": "file:packages/textarea",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/form-core": "^0.18.3",
-        "@types/autosize": "^3.0.7",
-        "autosize": "4.0.2"
-      },
-      "dependencies": {
-        "autosize": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
-          "integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
-        }
-      }
-    },
-    "@lion/tooltip": {
-      "version": "file:packages/tooltip",
-      "requires": {
-        "@lion/core": "^0.24.0",
-        "@lion/overlays": "^0.33.2"
-      }
-    },
-    "@lion/validate-messages": {
-      "version": "file:packages/validate-messages",
-      "requires": {
-        "@lion/form-core": "^0.18.3",
-        "@lion/input-tel": "^0.2.3",
-        "@lion/localize": "^0.26.0"
-      }
-    },
     "@lit/reactive-element": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.4.1.tgz",
@@ -26921,7 +26501,8 @@
     "@popperjs/core": {
       "version": "2.11.6",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
+      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "dev": true
     },
     "@rocket/blog": {
       "version": "0.4.0",
@@ -27456,14 +27037,6 @@
       "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
       "dev": true
     },
-    "@types/autosize": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/autosize/-/autosize-3.0.7.tgz",
-      "integrity": "sha512-D46m3aBNg81QKk9ZigmDFuhXUkD4IpBSrkGUKpYo2QBETbUjqEe8msXNCcECaXLXv1O4ppdMpizgFRzpfrgOxA==",
-      "requires": {
-        "@types/jquery": "*"
-      }
-    },
     "@types/babel__code-frame": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/babel__code-frame/-/babel__code-frame-7.0.3.tgz",
@@ -27775,14 +27348,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "requires": {
-        "@types/sizzle": "*"
-      }
-    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -28029,11 +27594,6 @@
       "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==",
       "dev": true
     },
-    "@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="
-    },
     "@types/trusted-types": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
@@ -29211,6 +28771,11 @@
       "integrity": "sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==",
       "dev": true
     },
+    "autosize": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
+      "integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
+    },
     "awesome-phonenumber": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-3.4.0.tgz",
@@ -32343,14 +31908,15 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
     },
     "eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
+      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/config-array": "^0.11.6",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -32366,14 +31932,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
+        "glob-parent": "^6.0.2",
         "globals": "^13.15.0",
-        "globby": "^11.1.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -32450,20 +32016,6 @@
             "type-fest": "^0.20.2"
           }
         },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
         "import-fresh": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -34351,6 +33903,12 @@
       "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
       "dev": true
     },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
diff --git a/package.json b/package.json
index 6d9296bd5..769d717ea 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
     "format:prettier": "prettier \"**/*.{js,md}\" \"packages/*/package.json\" \"package.json\" --write",
     "postinstall": "npm run custom-elements-manifest",
     "lint": "run-p lint:*",
+    "lint-disabled:types": "tsc",
     "lint:eslint": "eslint --ext .js,.html .",
-    "lint:markdownlint": "git ls-files '*.md' | xargs markdownlint --ignore '{.github/**/*.md,.changeset/*.md,**/CHANGELOG.md}'",
+    "lint:markdownlint": "git ls-files '*.md' | xargs markdownlint --ignore '{.github/**/*.md,.changeset/*.md,**/CHANGELOG.md,packages/ui/_legacy-changelogs/*.md}'",
     "lint:prettier": "prettier \"**/*.js\" --list-different || (echo '↑↑ these files are not prettier formatted ↑↑' && exit 1)",
-    "lint:types": "tsc",
     "lint:versions": "node ./scripts/lint-versions.js",
     "prepare": "husky install",
     "release": "npm run build:types && changeset publish",
@@ -70,9 +70,9 @@
     "concurrently": "^5.2.0",
     "cross-env": "^7.0.2",
     "es6-promisify": "^6.1.1",
-    "eslint": "^8.5.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-lit": "^1.6.1",
     "eslint-plugin-lit-a11y": "^2.2.0",
     "eslint-plugin-wc": "^1.3.2",
@@ -102,12 +102,8 @@
   },
   "bundlesize": [
     {
-      "path": "./bundlesize/dist/core/*.js",
-      "maxSize": "13 kB"
-    },
-    {
-      "path": "./bundlesize/dist/all/*.js",
-      "maxSize": "60 kB"
+      "path": "./bundlesize/dist/*/*.js",
+      "maxSize": "20 kB"
     }
   ],
   "prettier": {
diff --git a/packages-node/providence-analytics/dashboard/src/app/styles/global.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/global.css.js
index 4817474e4..eca6f2282 100644
--- a/packages-node/providence-analytics/dashboard/src/app/styles/global.css.js
+++ b/packages-node/providence-analytics/dashboard/src/app/styles/global.css.js
@@ -1,4 +1,5 @@
-import { css } from 'lit-element';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { css } from 'lit';
 
 export const global = css`
   :host {
diff --git a/packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
index 67909619f..06de4ff40 100644
--- a/packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
+++ b/packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
@@ -1,4 +1,5 @@
-import { css } from 'lit-element';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { css } from 'lit';
 
 // Decoration of white label component 'c-table', which is consumed by webcomponent 'p-table'
 
diff --git a/packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js
index 8d4cda5a1..f95603af2 100644
--- a/packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js
+++ b/packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js
@@ -1,4 +1,5 @@
-import { css } from 'lit-element';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { css } from 'lit';
 
 export const tooltip = css`
   .c-tooltip {
diff --git a/packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js
index 1c02a7ed2..e2710a84e 100644
--- a/packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js
+++ b/packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js
@@ -1,4 +1,5 @@
-import { css } from 'lit-element';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { css } from 'lit';
 
 export const utils = css`
   .u-bold {
diff --git a/packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js b/packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
index db9865889..6905eba73 100644
--- a/packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
+++ b/packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
@@ -1,4 +1,5 @@
-import { css } from 'lit-element';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { css } from 'lit';
 
 export const tooltipComponentStyles = css`
   .c-tooltip {
diff --git a/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js b/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js
index 6bb7fd078..a1da345c9 100644
--- a/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js
+++ b/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js
@@ -371,7 +371,6 @@ describe('Analyzer "match-imports"', () => {
         mockTargetAndReferenceProject(searchTargetProject, referenceProject);
         await providence(matchImportsQueryConfig, _providenceCfg);
         const queryResult = queryResults[0];
-        // console.log(JSON.stringify(queryResult.queryOutput, null, 2));
         expectedExportIdsDirect.forEach(directId => {
           expect(
             queryResult.queryOutput.find(
diff --git a/packages/accordion/README.md b/packages/accordion/README.md
deleted file mode 100644
index 6f37140f2..000000000
--- a/packages/accordion/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Accordion
-
-[=> See Source <=](../../docs/components/accordion/overview.md)
diff --git a/packages/accordion/docs/overview.md b/packages/accordion/docs/overview.md
deleted file mode 100644
index ef408f241..000000000
--- a/packages/accordion/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Accordion Overview
-
-[=> See Source <=](../../../docs/components/accordion/overview.md)
diff --git a/packages/accordion/docs/reference.md b/packages/accordion/docs/reference.md
deleted file mode 100644
index ea691931e..000000000
--- a/packages/accordion/docs/reference.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Accordion Reference
-
-[=> See Source <=](../../../docs/components/accordion/reference.md)
diff --git a/packages/accordion/docs/use-cases.md b/packages/accordion/docs/use-cases.md
deleted file mode 100644
index 77614c515..000000000
--- a/packages/accordion/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Accordion Use Cases
-
-[=> See Source <=](../../../docs/components/accordion/use-cases.md)
diff --git a/packages/accordion/index.js b/packages/accordion/index.js
deleted file mode 100644
index 275dd49aa..000000000
--- a/packages/accordion/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionAccordion } from './src/LionAccordion.js';
diff --git a/packages/button/README.md b/packages/button/README.md
deleted file mode 100644
index 238ef7eca..000000000
--- a/packages/button/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Button
-
-[=> See Source <=](../../docs/components/button/overview.md)
diff --git a/packages/button/define.js b/packages/button/define.js
deleted file mode 100644
index ac8c3df63..000000000
--- a/packages/button/define.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import '@lion/button/define-button';
-import '@lion/button/define-button-reset';
-import '@lion/button/define-button-submit';
diff --git a/packages/button/docs/assets/icon.svg.js b/packages/button/docs/assets/icon.svg.js
deleted file mode 100644
index fa20ca7d3..000000000
--- a/packages/button/docs/assets/icon.svg.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @param {Function} tag
- */
-export default tag =>
-  tag`<svg focusable="false" style="width: 24px; height: 24px;" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><g><path d="M44.8,44.2c-0.3-0.1-6.9-2.3-10-8c-0.9-1.7-1.7-3.6-2.4-5.4c-1.4-3.4-2.7-6.6-4.6-6.8l0.1-1.9c3.1,0.2,4.5,3.8,6.2,7.9    c0.7,1.7,1.4,3.5,2.3,5.2c2.7,5.1,8.9,7.1,8.9,7.1L44.8,44.2z"/></g><g><path d="M19.8,61.7v-1.9c4.7,0,10.7-6.6,13.4-10.7c2.6-4,11.2-2.1,12.2-1.9l-0.4,1.8c-2.3-0.5-8.6-1.4-10.2,1.1    C32.7,53.4,25.9,61.7,19.8,61.7z"/></g><g><path d="M25.1,86.5l-0.3-1.9c6-0.9,6.9-9.7,7.6-16.8c0.2-1.9,0.4-3.6,0.6-5.1c1.4-7.4,11.6-10.3,12.1-10.4l0.5,1.8    c-0.1,0-9.6,2.7-10.7,8.9c-0.3,1.4-0.4,3.1-0.6,5C33.5,75.3,32.5,85.4,25.1,86.5z"/></g><g><path d="M45.8,25.4c-0.1-1.4-0.1-4.7,0.9-5.7c0.3-0.3,0.6-0.4,1-0.4v1.9c0.2,0,0.3-0.1,0.4-0.2c-0.3,0.4-0.5,2.4-0.4,4.4    L45.8,25.4z"/></g><g><path d="M43.6,28c-0.3-0.3-6.8-6.2-6.8-11.4c0-5,1.4-8.7,1.5-8.8L40,8.5c0,0-1.3,3.6-1.3,8.1c0,4.4,6.2,10,6.2,10L43.6,28z"/></g><g><path d="M54.6,54.5c0-2.7,0.8-13-0.3-13c-1.1,0-1.8-2.2-1.8-3.4c0-1.1,4.1-3.4,4.1-8.1c0-4.8-6.6-5.6-6.6-5.6s-6.6,0.8-6.6,5.6    c0,4.8,4.1,7,4.1,8.1c0,1.1-0.7,3.4-1.8,3.4c-1.1,0-0.3,10.4-0.3,13c0,2.7-5.3,7.7-5.3,17.2s5.9,19.5,9.9,19.5    c4.1,0,9.9-9.9,9.9-19.5S54.6,57.2,54.6,54.5z"/></g><g><path d="M50,92.2c-5,0-10.9-11.1-10.9-20.4c0-6.5,2.4-11,4-14c0.7-1.4,1.4-2.6,1.4-3.3c0-0.6-0.1-1.8-0.1-3.1    c-0.3-7.6-0.2-9.8,0.5-10.5c0.2-0.2,0.5-0.4,0.8-0.4c0.3-0.1,0.8-1.4,0.9-2.3c-0.1-0.2-0.5-0.6-0.8-1c-1.2-1.4-3.3-3.7-3.3-7.3    c0-5.5,7.1-6.5,7.4-6.5c0.1,0,0.2,0,0.2,0c0.3,0,7.4,1,7.4,6.5c0,3.6-2.1,5.9-3.3,7.3c-0.3,0.3-0.7,0.8-0.8,1    c0,0.9,0.6,2.2,0.9,2.3c0.3,0,0.6,0.1,0.8,0.4c0.7,0.8,0.8,2.9,0.5,10.5c-0.1,1.3-0.1,2.4-0.1,3.1c0,0.7,0.6,1.9,1.4,3.3    c1.6,3,4,7.5,4,14C60.9,81.1,55,92.2,50,92.2z M46.2,42.4c-0.3,1.4-0.1,6.5,0,9c0.1,1.3,0.1,2.5,0.1,3.2c0,1.2-0.7,2.4-1.6,4.1    c-1.6,3-3.7,7.1-3.7,13.1c0,9.4,5.7,18.5,9,18.5s9-9.2,9-18.5c0-6-2.2-10.1-3.7-13.1c-0.9-1.7-1.6-3-1.6-4.1    c0-0.7,0.1-1.8,0.1-3.2c0.1-2.5,0.3-7.6,0-9c-1.6-0.5-2.2-3.1-2.2-4.2c0-0.7,0.5-1.3,1.3-2.1c1.2-1.3,2.8-3.1,2.8-6    c0-3.6-4.8-4.5-5.6-4.6c-0.8,0.1-5.6,1.1-5.6,4.6c0,2.8,1.6,4.7,2.8,6c0.7,0.8,1.3,1.4,1.3,2.1C48.4,39.3,47.8,41.9,46.2,42.4z"/></g><g><path d="M55.2,44.2l-0.6-1.8c0.1,0,6.2-2.1,9-7.1c0.9-1.7,1.6-3.4,2.3-5.2c1.7-4.2,3.2-7.7,6.2-7.9l0.1,1.9    c-1.9,0.1-3.2,3.3-4.6,6.8c-0.7,1.8-1.5,3.6-2.4,5.4C62.1,41.9,55.4,44.1,55.2,44.2z"/></g><g><path d="M80.2,61.7c-6.1,0-12.9-8.4-15-11.6c-1.6-2.5-8-1.6-10.2-1.1l-0.4-1.8c1-0.2,9.6-2.1,12.2,1.9c2.7,4.1,8.7,10.7,13.4,10.7    V61.7z"/></g><g><path d="M74.9,86.5c-7.4-1.1-8.5-11.2-9.2-18.5c-0.2-1.8-0.4-3.6-0.6-5c-1.1-6.3-10.6-8.9-10.7-8.9l0.5-1.8    c0.4,0.1,10.7,3,12.1,10.4c0.3,1.5,0.4,3.2,0.6,5.1c0.7,7.1,1.6,16,7.6,16.9L74.9,86.5z"/></g><g><path d="M54.2,25.4l-1.9-0.1c0.1-1.9-0.1-4-0.4-4.4c0,0,0.2,0.2,0.4,0.2v-1.9c0.4,0,0.7,0.2,1,0.4C54.3,20.7,54.3,24.1,54.2,25.4z    "/></g><g><path d="M56.4,28l-1.3-1.4c0.1-0.1,6.2-5.7,6.2-10c0-4.6-1.3-8.1-1.3-8.1l1.8-0.7c0.1,0.2,1.5,3.9,1.5,8.8    C63.2,21.8,56.6,27.8,56.4,28z"/></g></g></svg>`;
diff --git a/packages/button/docs/overview.md b/packages/button/docs/overview.md
deleted file mode 100644
index 5e12b3e04..000000000
--- a/packages/button/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Button Overview
-
-[=> See Source <=](../../../docs/components/button/overview.md)
diff --git a/packages/button/docs/use-cases.md b/packages/button/docs/use-cases.md
deleted file mode 100644
index 37b37cc43..000000000
--- a/packages/button/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Button Use Cases
-
-[=> See Source <=](../../../docs/components/button/use-cases.md)
diff --git a/packages/button/index.js b/packages/button/index.js
deleted file mode 100644
index f6db48991..000000000
--- a/packages/button/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { LionButton } from './src/LionButton.js';
-export { LionButtonReset } from './src/LionButtonReset.js';
-export { LionButtonSubmit } from './src/LionButtonSubmit.js';
diff --git a/packages/button/package.json b/packages/button/package.json
deleted file mode 100644
index d2ed7a8f9..000000000
--- a/packages/button/package.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "@lion/button",
-  "version": "0.18.1",
-  "description": "A button that is easily styleable and accessible in all contexts",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/button"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group button",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group button",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group button",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group button"
-  },
-  "sideEffects": [
-    "lion-button.js",
-    "lion-button-reset.js",
-    "lion-button-submit.js",
-    "define.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0"
-  },
-  "keywords": [
-    "button",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define-button": "./lion-button.js",
-    "./define-button-reset": "./lion-button-reset.js",
-    "./define-button-submit": "./lion-button-submit.js",
-    "./define": "./define.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/calendar/README.md b/packages/calendar/README.md
deleted file mode 100644
index 23a0472e1..000000000
--- a/packages/calendar/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Calendar
-
-[=> See Source <=](../../docs/components/calendar/overview.md)
diff --git a/packages/calendar/docs/overview.md b/packages/calendar/docs/overview.md
deleted file mode 100644
index 336abec20..000000000
--- a/packages/calendar/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Calendar Overview
-
-[=> See Source <=](../../../docs/components/calendar/overview.md)
diff --git a/packages/calendar/docs/use-cases.md b/packages/calendar/docs/use-cases.md
deleted file mode 100644
index ebb57a1ec..000000000
--- a/packages/calendar/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Calendar Use Cases
-
-[=> See Source <=](../../../docs/components/calendar/use-cases.md)
diff --git a/packages/calendar/index.js b/packages/calendar/index.js
deleted file mode 100644
index 21535bbde..000000000
--- a/packages/calendar/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { isSameDate } from './src/utils/isSameDate.js';
-export { LionCalendar } from './src/LionCalendar.js';
diff --git a/packages/calendar/package.json b/packages/calendar/package.json
deleted file mode 100644
index a022c1520..000000000
--- a/packages/calendar/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "@lion/calendar",
-  "version": "0.20.1",
-  "description": "Standalone calendar",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/calendar"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group calendar",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group calendar",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group calendar",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group calendar"
-  },
-  "sideEffects": [
-    "lion-calendar.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "calendar",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-calendar.js",
-    "./translations/*": "./translations/*",
-    "./test-helpers": "./test-helpers/index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/calendar/test-helpers/index.js b/packages/calendar/test-helpers/index.js
deleted file mode 100644
index b5b63f7d0..000000000
--- a/packages/calendar/test-helpers/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { CalendarObject } from './CalendarObject.js';
-export { DayObject } from './DayObject.js';
-export { weekdayNames } from './weekdayNames.js';
diff --git a/packages/checkbox-group/README.md b/packages/checkbox-group/README.md
deleted file mode 100644
index 844dfc415..000000000
--- a/packages/checkbox-group/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Checkbox Group
-
-[=> See Source <=](../../docs/components/checkbox-group/overview.md)
diff --git a/packages/checkbox-group/define.js b/packages/checkbox-group/define.js
deleted file mode 100644
index a4ed79c2d..000000000
--- a/packages/checkbox-group/define.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import '@lion/checkbox-group/define-checkbox';
-import '@lion/checkbox-group/define-checkbox-group';
-import '@lion/checkbox-group/define-checkbox-indeterminate';
diff --git a/packages/checkbox-group/docs/overview.md b/packages/checkbox-group/docs/overview.md
deleted file mode 100644
index 704934cec..000000000
--- a/packages/checkbox-group/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Checkbox Group Overview
-
-[=> See Source <=](../../../docs/components/checkbox-group/overview.md)
diff --git a/packages/checkbox-group/docs/use-cases.md b/packages/checkbox-group/docs/use-cases.md
deleted file mode 100644
index 8c04f48f3..000000000
--- a/packages/checkbox-group/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Checkbox Group Use Cases
-
-[=> See Source <=](../../../docs/components/checkbox-group/use-cases.md)
diff --git a/packages/checkbox-group/index.js b/packages/checkbox-group/index.js
deleted file mode 100644
index c07ad86a5..000000000
--- a/packages/checkbox-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { LionCheckboxGroup } from './src/LionCheckboxGroup.js';
-export { LionCheckboxIndeterminate } from './src/LionCheckboxIndeterminate.js';
-export { LionCheckbox } from './src/LionCheckbox.js';
diff --git a/packages/checkbox-group/package.json b/packages/checkbox-group/package.json
deleted file mode 100644
index cfcd2e113..000000000
--- a/packages/checkbox-group/package.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "name": "@lion/checkbox-group",
-  "version": "0.21.1",
-  "description": "A container for multiple checkboxes",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/checkbox-group"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group checkbox-group",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group checkbox-group",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group checkbox-group",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group checkbox-group"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-checkbox.js",
-    "lion-checkbox-group.js",
-    "lion-checkbox-indeterminate.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0"
-  },
-  "keywords": [
-    "checkbox-group",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define-checkbox": "./lion-checkbox.js",
-    "./define-checkbox-group": "./lion-checkbox-group.js",
-    "./define-checkbox-indeterminate": "./lion-checkbox-indeterminate.js",
-    "./define": "./define.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js b/packages/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js
deleted file mode 100644
index e709c1975..000000000
--- a/packages/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@lion/checkbox-group/define-checkbox-indeterminate';
-import { runChoiceInputMixinSuite } from '@lion/form-core/test-suites';
-
-runChoiceInputMixinSuite({ tagString: 'lion-checkbox-indeterminate' });
diff --git a/packages/checkbox-group/test/lion-checkbox-integrations.test.js b/packages/checkbox-group/test/lion-checkbox-integrations.test.js
deleted file mode 100644
index af1668695..000000000
--- a/packages/checkbox-group/test/lion-checkbox-integrations.test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@lion/checkbox-group/define-checkbox';
-import { runChoiceInputMixinSuite } from '@lion/form-core/test-suites';
-
-runChoiceInputMixinSuite({ tagString: 'lion-checkbox' });
diff --git a/packages/collapsible/README.md b/packages/collapsible/README.md
deleted file mode 100644
index 4006c25cd..000000000
--- a/packages/collapsible/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Collapsible
-
-[=> See Source <=](../../docs/components/collapsible/overview.md)
diff --git a/packages/collapsible/docs/overview.md b/packages/collapsible/docs/overview.md
deleted file mode 100644
index 449f1373d..000000000
--- a/packages/collapsible/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Collapsible Overview
-
-[=> See Source <=](../../../docs/components/collapsible/overview.md)
diff --git a/packages/collapsible/docs/use-cases.md b/packages/collapsible/docs/use-cases.md
deleted file mode 100644
index 3830a502f..000000000
--- a/packages/collapsible/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Collapsible Use Cases
-
-[=> See Source <=](../../../docs/components/collapsible/use-cases.md)
diff --git a/packages/collapsible/index.js b/packages/collapsible/index.js
deleted file mode 100644
index bdfefc47b..000000000
--- a/packages/collapsible/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionCollapsible } from './src/LionCollapsible.js';
diff --git a/packages/collapsible/package.json b/packages/collapsible/package.json
deleted file mode 100644
index 59ff53c5a..000000000
--- a/packages/collapsible/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "@lion/collapsible",
-  "version": "0.9.1",
-  "description": "This component is a combination of a button (the invoker), a chunk of extra content.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/collapsible"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group collapsible",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group collapsible",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group collapsible",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group collapsible"
-  },
-  "sideEffects": [
-    "lion-collapsible.js",
-    "demo/applyDemoCollapsibleStyles.js",
-    "demo/custom-collapsible.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0"
-  },
-  "keywords": [
-    "collapsible",
-    "expandable",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-collapsible.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/combobox/README.md b/packages/combobox/README.md
deleted file mode 100644
index 8c4a5a48e..000000000
--- a/packages/combobox/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Combobox
-
-[=> See Source <=](../../docs/components/combobox/overview.md)
diff --git a/packages/combobox/docs/overview.md b/packages/combobox/docs/overview.md
deleted file mode 100644
index 7183758a8..000000000
--- a/packages/combobox/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Combobox Overview
-
-[=> See Source <=](../../../docs/components/combobox/overview.md)
diff --git a/packages/combobox/docs/use-cases.md b/packages/combobox/docs/use-cases.md
deleted file mode 100644
index 17297e581..000000000
--- a/packages/combobox/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Combobox Use Cases
-
-[=> See Source <=](../../../docs/components/combobox/use-cases.md)
diff --git a/packages/combobox/index.js b/packages/combobox/index.js
deleted file mode 100644
index d4ab8168e..000000000
--- a/packages/combobox/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionCombobox } from './src/LionCombobox.js';
diff --git a/packages/combobox/package.json b/packages/combobox/package.json
deleted file mode 100644
index 32bbdcf66..000000000
--- a/packages/combobox/package.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "name": "@lion/combobox",
-  "version": "0.11.1",
-  "description": "A widget made up of a single-line textbox and an associated pop-up listbox element",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/combobox"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group combobox",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group combobox",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group combobox",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group combobox"
-  },
-  "sideEffects": [
-    "lion-combobox.js",
-    "docs/demo-selection-display.js",
-    "docs/gh-combobox/gh-combobox.js",
-    "docs/gh-combobox/gh-button.js",
-    "docs/wa-combobox/wa-combobox.js",
-    "docs/md-combobox/md-combobox.js",
-    "docs/md-combobox/md-input.js",
-    "docs/md-combobox/style/md-ripple.js",
-    "docs/md-combobox/style/load-roboto.js",
-    "docs/google-combobox/google-combobox.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/listbox": "^0.14.1",
-    "@lion/overlays": "^0.33.2"
-  },
-  "keywords": [
-    "combobox",
-    "form",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-combobox.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/combobox/test/lion-combobox-integrations.test.js b/packages/combobox/test/lion-combobox-integrations.test.js
deleted file mode 100644
index 743b80f04..000000000
--- a/packages/combobox/test/lion-combobox-integrations.test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { runListboxMixinSuite } from '@lion/listbox/test-suites';
-import '@lion/combobox/define';
-
-runListboxMixinSuite({ tagString: 'lion-combobox' });
diff --git a/packages/core/README.md b/packages/core/README.md
deleted file mode 100644
index c81005266..000000000
--- a/packages/core/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Core
-
-[=> See Source <=](../../docs/fundamentals/systems/core/overview.md)
diff --git a/packages/core/docs/guides/how-to/create-a-custom-field.md b/packages/core/docs/guides/how-to/create-a-custom-field.md
deleted file mode 100644
index 1f0fc6ae1..000000000
--- a/packages/core/docs/guides/how-to/create-a-custom-field.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Create a custom field
-
-[=> See Source <=](../../../../../docs/guides/how-to/create-a-custom-field.md)
diff --git a/packages/core/docs/guides/how-to/extend-a-native-input.md b/packages/core/docs/guides/how-to/extend-a-native-input.md
deleted file mode 100644
index d70a9aa10..000000000
--- a/packages/core/docs/guides/how-to/extend-a-native-input.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extend a native input
-
-[=> See Source <=](../../../../../docs/guides/how-to/extend-a-native-input.md)
diff --git a/packages/core/docs/guides/how-to/get-started.md b/packages/core/docs/guides/how-to/get-started.md
deleted file mode 100644
index f848488da..000000000
--- a/packages/core/docs/guides/how-to/get-started.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Get Started
-
-[=> See Source <=](../../../../../docs/guides/how-to/get-started.md)
diff --git a/packages/core/docs/guides/how-to/index.md b/packages/core/docs/guides/how-to/index.md
deleted file mode 100644
index fc6105fff..000000000
--- a/packages/core/docs/guides/how-to/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# How To
-
-[=> See Source <=](../../../../../docs/guides/how-to/index.md)
diff --git a/packages/core/docs/guides/index.md b/packages/core/docs/guides/index.md
deleted file mode 100644
index 8e36eff09..000000000
--- a/packages/core/docs/guides/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Guides
-
-[=> See Source <=](../../../../docs/guides/index.md)
diff --git a/packages/core/docs/guides/principles/definitions-and-terms.md b/packages/core/docs/guides/principles/definitions-and-terms.md
deleted file mode 100644
index 3d0860a09..000000000
--- a/packages/core/docs/guides/principles/definitions-and-terms.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Definitions and Terms
-
-[=> See Source <=](../../../../../docs/guides/principles/definitions-and-terms.md)
diff --git a/packages/core/docs/guides/principles/index.md b/packages/core/docs/guides/principles/index.md
deleted file mode 100644
index 1be2e33d8..000000000
--- a/packages/core/docs/guides/principles/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Principles
-
-[=> See Source <=](../../../../../docs/guides/principles/index.md)
diff --git a/packages/core/docs/guides/principles/scoped-elements.md b/packages/core/docs/guides/principles/scoped-elements.md
deleted file mode 100644
index 872f63b68..000000000
--- a/packages/core/docs/guides/principles/scoped-elements.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Scoped Elements
-
-[=> See Source <=](../../../../../docs/guides/principles/scoped-elements.md)
diff --git a/packages/core/docs/guides/principles/styling.md b/packages/core/docs/guides/principles/styling.md
deleted file mode 100644
index 4594f8715..000000000
--- a/packages/core/docs/guides/principles/styling.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Styling
-
-[=> See Source <=](../../../../../docs/guides/principles/styling.md)
diff --git a/packages/core/docs/guides/principles/subclasser-apis.md b/packages/core/docs/guides/principles/subclasser-apis.md
deleted file mode 100644
index 37b2ea38d..000000000
--- a/packages/core/docs/guides/principles/subclasser-apis.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Subclasser apis
-
-[=> See Source <=](../../../../../docs/guides/principles/subclasser-apis.md)
diff --git a/packages/core/docs/overview.md b/packages/core/docs/overview.md
deleted file mode 100644
index 5e415b391..000000000
--- a/packages/core/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Core Overview
-
-[=> See Source <=](../../../docs/fundamentals/systems/core/overview.md)
diff --git a/packages/core/docs/rationales/side-effects.md b/packages/core/docs/rationales/side-effects.md
deleted file mode 100644
index 93412b0ae..000000000
--- a/packages/core/docs/rationales/side-effects.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Side Effects
-
-[=> See Source <=](../../../../docs/fundamentals/rationales/side-effects.md)
diff --git a/packages/core/index.js b/packages/core/index.js
deleted file mode 100644
index e2f070e29..000000000
--- a/packages/core/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-export {
-  html,
-  CSSResult,
-  adoptStyles,
-  css,
-  getCompatibleStyle,
-  supportsAdoptingStyleSheets,
-  unsafeCSS,
-  UpdatingElement,
-  notEqual,
-  ReactiveElement,
-  svg,
-  noChange,
-  nothing,
-  render,
-  LitElement,
-  defaultConverter,
-} from 'lit';
-
-export { html as staticHtml } from 'lit/static-html.js';
-
-export {
-  customElement,
-  property,
-  state,
-  eventOptions,
-  query,
-  queryAll,
-  queryAsync,
-  queryAssignedNodes,
-} from 'lit/decorators.js';
-
-export { directive, Directive } from 'lit/directive.js';
-
-export { AsyncDirective } from 'lit/async-directive.js';
-
-export {
-  isPrimitive,
-  TemplateResultType,
-  isTemplateResult,
-  isDirectiveResult,
-  getDirectiveClass,
-  isSingleExpression,
-  insertPart,
-  setChildPartValue,
-  setCommittedValue,
-  getCommittedValue,
-  removePart,
-  clearPart,
-} from 'lit/directive-helpers.js';
-
-export { asyncAppend } from 'lit/directives/async-append.js';
-export { asyncReplace } from 'lit/directives/async-replace.js';
-export { cache } from 'lit/directives/cache.js';
-export { classMap } from 'lit/directives/class-map.js';
-export { guard } from 'lit/directives/guard.js';
-export { ifDefined } from 'lit/directives/if-defined.js';
-export { live } from 'lit/directives/live.js';
-export { ref, createRef } from 'lit/directives/ref.js';
-export { repeat } from 'lit/directives/repeat.js';
-export { styleMap } from 'lit/directives/style-map.js';
-export { templateContent } from 'lit/directives/template-content.js';
-export { unsafeHTML } from 'lit/directives/unsafe-html.js';
-export { unsafeSVG } from 'lit/directives/unsafe-svg.js';
-export { until } from 'lit/directives/until.js';
-
-// open-wc
-export { ScopedElementsMixin } from '@open-wc/scoped-elements';
-export { dedupeMixin } from '@open-wc/dedupe-mixin';
-// ours
-export { DisabledMixin } from './src/DisabledMixin.js';
-export { DisabledWithTabIndexMixin } from './src/DisabledWithTabIndexMixin.js';
-export { ScopedStylesController } from './src/ScopedStylesController.js';
-export { SlotMixin } from './src/SlotMixin.js';
-export { browserDetection } from './src/browserDetection.js';
-export { EventTargetShim } from './src/EventTargetShim.js';
-export { uuid } from './src/uuid.js';
diff --git a/packages/core/package.json b/packages/core/package.json
deleted file mode 100644
index c0582e5de..000000000
--- a/packages/core/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "name": "@lion/core",
-  "version": "0.24.0",
-  "description": "Core functionality that is shared across all Lion Web Components",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/core"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "debug": "cd ../../ && npm run debug -- --group core",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group core",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group core",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs",
-    "test": "cd ../../ && npm run test:browser -- --group core"
-  },
-  "sideEffects": false,
-  "dependencies": {
-    "@open-wc/dedupe-mixin": "^1.3.0",
-    "@open-wc/scoped-elements": "^2.1.1",
-    "lit": "^2.0.2"
-  },
-  "keywords": [
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/dialog/README.md b/packages/dialog/README.md
deleted file mode 100644
index 3616a4703..000000000
--- a/packages/dialog/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Dialog
-
-[=> See Source <=](../../docs/components/dialog/overview.md)
diff --git a/packages/dialog/docs/overview.md b/packages/dialog/docs/overview.md
deleted file mode 100644
index 691832a42..000000000
--- a/packages/dialog/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Dialog Overview
-
-[=> See Source <=](../../../docs/components/dialog/overview.md)
diff --git a/packages/dialog/docs/use-cases.md b/packages/dialog/docs/use-cases.md
deleted file mode 100644
index 963482e45..000000000
--- a/packages/dialog/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Dialog Use Cases
-
-[=> See Source <=](../../../docs/components/dialog/use-cases.md)
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
deleted file mode 100644
index 0cc7556d2..000000000
--- a/packages/dialog/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionDialog } from './src/LionDialog.js';
diff --git a/packages/dialog/package.json b/packages/dialog/package.json
deleted file mode 100644
index 63c535424..000000000
--- a/packages/dialog/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/dialog",
-  "version": "0.16.1",
-  "description": "Show relative overlay content on click, as a webcomponent",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/dialog"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group dialog",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group dialog",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group dialog",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group dialog"
-  },
-  "sideEffects": [
-    "lion-dialog.js",
-    "./docs/styled-dialog-content.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/overlays": "^0.33.2"
-  },
-  "keywords": [
-    "dialog",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-dialog.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/fieldset/README.md b/packages/fieldset/README.md
deleted file mode 100644
index 4e04735f6..000000000
--- a/packages/fieldset/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Fieldset
-
-[=> See Source <=](../../docs/components/fieldset/overview.md)
diff --git a/packages/fieldset/docs/helpers/demo-fieldset-child.js b/packages/fieldset/docs/helpers/demo-fieldset-child.js
deleted file mode 100644
index c91201980..000000000
--- a/packages/fieldset/docs/helpers/demo-fieldset-child.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { LionField } from '@lion/form-core';
-
-customElements.define(
-  'demo-fieldset-child',
-  class extends LionField {
-    get slots() {
-      return {
-        ...super.slots,
-        input: () => document.createElement('input'),
-      };
-    }
-  },
-);
diff --git a/packages/fieldset/docs/overview.md b/packages/fieldset/docs/overview.md
deleted file mode 100644
index 7ccb673a6..000000000
--- a/packages/fieldset/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Fieldset Overview
-
-[=> See Source <=](../../../docs/components/fieldset/overview.md)
diff --git a/packages/fieldset/docs/use-cases.md b/packages/fieldset/docs/use-cases.md
deleted file mode 100644
index 7a7d38cf1..000000000
--- a/packages/fieldset/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Fieldset Use Cases
-
-[=> See Source <=](../../../docs/components/fieldset/use-cases.md)
diff --git a/packages/fieldset/index.js b/packages/fieldset/index.js
deleted file mode 100644
index ea598fcfd..000000000
--- a/packages/fieldset/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionFieldset } from './src/LionFieldset.js';
diff --git a/packages/fieldset/package.json b/packages/fieldset/package.json
deleted file mode 100644
index 1641673eb..000000000
--- a/packages/fieldset/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/fieldset",
-  "version": "0.22.1",
-  "description": "Allows to groups multiple input fields or other fieldsets together",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/fieldset"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group fieldset",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group fieldset",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group fieldset",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group fieldset"
-  },
-  "sideEffects": [
-    "lion-fieldset.js",
-    "./docs/helpers/demo-fieldset-child.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3"
-  },
-  "keywords": [
-    "fieldset",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-fieldset.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/fieldset/test/lion-fieldset.test.js b/packages/fieldset/test/lion-fieldset.test.js
deleted file mode 100644
index ab0e31d8a..000000000
--- a/packages/fieldset/test/lion-fieldset.test.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { runFormGroupMixinSuite, runFormGroupMixinInputSuite } from '@lion/form-core/test-suites';
-
-import '@lion/fieldset/define';
-
-runFormGroupMixinSuite({ tagString: 'lion-fieldset' });
-runFormGroupMixinInputSuite({ tagString: 'lion-fieldset' });
diff --git a/packages/form-core/README.md b/packages/form-core/README.md
deleted file mode 100644
index f95c896a1..000000000
--- a/packages/form-core/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form Core
-
-[=> See Source <=](../../docs/fundamentals/systems/form/overview.md)
diff --git a/packages/form-core/define.js b/packages/form-core/define.js
deleted file mode 100644
index 4d8cf1248..000000000
--- a/packages/form-core/define.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@lion/form-core/define-field';
-import '@lion/form-core/define-validation-feedback';
diff --git a/packages/form-core/docs/overview.md b/packages/form-core/docs/overview.md
deleted file mode 100644
index 6be7ecdb4..000000000
--- a/packages/form-core/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Form Core Overview
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/overview.md)
diff --git a/packages/form-core/index.js b/packages/form-core/index.js
deleted file mode 100644
index e48c7f5d1..000000000
--- a/packages/form-core/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-export { FocusMixin } from './src/FocusMixin.js';
-export { FormatMixin } from './src/FormatMixin.js';
-export { FormControlMixin } from './src/FormControlMixin.js';
-export { InteractionStateMixin } from './src/InteractionStateMixin.js'; // applies FocusMixin
-export { LionField } from './src/LionField.js';
-export { FormRegisteringMixin } from './src/registration/FormRegisteringMixin.js';
-export { FormRegistrarMixin } from './src/registration/FormRegistrarMixin.js';
-export { FormRegistrarPortalMixin } from './src/registration/FormRegistrarPortalMixin.js';
-export { NativeTextFieldMixin } from './src/NativeTextFieldMixin.js';
-export { FormControlsCollection } from './src/registration/FormControlsCollection.js';
-
-// validate
-
-export { ValidateMixin } from './src/validate/ValidateMixin.js';
-export { Unparseable } from './src/validate/Unparseable.js';
-export { Validator } from './src/validate/Validator.js';
-export { ResultValidator } from './src/validate/ResultValidator.js';
-
-export { Required } from './src/validate/validators/Required.js';
-
-export {
-  IsString,
-  EqualsLength,
-  MinLength,
-  MaxLength,
-  MinMaxLength,
-  IsEmail,
-  Pattern,
-} from './src/validate/validators/StringValidators.js';
-
-export {
-  IsNumber,
-  MinNumber,
-  MaxNumber,
-  MinMaxNumber,
-} from './src/validate/validators/NumberValidators.js';
-
-export {
-  IsDate,
-  MinDate,
-  MaxDate,
-  MinMaxDate,
-  IsDateDisabled,
-} from './src/validate/validators/DateValidators.js';
-
-export { DefaultSuccess } from './src/validate/resultValidators/DefaultSuccess.js';
-
-export { LionValidationFeedback } from './src/validate/LionValidationFeedback.js';
-
-export { ChoiceGroupMixin } from './src/choice-group/ChoiceGroupMixin.js';
-export { ChoiceInputMixin } from './src/choice-group/ChoiceInputMixin.js';
-
-export { FormGroupMixin } from './src/form-group/FormGroupMixin.js';
diff --git a/packages/form-core/lion-validation-feedback.js b/packages/form-core/lion-validation-feedback.js
deleted file mode 100644
index b0a1f87f0..000000000
--- a/packages/form-core/lion-validation-feedback.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { LionValidationFeedback } from './src/validate/LionValidationFeedback.js';
-
-customElements.define('lion-validation-feedback', LionValidationFeedback);
diff --git a/packages/form-core/package.json b/packages/form-core/package.json
deleted file mode 100644
index 82f718bc2..000000000
--- a/packages/form-core/package.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "name": "@lion/form-core",
-  "version": "0.18.3",
-  "description": "Form-core contains all essential building blocks for creating form fields and fieldsets",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/field"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "test-suites",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group form-core",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group form-core",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group form-core",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group form-core"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-field.js",
-    "lion-validation-feedback.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "field",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./test-helpers": "./test-helpers/index.js",
-    "./test-suites": "./test-suites/index.js",
-    "./define": "./define.js",
-    "./define-field": "./lion-field.js",
-    "./define-validation-feedback": "./lion-validation-feedback.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/form-core/test-helpers/index.js b/packages/form-core/test-helpers/index.js
deleted file mode 100644
index 3b21d5670..000000000
--- a/packages/form-core/test-helpers/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './ExampleValidators.js';
-export * from './getFormControlMembers.js';
-export * from './mimicUserInput.js';
diff --git a/packages/form-core/test-suites/index.js b/packages/form-core/test-suites/index.js
deleted file mode 100644
index a8197c560..000000000
--- a/packages/form-core/test-suites/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export { runChoiceGroupMixinSuite } from './choice-group/ChoiceGroupMixin.suite.js';
-export { runChoiceInputMixinSuite } from './choice-group/ChoiceInputMixin.suite.js';
-export { runFormGroupMixinInputSuite } from './form-group/FormGroupMixin-input.suite.js';
-export { runFormGroupMixinSuite } from './form-group/FormGroupMixin.suite.js';
-export { runFormatMixinSuite } from './FormatMixin.suite.js';
-export { runRegistrationSuite } from './FormRegistrationMixins.suite.js';
-export { runInteractionStateMixinSuite } from './InteractionStateMixin.suite.js';
-export { runNativeTextFieldMixinSuite } from './NativeTextFieldMixin.suite.js';
-export { runValidateMixinSuite } from './ValidateMixin.suite.js';
-export { runValidateMixinFeedbackPart } from './ValidateMixinFeedbackPart.suite.js';
diff --git a/packages/form-core/test/choice-group/ChoiceGroupMixin.test.js b/packages/form-core/test/choice-group/ChoiceGroupMixin.test.js
deleted file mode 100644
index 15e9414a5..000000000
--- a/packages/form-core/test/choice-group/ChoiceGroupMixin.test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { runChoiceGroupMixinSuite } from '@lion/form-core/test-suites';
-
-runChoiceGroupMixinSuite();
diff --git a/packages/form-core/test/validate/ValidateMixin.test.js b/packages/form-core/test/validate/ValidateMixin.test.js
deleted file mode 100644
index 0ea7cf081..000000000
--- a/packages/form-core/test/validate/ValidateMixin.test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { runValidateMixinSuite } from '../../test-suites/ValidateMixin.suite.js';
-
-runValidateMixinSuite();
diff --git a/packages/form-core/test/validate/ValidateMixinFeedbackPart.test.js b/packages/form-core/test/validate/ValidateMixinFeedbackPart.test.js
deleted file mode 100644
index 5f2fa397b..000000000
--- a/packages/form-core/test/validate/ValidateMixinFeedbackPart.test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { runValidateMixinFeedbackPart } from '../../test-suites/ValidateMixinFeedbackPart.suite.js';
-
-runValidateMixinFeedbackPart();
diff --git a/packages/form-integrations/README.md b/packages/form-integrations/README.md
deleted file mode 100644
index 9c93ec310..000000000
--- a/packages/form-integrations/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System
-
-[=> See Source <=](../../docs/fundamentals/systems/form/overview.md)
diff --git a/packages/form-integrations/docs/formatting-and-parsing.md b/packages/form-integrations/docs/formatting-and-parsing.md
deleted file mode 100644
index 489876840..000000000
--- a/packages/form-integrations/docs/formatting-and-parsing.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Formatting And Parsing
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/formatting-and-parsing.md)
diff --git a/packages/form-integrations/docs/interaction-states.md b/packages/form-integrations/docs/interaction-states.md
deleted file mode 100644
index d470a57d3..000000000
--- a/packages/form-integrations/docs/interaction-states.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Interaction States
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/interaction-states.md)
diff --git a/packages/form-integrations/docs/model-value.md b/packages/form-integrations/docs/model-value.md
deleted file mode 100644
index d693fad55..000000000
--- a/packages/form-integrations/docs/model-value.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System model-value
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/model-value.md)
diff --git a/packages/form-integrations/docs/overview.md b/packages/form-integrations/docs/overview.md
deleted file mode 100644
index fd3173c81..000000000
--- a/packages/form-integrations/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Overview
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/overview.md)
diff --git a/packages/form-integrations/docs/styling.md b/packages/form-integrations/docs/styling.md
deleted file mode 100644
index fe4706021..000000000
--- a/packages/form-integrations/docs/styling.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Styling
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/styling.md)
diff --git a/packages/form-integrations/docs/use-cases.md b/packages/form-integrations/docs/use-cases.md
deleted file mode 100644
index 844f413c4..000000000
--- a/packages/form-integrations/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Use Cases
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/use-cases.md)
diff --git a/packages/form-integrations/docs/validate.md b/packages/form-integrations/docs/validate.md
deleted file mode 100644
index 829be5fe7..000000000
--- a/packages/form-integrations/docs/validate.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Form System Validate
-
-[=> See Source <=](../../../docs/fundamentals/systems/form/validate.md)
diff --git a/packages/form-integrations/package.json b/packages/form-integrations/package.json
deleted file mode 100644
index ee4ae2b13..000000000
--- a/packages/form-integrations/package.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "name": "@lion/form-integrations",
-  "version": "0.12.1",
-  "description": "The Form System allows you to create complex forms with various validation in an easy way",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/form-integrations"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "debug": "cd ../../ && npm run debug -- --group form-integrations",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group form-integrations",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group form-integrations",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/form/assets",
-    "prepublishOnly": "npm run publish-docs",
-    "test": "cd ../../ && npm run test:browser -- --group form-integrations"
-  },
-  "dependencies": {
-    "@lion/button": "^0.18.1",
-    "@lion/checkbox-group": "^0.21.1",
-    "@lion/combobox": "^0.11.1",
-    "@lion/core": "^0.24.0",
-    "@lion/fieldset": "^0.22.1",
-    "@lion/form": "^0.15.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/input-amount": "^0.18.0",
-    "@lion/input-date": "^0.15.1",
-    "@lion/input-datepicker": "^0.26.1",
-    "@lion/input-email": "^0.16.1",
-    "@lion/input-iban": "^0.19.1",
-    "@lion/input-range": "^0.13.1",
-    "@lion/input-stepper": "^0.9.1",
-    "@lion/listbox": "^0.14.1",
-    "@lion/localize": "^0.26.0",
-    "@lion/radio-group": "^0.21.1",
-    "@lion/select": "^0.17.1",
-    "@lion/select-rich": "^0.31.1",
-    "@lion/switch": "^0.21.2",
-    "@lion/textarea": "^0.16.1",
-    "@lion/validate-messages": "^0.10.1"
-  },
-  "keywords": [
-    "form",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/form/README.md b/packages/form/README.md
deleted file mode 100644
index c2295d3d3..000000000
--- a/packages/form/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Form
-
-[=> See Source <=](../../docs/components/form/overview.md)
diff --git a/packages/form/docs/overview.md b/packages/form/docs/overview.md
deleted file mode 100644
index cbc922b58..000000000
--- a/packages/form/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Form Overview
-
-[=> See Source <=](../../../docs/components/form/overview.md)
diff --git a/packages/form/docs/use-cases.md b/packages/form/docs/use-cases.md
deleted file mode 100644
index 01ffa936e..000000000
--- a/packages/form/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Form Use Cases
-
-[=> See Source <=](../../../docs/components/form/use-cases.md)
diff --git a/packages/form/index.js b/packages/form/index.js
deleted file mode 100644
index 8aff89803..000000000
--- a/packages/form/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionForm } from './src/LionForm.js';
diff --git a/packages/form/package.json b/packages/form/package.json
deleted file mode 100644
index f877bfdd5..000000000
--- a/packages/form/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "name": "@lion/form",
-  "version": "0.15.0",
-  "description": "It enhances the functionality of the native `form` component. It is designed to interact with (instances of) form fields",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/form"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group form",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group form",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group form",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group form"
-  },
-  "sideEffects": [
-    "lion-form.js"
-  ],
-  "dependencies": {
-    "@lion/fieldset": "^0.22.0"
-  },
-  "keywords": [
-    "form",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-form.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/helpers/README.md b/packages/helpers/README.md
deleted file mode 100644
index 910e8b4cb..000000000
--- a/packages/helpers/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Helpers
-
-[=> See Source <=](../../docs/fundamentals/tools/helpers/overview.md)
diff --git a/packages/helpers/define.js b/packages/helpers/define.js
deleted file mode 100644
index 330297334..000000000
--- a/packages/helpers/define.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@lion/helpers/define-sb-action-logger';
-import '@lion/helpers/define-sb-locale-switcher';
diff --git a/packages/helpers/docs/action-logger.md b/packages/helpers/docs/action-logger.md
deleted file mode 100644
index 7650a9776..000000000
--- a/packages/helpers/docs/action-logger.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Action Logger
-
-[=> See Source <=](../../../docs/fundamentals/tools/helpers/action-logger.md)
diff --git a/packages/helpers/docs/overview.md b/packages/helpers/docs/overview.md
deleted file mode 100644
index 5db2b6e68..000000000
--- a/packages/helpers/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Helpers
-
-[=> See Source <=](../../../docs/fundamentals/tools/helpers/overview.md)
diff --git a/packages/helpers/index.js b/packages/helpers/index.js
deleted file mode 100644
index b00e4c480..000000000
--- a/packages/helpers/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Utilities
-export { renderLitAsNode } from './renderLitAsNode/src/renderLitAsNode.js';
-export { sortEachDepth } from './sortEachDepth/src/sortEachDepth.js';
-
-// Components
-export { SbActionLogger } from './sb-action-logger/src/SbActionLogger.js';
-export { SbLocaleSwitcher } from './sb-locale-switcher/src/SbLocaleSwitcher.js';
diff --git a/packages/helpers/package.json b/packages/helpers/package.json
deleted file mode 100644
index 401f3798f..000000000
--- a/packages/helpers/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/helpers",
-  "version": "0.12.1",
-  "description": "Helpers that are used throughout lion and can be used outside",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/helpers"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "renderLitAsNode",
-    "sb-action-logger",
-    "sb-locale-switcher",
-    "sortEachDepth"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group helpers",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group helpers",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group helpers",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group helpers"
-  },
-  "sideEffects": [
-    "define.js",
-    "sb-action-logger.js",
-    "sb-locale-switcher.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0"
-  },
-  "keywords": [
-    "action logger",
-    "helpers",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./define-sb-action-logger": "./sb-action-logger.js",
-    "./define-sb-locale-switcher": "./sb-locale-switcher.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/helpers/sb-action-logger.js b/packages/helpers/sb-action-logger.js
deleted file mode 100644
index 872ef5678..000000000
--- a/packages/helpers/sb-action-logger.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { SbActionLogger } from './sb-action-logger/src/SbActionLogger.js';
-
-window.customElements.define('sb-action-logger', SbActionLogger);
diff --git a/packages/helpers/sb-locale-switcher.js b/packages/helpers/sb-locale-switcher.js
deleted file mode 100644
index b69598f0c..000000000
--- a/packages/helpers/sb-locale-switcher.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { SbLocaleSwitcher } from './sb-locale-switcher/src/SbLocaleSwitcher.js';
-
-window.customElements.define('sb-locale-switcher', SbLocaleSwitcher);
diff --git a/packages/icon/README.md b/packages/icon/README.md
deleted file mode 100644
index 15d9f8cbb..000000000
--- a/packages/icon/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Icon
-
-[=> See Source <=](../../docs/components/icon/overview.md)
diff --git a/packages/icon/docs/overview.md b/packages/icon/docs/overview.md
deleted file mode 100644
index 1f764db89..000000000
--- a/packages/icon/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Icon Overview
-
-[=> See Source <=](../../../docs/components/icon/overview.md)
diff --git a/packages/icon/docs/system.md b/packages/icon/docs/system.md
deleted file mode 100644
index 46fc5055e..000000000
--- a/packages/icon/docs/system.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Icon System
-
-[=> See Source <=](../../../docs/fundamentals/systems/icon/overview.md)
diff --git a/packages/icon/docs/use-cases.md b/packages/icon/docs/use-cases.md
deleted file mode 100644
index 0dcd732f8..000000000
--- a/packages/icon/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Icon Use Cases
-
-[=> See Source <=](../../../docs/components/icon/use-cases.md)
diff --git a/packages/icon/index.js b/packages/icon/index.js
deleted file mode 100644
index 8e5b74b4c..000000000
--- a/packages/icon/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { LionIcon } from './src/LionIcon.js';
-export { IconManager } from './src/IconManager.js';
-export { icons, setIcons } from './src/icons.js';
diff --git a/packages/icon/package.json b/packages/icon/package.json
deleted file mode 100644
index a9220a800..000000000
--- a/packages/icon/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/icon",
-  "version": "0.16.1",
-  "description": "A web component easily displaying svg icons",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/icon"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group icon",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group icon",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group icon",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/components/icon/assets",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group icon"
-  },
-  "sideEffects": [
-    "lion-icon.js",
-    "./docs/icon-resolvers.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "singleton-manager": "^1.5.0"
-  },
-  "keywords": [
-    "icon",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-icon.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-amount/README.md b/packages/input-amount/README.md
deleted file mode 100644
index ea4253df8..000000000
--- a/packages/input-amount/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Amount
-
-[=> See Source <=](../../docs/components/input-amount/overview.md)
diff --git a/packages/input-amount/docs/overview.md b/packages/input-amount/docs/overview.md
deleted file mode 100644
index a84c1619f..000000000
--- a/packages/input-amount/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Amount Overview
-
-[=> See Source <=](../../../docs/components/input-amount/overview.md)
diff --git a/packages/input-amount/docs/use-cases.md b/packages/input-amount/docs/use-cases.md
deleted file mode 100644
index 5610c018c..000000000
--- a/packages/input-amount/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Amount Use Cases
-
-[=> See Source <=](../../../docs/components/input-amount/use-cases.md)
diff --git a/packages/input-amount/index.js b/packages/input-amount/index.js
deleted file mode 100644
index 49392cafc..000000000
--- a/packages/input-amount/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { LionInputAmount } from './src/LionInputAmount.js';
-export { formatAmount } from './src/formatters.js';
-export { parseAmount } from './src/parsers.js';
-export { preprocessAmount } from './src/preprocessors.js';
diff --git a/packages/input-amount/package.json b/packages/input-amount/package.json
deleted file mode 100644
index 2a5c6509a..000000000
--- a/packages/input-amount/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@lion/input-amount",
-  "version": "0.18.0",
-  "description": "Provide a way for users to fill in an amount",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-amount"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-amount",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-amount",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-amount",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-amount"
-  },
-  "sideEffects": [
-    "lion-input-amount.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0",
-    "@lion/validate-messages": "^0.10.1"
-  },
-  "keywords": [
-    "input-amount",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-amount.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-date/README.md b/packages/input-date/README.md
deleted file mode 100644
index d3c534d6b..000000000
--- a/packages/input-date/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date
-
-[=> See Source <=](../../docs/components/input-date/overview.md)
diff --git a/packages/input-date/docs/overview.md b/packages/input-date/docs/overview.md
deleted file mode 100644
index a8e655e94..000000000
--- a/packages/input-date/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date Overview
-
-[=> See Source <=](../../../docs/components/input-date/overview.md)
diff --git a/packages/input-date/docs/use-cases.md b/packages/input-date/docs/use-cases.md
deleted file mode 100644
index 0a940a783..000000000
--- a/packages/input-date/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date Use Cases
-
-[=> See Source <=](../../../docs/components/input-date/use-cases.md)
diff --git a/packages/input-date/index.js b/packages/input-date/index.js
deleted file mode 100644
index 9d8bc91c9..000000000
--- a/packages/input-date/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionInputDate } from './src/LionInputDate.js';
diff --git a/packages/input-date/package.json b/packages/input-date/package.json
deleted file mode 100644
index e658c72c1..000000000
--- a/packages/input-date/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@lion/input-date",
-  "version": "0.15.1",
-  "description": "Provide a way for users to fill in a date",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-date"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-date",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-date",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-date",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-date"
-  },
-  "sideEffects": [
-    "lion-input-date.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0",
-    "@lion/validate-messages": "^0.10.1"
-  },
-  "keywords": [
-    "input-date",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-date.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-datepicker/README.md b/packages/input-datepicker/README.md
deleted file mode 100644
index 87605983f..000000000
--- a/packages/input-datepicker/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date Picker
-
-[=> See Source <=](../../docs/components/input-datepicker/overview.md)
diff --git a/packages/input-datepicker/docs/overview.md b/packages/input-datepicker/docs/overview.md
deleted file mode 100644
index 8e20bf3f5..000000000
--- a/packages/input-datepicker/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date Picker Overview
-
-[=> See Source <=](../../../docs/components/input-datepicker/overview.md)
diff --git a/packages/input-datepicker/docs/use-cases.md b/packages/input-datepicker/docs/use-cases.md
deleted file mode 100644
index 36847d531..000000000
--- a/packages/input-datepicker/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Date Picker Use Cases
-
-[=> See Source <=](../../../docs/components/input-datepicker/use-cases.md)
diff --git a/packages/input-datepicker/index.js b/packages/input-datepicker/index.js
deleted file mode 100644
index 38bd6a72d..000000000
--- a/packages/input-datepicker/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { LionInputDatepicker } from './src/LionInputDatepicker.js';
-export { LionCalendarOverlayFrame } from './src/LionCalendarOverlayFrame.js';
diff --git a/packages/input-datepicker/package.json b/packages/input-datepicker/package.json
deleted file mode 100644
index 58a8a3191..000000000
--- a/packages/input-datepicker/package.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "name": "@lion/input-datepicker",
-  "version": "0.26.1",
-  "description": "Provide a way for users to fill in a date via a calendar overlay",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-datepicker"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-datepicker",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-datepicker",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-datepicker",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-datepicker"
-  },
-  "sideEffects": [
-    "lion-input-datepicker.js"
-  ],
-  "dependencies": {
-    "@lion/calendar": "^0.20.1",
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input-date": "^0.15.1",
-    "@lion/localize": "^0.26.0",
-    "@lion/overlays": "^0.33.2",
-    "@lion/validate-messages": "^0.10.1"
-  },
-  "keywords": [
-    "calendar",
-    "datepicker",
-    "input-date",
-    "input-datepicker",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-datepicker.js",
-    "./test-helpers": "./test-helpers.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-datepicker/test-helpers.js b/packages/input-datepicker/test-helpers.js
deleted file mode 100644
index 21d3f7ca2..000000000
--- a/packages/input-datepicker/test-helpers.js
+++ /dev/null
@@ -1 +0,0 @@
-export { DatepickerInputObject } from './test-helpers/DatepickerInputObject.js';
diff --git a/packages/input-email/README.md b/packages/input-email/README.md
deleted file mode 100644
index 3ca2189f6..000000000
--- a/packages/input-email/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Email
-
-[=> See Source <=](../../docs/components/input-email/overview.md)
diff --git a/packages/input-email/docs/overview.md b/packages/input-email/docs/overview.md
deleted file mode 100644
index 392aa5b2c..000000000
--- a/packages/input-email/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Email Overview
-
-[=> See Source <=](../../../docs/components/input-email/overview.md)
diff --git a/packages/input-email/docs/use-cases.md b/packages/input-email/docs/use-cases.md
deleted file mode 100644
index 4390e8b96..000000000
--- a/packages/input-email/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Email Use Cases
-
-[=> See Source <=](../../../docs/components/input-email/use-cases.md)
diff --git a/packages/input-email/index.js b/packages/input-email/index.js
deleted file mode 100644
index 2d1551d96..000000000
--- a/packages/input-email/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionInputEmail } from './src/LionInputEmail.js';
diff --git a/packages/input-email/package.json b/packages/input-email/package.json
deleted file mode 100644
index 117c322b3..000000000
--- a/packages/input-email/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@lion/input-email",
-  "version": "0.16.1",
-  "description": "Provide a way for users to fill in an email",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-email"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-email",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-email",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-email",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-email"
-  },
-  "sideEffects": [
-    "lion-input-email.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0",
-    "@lion/validate-messages": "^0.10.1"
-  },
-  "keywords": [
-    "input-email",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-email.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-iban/README.md b/packages/input-iban/README.md
deleted file mode 100644
index 9816c6715..000000000
--- a/packages/input-iban/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Iban
-
-[=> See Source <=](../../docs/components/input-iban/overview.md)
diff --git a/packages/input-iban/docs/overview.md b/packages/input-iban/docs/overview.md
deleted file mode 100644
index 546359c1f..000000000
--- a/packages/input-iban/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Iban Overview
-
-[=> See Source <=](../../../docs/components/input-iban/overview.md)
diff --git a/packages/input-iban/docs/use-cases.md b/packages/input-iban/docs/use-cases.md
deleted file mode 100644
index 97eabbf78..000000000
--- a/packages/input-iban/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Iban Use Cases
-
-[=> See Source <=](../../../docs/components/input-iban/use-cases.md)
diff --git a/packages/input-iban/index.js b/packages/input-iban/index.js
deleted file mode 100644
index 4e430deae..000000000
--- a/packages/input-iban/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { LionInputIban } from './src/LionInputIban.js';
-export { formatIBAN } from './src/formatters.js';
-export { parseIBAN } from './src/parsers.js';
-export { IsIBAN, IsCountryIBAN, IsNotCountryIBAN } from './src/validators.js';
diff --git a/packages/input-iban/package.json b/packages/input-iban/package.json
deleted file mode 100644
index 6b8fbdcb8..000000000
--- a/packages/input-iban/package.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "@lion/input-iban",
-  "version": "0.19.1",
-  "description": "Provide a way for users to fill in an iban",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-iban"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-iban",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-iban",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-iban",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-iban"
-  },
-  "sideEffects": [
-    "lion-input-iban.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0",
-    "@lion/validate-messages": "^0.10.1",
-    "ibantools": "^2.2.0"
-  },
-  "keywords": [
-    "input-iban",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-iban.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-range/README.md b/packages/input-range/README.md
deleted file mode 100644
index e29cc7f3d..000000000
--- a/packages/input-range/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input range
-
-[=> See Source <=](../../docs/components/input-range/overview.md)
diff --git a/packages/input-range/docs/overview.md b/packages/input-range/docs/overview.md
deleted file mode 100644
index e10b16966..000000000
--- a/packages/input-range/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input range Overview
-
-[=> See Source <=](../../../docs/components/input-range/overview.md)
diff --git a/packages/input-range/docs/use-cases.md b/packages/input-range/docs/use-cases.md
deleted file mode 100644
index d207071fd..000000000
--- a/packages/input-range/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input range Use Cases
-
-[=> See Source <=](../../../docs/components/input-range/use-cases.md)
diff --git a/packages/input-range/index.js b/packages/input-range/index.js
deleted file mode 100644
index e0d52d1e7..000000000
--- a/packages/input-range/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionInputRange } from './src/LionInputRange.js';
diff --git a/packages/input-range/package.json b/packages/input-range/package.json
deleted file mode 100644
index ba16a0e22..000000000
--- a/packages/input-range/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "@lion/input-range",
-  "version": "0.13.1",
-  "description": "Provide a way for users to select one value from a range of values",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-range"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-range",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-range",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-range",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-range"
-  },
-  "sideEffects": [
-    "lion-input-range.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "input-range",
-    "lion",
-    "slider",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-range.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-stepper/README.md b/packages/input-stepper/README.md
deleted file mode 100644
index c60842439..000000000
--- a/packages/input-stepper/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Stepper
-
-[=> See Source <=](../../docs/components/input-stepper/overview.md)
diff --git a/packages/input-stepper/docs/overview.md b/packages/input-stepper/docs/overview.md
deleted file mode 100644
index 17c0a2ac9..000000000
--- a/packages/input-stepper/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Stepper Overview
-
-[=> See Source <=](../../../docs/components/input-stepper/overview.md)
diff --git a/packages/input-stepper/docs/use-cases.md b/packages/input-stepper/docs/use-cases.md
deleted file mode 100644
index a20905c29..000000000
--- a/packages/input-stepper/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Stepper Use Cases
-
-[=> See Source <=](../../../docs/components/input-stepper/use-cases.md)
diff --git a/packages/input-stepper/index.js b/packages/input-stepper/index.js
deleted file mode 100644
index 03a25adf7..000000000
--- a/packages/input-stepper/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionInputStepper } from './src/LionInputStepper.js';
diff --git a/packages/input-stepper/package.json b/packages/input-stepper/package.json
deleted file mode 100644
index ae504223b..000000000
--- a/packages/input-stepper/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "@lion/input-stepper",
-  "version": "0.9.1",
-  "description": "This component enables the user to increase and decrease a numeric value by predefined range.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-stepper"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-stepper",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-stepper",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-stepper",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-stepper"
-  },
-  "sideEffects": [
-    "lion-input-stepper.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0"
-  },
-  "keywords": [
-    "input",
-    "input-stepper",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input-stepper.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-tel-dropdown/README.md b/packages/input-tel-dropdown/README.md
deleted file mode 100644
index f7a207b92..000000000
--- a/packages/input-tel-dropdown/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel
-
-[=> See Source <=](../../docs/components/input-tel/overview.md)
diff --git a/packages/input-tel-dropdown/define.js b/packages/input-tel-dropdown/define.js
deleted file mode 100644
index f7d4be162..000000000
--- a/packages/input-tel-dropdown/define.js
+++ /dev/null
@@ -1 +0,0 @@
-import './lion-input-tel-dropdown.js';
diff --git a/packages/input-tel-dropdown/docs/overview.md b/packages/input-tel-dropdown/docs/overview.md
deleted file mode 100644
index 704777263..000000000
--- a/packages/input-tel-dropdown/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel Dropdown Overview
-
-[=> See Source <=](../../../docs/components/input-tel-dropdown/overview.md)
diff --git a/packages/input-tel-dropdown/docs/use-cases.md b/packages/input-tel-dropdown/docs/use-cases.md
deleted file mode 100644
index 51a189177..000000000
--- a/packages/input-tel-dropdown/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel Dropdown Use Cases
-
-[=> See Source <=](../../../docs/components/input-tel-dropdown/use-cases.md)
diff --git a/packages/input-tel-dropdown/index.js b/packages/input-tel-dropdown/index.js
deleted file mode 100644
index 1764327a0..000000000
--- a/packages/input-tel-dropdown/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { getFlagSymbol } from './src/getFlagSymbol.js';
-export { LionInputTelDropdown } from './src/LionInputTelDropdown.js';
diff --git a/packages/input-tel-dropdown/package.json b/packages/input-tel-dropdown/package.json
deleted file mode 100644
index 3bb919d59..000000000
--- a/packages/input-tel-dropdown/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/input-tel-dropdown",
-  "version": "0.2.3",
-  "description": "Input field for entering phone numbers with the help of a dropdown region list",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-tel-dropdown"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-tel-dropdown",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-tel-dropdown",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-tel-dropdown",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-tel-dropdown"
-  },
-  "sideEffects": [
-    "lion-input-tel-dropdown.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/input-tel": "^0.2.3",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "input",
-    "input-tel-dropdown",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./test-suites": "./test-suites/index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-tel-dropdown/test-suites/index.js b/packages/input-tel-dropdown/test-suites/index.js
deleted file mode 100644
index 710d68473..000000000
--- a/packages/input-tel-dropdown/test-suites/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { runInputTelDropdownSuite } from './LionInputTelDropdown.suite.js';
diff --git a/packages/input-tel/README.md b/packages/input-tel/README.md
deleted file mode 100644
index f7a207b92..000000000
--- a/packages/input-tel/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel
-
-[=> See Source <=](../../docs/components/input-tel/overview.md)
diff --git a/packages/input-tel/define.js b/packages/input-tel/define.js
deleted file mode 100644
index 7cbb5eeed..000000000
--- a/packages/input-tel/define.js
+++ /dev/null
@@ -1 +0,0 @@
-import './lion-input-tel.js';
diff --git a/packages/input-tel/docs/overview.md b/packages/input-tel/docs/overview.md
deleted file mode 100644
index d12ee69cd..000000000
--- a/packages/input-tel/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel Overview
-
-[=> See Source <=](../../../docs/components/input-tel/overview.md)
diff --git a/packages/input-tel/docs/use-cases.md b/packages/input-tel/docs/use-cases.md
deleted file mode 100644
index f4b6deb66..000000000
--- a/packages/input-tel/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Tel Use Cases
-
-[=> See Source <=](../../../docs/components/input-tel/use-cases.md)
diff --git a/packages/input-tel/index.js b/packages/input-tel/index.js
deleted file mode 100644
index 7510ad944..000000000
--- a/packages/input-tel/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { formatPhoneNumber } from './src/formatters.js';
-export { LionInputTel } from './src/LionInputTel.js';
-export { PhoneNumber } from './src/validators.js';
-export { PhoneUtilManager } from './src/PhoneUtilManager.js';
-export { liveFormatPhoneNumber } from './src/preprocessors.js';
diff --git a/packages/input-tel/package.json b/packages/input-tel/package.json
deleted file mode 100644
index f4d20fe8e..000000000
--- a/packages/input-tel/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "name": "@lion/input-tel",
-  "version": "0.2.3",
-  "description": "Input field for entering phone numbers, including validation, formatting and mobile keyboard support.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input-tel"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "test-suites",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input-tel",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input-tel",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input-tel",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input-tel"
-  },
-  "sideEffects": [
-    "lion-input-tel.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0",
-    "@lion/localize": "^0.26.0",
-    "awesome-phonenumber": "^3.0.1"
-  },
-  "keywords": [
-    "input",
-    "input-tel",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./test-suites": "./test-suites/index.js",
-    "./test-helpers": "./test-helpers/index.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/input-tel/src/localizeNamespaceLoader.js b/packages/input-tel/src/localizeNamespaceLoader.js
deleted file mode 100644
index 6c64be85d..000000000
--- a/packages/input-tel/src/localizeNamespaceLoader.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-export const localizeNamespaceLoader = /** @param {string} locale */ locale => {
-  switch (locale) {
-    case 'bg-BG':
-      return import('@lion/input-tel/translations/bg-BG.js');
-    case 'bg':
-      return import('@lion/input-tel/translations/bg.js');
-    case 'cs-CZ':
-      return import('@lion/input-tel/translations/cs-CZ.js');
-    case 'cs':
-      return import('@lion/input-tel/translations/cs.js');
-    case 'de-DE':
-      return import('@lion/input-tel/translations/de-DE.js');
-    case 'de':
-      return import('@lion/input-tel/translations/de.js');
-    case 'en-AU':
-      return import('@lion/input-tel/translations/en-AU.js');
-    case 'en-GB':
-      return import('@lion/input-tel/translations/en-GB.js');
-    case 'en-US':
-      return import('@lion/input-tel/translations/en-US.js');
-    case 'en-PH':
-    case 'en':
-      return import('@lion/input-tel/translations/en.js');
-    case 'es-ES':
-      return import('@lion/input-tel/translations/es-ES.js');
-    case 'es':
-      return import('@lion/input-tel/translations/es.js');
-    case 'fr-FR':
-      return import('@lion/input-tel/translations/fr-FR.js');
-    case 'fr-BE':
-      return import('@lion/input-tel/translations/fr-BE.js');
-    case 'fr':
-      return import('@lion/input-tel/translations/fr.js');
-    case 'hu-HU':
-      return import('@lion/input-tel/translations/hu-HU.js');
-    case 'hu':
-      return import('@lion/input-tel/translations/hu.js');
-    case 'it-IT':
-      return import('@lion/input-tel/translations/it-IT.js');
-    case 'it':
-      return import('@lion/input-tel/translations/it.js');
-    case 'nl-BE':
-      return import('@lion/input-tel/translations/nl-BE.js');
-    case 'nl-NL':
-      return import('@lion/input-tel/translations/nl-NL.js');
-    case 'nl':
-      return import('@lion/input-tel/translations/nl.js');
-    case 'pl-PL':
-      return import('@lion/input-tel/translations/pl-PL.js');
-    case 'pl':
-      return import('@lion/input-tel/translations/pl.js');
-    case 'ro-RO':
-      return import('@lion/input-tel/translations/ro-RO.js');
-    case 'ro':
-      return import('@lion/input-tel/translations/ro.js');
-    case 'ru-RU':
-      return import('@lion/input-tel/translations/ru-RU.js');
-    case 'ru':
-      return import('@lion/input-tel/translations/ru.js');
-    case 'sk-SK':
-      return import('@lion/input-tel/translations/sk-SK.js');
-    case 'sk':
-      return import('@lion/input-tel/translations/sk.js');
-    case 'uk-UA':
-      return import('@lion/input-tel/translations/uk-UA.js');
-    case 'uk':
-      return import('@lion/input-tel/translations/uk.js');
-    case 'zh-CN':
-    case 'zh':
-      return import('@lion/input-tel/translations/zh.js');
-    default:
-      return import('@lion/input-tel/translations/en.js');
-  }
-};
diff --git a/packages/input-tel/test-helpers/index.js b/packages/input-tel/test-helpers/index.js
deleted file mode 100644
index d599fada8..000000000
--- a/packages/input-tel/test-helpers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { mockPhoneUtilManager, restorePhoneUtilManager } from './mockPhoneUtilManager.js';
diff --git a/packages/input-tel/test-suites/index.js b/packages/input-tel/test-suites/index.js
deleted file mode 100644
index a1794c882..000000000
--- a/packages/input-tel/test-suites/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { runInputTelSuite } from './LionInputTel.suite.js';
diff --git a/packages/input-tel/test/LionInputTel.test.js b/packages/input-tel/test/LionInputTel.test.js
deleted file mode 100644
index 9c97a7c5d..000000000
--- a/packages/input-tel/test/LionInputTel.test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { runInputTelSuite } from '../test-suites/LionInputTel.suite.js';
-
-runInputTelSuite();
diff --git a/packages/input/README.md b/packages/input/README.md
deleted file mode 100644
index 78088853f..000000000
--- a/packages/input/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input
-
-[=> See Source <=](../../docs/components/input/overview.md)
diff --git a/packages/input/docs/overview.md b/packages/input/docs/overview.md
deleted file mode 100644
index 9a84c2641..000000000
--- a/packages/input/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Overview
-
-[=> See Source <=](../../../docs/components/input/overview.md)
diff --git a/packages/input/docs/use-cases.md b/packages/input/docs/use-cases.md
deleted file mode 100644
index a9f355255..000000000
--- a/packages/input/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Use Cases
-
-[=> See Source <=](../../../docs/components/input/use-cases.md)
diff --git a/packages/input/index.js b/packages/input/index.js
deleted file mode 100644
index 9779cad06..000000000
--- a/packages/input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionInput } from './src/LionInput.js';
diff --git a/packages/input/package.json b/packages/input/package.json
deleted file mode 100644
index ad4e05ebb..000000000
--- a/packages/input/package.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "@lion/input",
-  "version": "0.18.0",
-  "description": "It enhances the functionality of the native `<input>` element",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/input"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group input",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group input",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group input",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group input"
-  },
-  "sideEffects": [
-    "lion-input.js"
-  ],
-  "dependencies": {
-    "@lion/form-core": "^0.18.0"
-  },
-  "keywords": [
-    "input",
-    "lion",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-input.js",
-    "./docs/*": "./docs/*",
-    "./test-helpers": "./test-helpers/index.js"
-  }
-}
diff --git a/packages/input/test-helpers/index.js b/packages/input/test-helpers/index.js
deleted file mode 100644
index fd28f7242..000000000
--- a/packages/input/test-helpers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { getInputMembers } from './getInputMembers.js';
diff --git a/packages/listbox/README.md b/packages/listbox/README.md
deleted file mode 100644
index b7452cf9f..000000000
--- a/packages/listbox/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Listbox
-
-[=> See Source <=](../../docs/components/listbox/overview.md)
diff --git a/packages/listbox/define.js b/packages/listbox/define.js
deleted file mode 100644
index f4e09e9ba..000000000
--- a/packages/listbox/define.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import '@lion/listbox/define-listbox';
-import '@lion/listbox/define-option';
-import '@lion/listbox/define-options';
diff --git a/packages/listbox/docs/listboxData.js b/packages/listbox/docs/listboxData.js
deleted file mode 100644
index 60f89ff59..000000000
--- a/packages/listbox/docs/listboxData.js
+++ /dev/null
@@ -1,65 +0,0 @@
-export const listboxData = [
-  'Apple',
-  'Artichoke',
-  'Asparagus',
-  'Banana',
-  'Beets',
-  'Bell pepper',
-  'Broccoli',
-  'Brussels sprout',
-  'Cabbage',
-  'Carrot',
-  'Cauliflower',
-  'Celery',
-  'Chard',
-  'Chicory',
-  'Corn',
-  'Cucumber',
-  'Daikon',
-  'Date',
-  'Edamame',
-  'Eggplant',
-  'Elderberry',
-  'Fennel',
-  'Fig',
-  'Garlic',
-  'Grape',
-  'Honeydew melon',
-  'Iceberg lettuce',
-  'Jerusalem artichoke',
-  'Kale',
-  'Kiwi',
-  'Leek',
-  'Lemon',
-  'Mango',
-  'Mangosteen',
-  'Melon',
-  'Mushroom',
-  'Nectarine',
-  'Okra',
-  'Olive',
-  'Onion',
-  'Orange',
-  'Parship',
-  'Pea',
-  'Pear',
-  'Pineapple',
-  'Potato',
-  'Pumpkin',
-  'Quince',
-  'Radish',
-  'Rhubarb',
-  'Shallot',
-  'Spinach',
-  'Squash',
-  'Strawberry',
-  'Sweet potato',
-  'Tomato',
-  'Turnip',
-  'Ugli fruit',
-  'Victoria plum',
-  'Watercress',
-  'Watermelon',
-  'Yam',
-  'Zucchini',
-];
diff --git a/packages/listbox/docs/overview.md b/packages/listbox/docs/overview.md
deleted file mode 100644
index fae65ff23..000000000
--- a/packages/listbox/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Listbox Overview
-
-[=> See Source <=](../../../docs/components/listbox/overview.md)
diff --git a/packages/listbox/docs/use-cases.md b/packages/listbox/docs/use-cases.md
deleted file mode 100644
index 23bdce1b6..000000000
--- a/packages/listbox/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Listbox Use Cases
-
-[=> See Source <=](../../../docs/components/listbox/use-cases.md)
diff --git a/packages/listbox/index.js b/packages/listbox/index.js
deleted file mode 100644
index df72392e6..000000000
--- a/packages/listbox/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { LionListbox } from './src/LionListbox.js';
-export { ListboxMixin } from './src/ListboxMixin.js';
-export { LionOption } from './src/LionOption.js';
-export { LionOptions } from './src/LionOptions.js';
diff --git a/packages/listbox/package.json b/packages/listbox/package.json
deleted file mode 100644
index 150f55962..000000000
--- a/packages/listbox/package.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "name": "@lion/listbox",
-  "version": "0.14.1",
-  "description": "A listbox widget presents a list of options and allows a user to select one or more of them",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/listbox"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group listbox",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group listbox",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group listbox",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group listbox"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-listbox.js",
-    "lion-option.js",
-    "lion-options.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3"
-  },
-  "keywords": [
-    "form",
-    "lion",
-    "listbox",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./test-helpers": "./test-helpers/index.js",
-    "./test-suites": "./test-suites/index.js",
-    "./define": "./define.js",
-    "./define-listbox": "./lion-listbox.js",
-    "./define-option": "./lion-option.js",
-    "./define-options": "./lion-options.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/listbox/test-helpers/index.js b/packages/listbox/test-helpers/index.js
deleted file mode 100644
index 1e2285842..000000000
--- a/packages/listbox/test-helpers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { getListboxMembers } from './getListboxMembers.js';
diff --git a/packages/listbox/test-suites/index.js b/packages/listbox/test-suites/index.js
deleted file mode 100644
index 805f7ebb3..000000000
--- a/packages/listbox/test-suites/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { runListboxMixinSuite } from './ListboxMixin.suite.js';
diff --git a/packages/listbox/test/lion-listbox.test.js b/packages/listbox/test/lion-listbox.test.js
deleted file mode 100644
index 93a95b01d..000000000
--- a/packages/listbox/test/lion-listbox.test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { runListboxMixinSuite } from '../test-suites/ListboxMixin.suite.js';
-
-runListboxMixinSuite();
diff --git a/packages/localize/README.md b/packages/localize/README.md
deleted file mode 100644
index 501db3062..000000000
--- a/packages/localize/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Localize
-
-[=> See Source <=](../../docs/fundamentals/systems/localize/overview.md)
diff --git a/packages/localize/docs/dates.md b/packages/localize/docs/dates.md
deleted file mode 100644
index 377e6d6e0..000000000
--- a/packages/localize/docs/dates.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Dates
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/dates.md)
diff --git a/packages/localize/docs/numbers.md b/packages/localize/docs/numbers.md
deleted file mode 100644
index 280eebd64..000000000
--- a/packages/localize/docs/numbers.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Numbers
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/numbers.md)
diff --git a/packages/localize/docs/overview.md b/packages/localize/docs/overview.md
deleted file mode 100644
index c86f86343..000000000
--- a/packages/localize/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Overview
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/overview.md)
diff --git a/packages/localize/docs/rationale.md b/packages/localize/docs/rationale.md
deleted file mode 100644
index 9fb477294..000000000
--- a/packages/localize/docs/rationale.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Rationale
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/rationale.md)
diff --git a/packages/localize/docs/text.md b/packages/localize/docs/text.md
deleted file mode 100644
index 16cf40b28..000000000
--- a/packages/localize/docs/text.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Text
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/text.md)
diff --git a/packages/localize/docs/use-cases.md b/packages/localize/docs/use-cases.md
deleted file mode 100644
index 9732a1006..000000000
--- a/packages/localize/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Localize System Use Cases
-
-[=> See Source <=](../../../docs/fundamentals/systems/localize/use-cases.md)
diff --git a/packages/localize/index.js b/packages/localize/index.js
deleted file mode 100644
index 7d837cdf6..000000000
--- a/packages/localize/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export { formatDate } from './src/date/formatDate.js';
-export { getDateFormatBasedOnLocale } from './src/date/getDateFormatBasedOnLocale.js';
-export { getMonthNames } from './src/date/getMonthNames.js';
-export { getWeekdayNames } from './src/date/getWeekdayNames.js';
-export { normalizeDateTime } from './src/date/normalizeDateTime.js';
-export { parseDate } from './src/date/parseDate.js';
-export { localize, setLocalize } from './src/localize.js';
-export { LocalizeManager } from './src/LocalizeManager.js';
-export { LocalizeMixin } from './src/LocalizeMixin.js';
-export { formatNumber } from './src/number/formatNumber.js';
-export { formatNumberToParts } from './src/number/formatNumberToParts.js';
-export { getCurrencyName } from './src/number/getCurrencyName.js';
-export { getDecimalSeparator } from './src/number/getDecimalSeparator.js';
-export { getFractionDigits } from './src/number/getFractionDigits.js';
-export { getGroupSeparator } from './src/number/getGroupSeparator.js';
-export { getSeparatorsFromNumber } from './src/number/getSeparatorsFromNumber.js';
-export { normalizeCurrencyLabel } from './src/number/normalizeCurrencyLabel.js';
-export { parseNumber } from './src/number/parseNumber.js';
diff --git a/packages/localize/package.json b/packages/localize/package.json
deleted file mode 100644
index ca6a0c08e..000000000
--- a/packages/localize/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "@lion/localize",
-  "version": "0.26.0",
-  "description": "The localization system helps to manage localization data split into locales and automate its loading",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/localize"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "debug": "cd ../../ && npm run debug -- --group localize",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group localize",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group localize",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/localize/assets",
-    "prepublishOnly": "npm run publish-docs",
-    "test": "cd ../../ && npm run test:browser -- --group localize"
-  },
-  "sideEffects": false,
-  "dependencies": {
-    "@bundled-es-modules/message-format": "6.0.4",
-    "@lion/core": "^0.24.0",
-    "singleton-manager": "^1.5.0"
-  },
-  "keywords": [
-    "lion",
-    "localize",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./test-helpers": "./test-helpers/index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/localize/test-helpers/index.js b/packages/localize/test-helpers/index.js
deleted file mode 100644
index 40ef0dde0..000000000
--- a/packages/localize/test-helpers/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export {
-  fakeImport,
-  resetFakeImport,
-  setupEmptyFakeImportsFor,
-  setupFakeImport,
-} from './fake-imports.js';
-export { localizeTearDown } from './localizeTearDown.js';
diff --git a/packages/overlays/README.md b/packages/overlays/README.md
deleted file mode 100644
index 6f89d1a46..000000000
--- a/packages/overlays/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays
-
-[=> See Source <=](../../docs/fundamentals/systems/overlays/overview.md)
diff --git a/packages/overlays/docs/configuration.md b/packages/overlays/docs/configuration.md
deleted file mode 100644
index a3cb5b525..000000000
--- a/packages/overlays/docs/configuration.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Configuration
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/configuration.md)
diff --git a/packages/overlays/docs/form-integration.md b/packages/overlays/docs/form-integration.md
deleted file mode 100644
index 5d5696f04..000000000
--- a/packages/overlays/docs/form-integration.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Form Integration
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/form-integration.md)
diff --git a/packages/overlays/docs/overview.md b/packages/overlays/docs/overview.md
deleted file mode 100644
index 0ec794b76..000000000
--- a/packages/overlays/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Overview
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/overview.md)
diff --git a/packages/overlays/docs/rationale.md b/packages/overlays/docs/rationale.md
deleted file mode 100644
index 2bf906f0c..000000000
--- a/packages/overlays/docs/rationale.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Rationale
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/rationale.md)
diff --git a/packages/overlays/docs/scope.md b/packages/overlays/docs/scope.md
deleted file mode 100644
index 6d0b2ad4b..000000000
--- a/packages/overlays/docs/scope.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Scope
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/scope.md)
diff --git a/packages/overlays/docs/use-cases.md b/packages/overlays/docs/use-cases.md
deleted file mode 100644
index 041298eca..000000000
--- a/packages/overlays/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Overlays Use Cases
-
-[=> See Source <=](../../../docs/fundamentals/systems/overlays/use-cases.md)
diff --git a/packages/overlays/index.js b/packages/overlays/index.js
deleted file mode 100644
index e52c36663..000000000
--- a/packages/overlays/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export { globalOverlaysStyle } from './src/globalOverlaysStyle.js';
-export { overlays, setOverlays } from './src/overlays.js';
-export { OverlaysManager } from './src/OverlaysManager.js';
-export { OverlayController } from './src/OverlayController.js';
-export { OverlayMixin } from './src/OverlayMixin.js';
-export { ArrowMixin } from './src/ArrowMixin.js';
-
-export { withBottomSheetConfig } from './src/configurations/withBottomSheetConfig.js';
-export { withModalDialogConfig } from './src/configurations/withModalDialogConfig.js';
-export { withDropdownConfig } from './src/configurations/withDropdownConfig.js';
-
-export { containFocus, rotateFocus } from './src/utils/contain-focus.js';
-export { deepContains } from './src/utils/deep-contains.js';
-export { getDeepActiveElement } from './src/utils/get-deep-active-element.js';
-export { getFocusableElements } from './src/utils/get-focusable-elements.js';
-export { setSiblingsInert, unsetSiblingsInert } from './src/utils/inert-siblings.js';
diff --git a/packages/overlays/package.json b/packages/overlays/package.json
deleted file mode 100644
index 2971ea0d8..000000000
--- a/packages/overlays/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@lion/overlays",
-  "version": "0.33.2",
-  "description": "Overlays System using lit-html for rendering",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/overlays"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "debug": "cd ../../ && npm run debug -- --group overlays",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group overlays",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group overlays",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/overlays/assets",
-    "prepublishOnly": "npm run publish-docs",
-    "test": "cd ../../ && npm run test:browser -- --group overlays"
-  },
-  "sideEffects": [
-    "./docs/demo-overlay-backdrop.js",
-    "./docs/demo-overlay-system.js",
-    "./docs/applyDemoOverlayStyles.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@popperjs/core": "^2.5.4",
-    "singleton-manager": "^1.5.0"
-  },
-  "keywords": [
-    "lion",
-    "overlays",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./test-suites": "./test-suites/index.js",
-    "./translations/*": "./translations/*",
-    "./test-helpers": "./test-helpers/index.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/overlays/test-helpers/index.js b/packages/overlays/test-helpers/index.js
deleted file mode 100644
index fa1398b96..000000000
--- a/packages/overlays/test-helpers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { mimicClick } from './mimicClick.js';
diff --git a/packages/pagination/README.md b/packages/pagination/README.md
deleted file mode 100644
index af94848c1..000000000
--- a/packages/pagination/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input
-
-[=> See Source <=](../../docs/components/pagination/overview.md)
diff --git a/packages/pagination/docs/overview.md b/packages/pagination/docs/overview.md
deleted file mode 100644
index 1ac63fabf..000000000
--- a/packages/pagination/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Overview
-
-[=> See Source <=](../../../docs/components/pagination/overview.md)
diff --git a/packages/pagination/docs/use-cases.md b/packages/pagination/docs/use-cases.md
deleted file mode 100644
index 80fd6e3f2..000000000
--- a/packages/pagination/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input Use Cases
-
-[=> See Source <=](../../../docs/components/pagination/use-cases.md)
diff --git a/packages/pagination/index.js b/packages/pagination/index.js
deleted file mode 100644
index 279660b2b..000000000
--- a/packages/pagination/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionPagination } from './src/LionPagination.js';
diff --git a/packages/pagination/package.json b/packages/pagination/package.json
deleted file mode 100644
index de85a76ea..000000000
--- a/packages/pagination/package.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@lion/pagination",
-  "version": "0.9.1",
-  "description": "A component that handles pagination.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/pagination"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group pagination",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group pagination",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group pagination",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group pagination"
-  },
-  "sideEffects": [
-    "lion-pagination.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "lion",
-    "pagination",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-pagination.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/progress-indicator/README.md b/packages/progress-indicator/README.md
deleted file mode 100644
index 98b3f98bc..000000000
--- a/packages/progress-indicator/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Progress Indicator
-
-[=> See Source <=](../../docs/components/progress-indicator/overview.md)
diff --git a/packages/progress-indicator/docs/overview.md b/packages/progress-indicator/docs/overview.md
deleted file mode 100644
index 637bc2852..000000000
--- a/packages/progress-indicator/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Progress Indicator Overview
-
-[=> See Source <=](../../../docs/components/progress-indicator/overview.md)
diff --git a/packages/progress-indicator/index.js b/packages/progress-indicator/index.js
deleted file mode 100644
index 851df3d26..000000000
--- a/packages/progress-indicator/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionProgressIndicator } from './src/LionProgressIndicator.js';
diff --git a/packages/progress-indicator/package.json b/packages/progress-indicator/package.json
deleted file mode 100644
index 8aa4f0b86..000000000
--- a/packages/progress-indicator/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "name": "@lion/progress-indicator",
-  "version": "0.10.1",
-  "description": "A progress indicator that is easily styleable and accessible in all contexts",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/progress-indicator"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group progress-indicator",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group progress-indicator",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group progress-indicator",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group progress-indicator"
-  },
-  "sideEffects": [
-    "lion-progress-indicator.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "lion",
-    "loading-indicator",
-    "progress-bar",
-    "progress-indicator",
-    "spinner",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-progress-indicator.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/radio-group/README.md b/packages/radio-group/README.md
deleted file mode 100644
index 341eb5385..000000000
--- a/packages/radio-group/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Radio Group
-
-[=> See Source <=](../../docs/components/radio-group/overview.md)
diff --git a/packages/radio-group/define.js b/packages/radio-group/define.js
deleted file mode 100644
index b380967d8..000000000
--- a/packages/radio-group/define.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@lion/radio-group/define-radio';
-import '@lion/radio-group/define-radio-group';
diff --git a/packages/radio-group/docs/overview.md b/packages/radio-group/docs/overview.md
deleted file mode 100644
index cb6ab1c26..000000000
--- a/packages/radio-group/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Radio Group Overview
-
-[=> See Source <=](../../../docs/components/radio-group/overview.md)
diff --git a/packages/radio-group/docs/use-cases.md b/packages/radio-group/docs/use-cases.md
deleted file mode 100644
index 29a814fed..000000000
--- a/packages/radio-group/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Radio Group Use Cases
-
-[=> See Source <=](../../../docs/components/radio-group/use-cases.md)
diff --git a/packages/radio-group/index.js b/packages/radio-group/index.js
deleted file mode 100644
index 22a14e8dc..000000000
--- a/packages/radio-group/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { LionRadioGroup } from './src/LionRadioGroup.js';
-export { LionRadio } from './src/LionRadio.js';
diff --git a/packages/radio-group/package.json b/packages/radio-group/package.json
deleted file mode 100644
index b8583931d..000000000
--- a/packages/radio-group/package.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "@lion/radio-group",
-  "version": "0.21.1",
-  "description": "Manage a group of choices",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/radio-group"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group radio-group",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group radio-group",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group radio-group",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group radio-group"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-radio.js",
-    "lion-radio-group.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/input": "^0.18.0"
-  },
-  "keywords": [
-    "lion",
-    "radio-group",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./define-radio": "./lion-radio.js",
-    "./define-radio-group": "./lion-radio-group.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/radio-group/test/lion-radio-group-integrations.test.js b/packages/radio-group/test/lion-radio-group-integrations.test.js
deleted file mode 100644
index f71968878..000000000
--- a/packages/radio-group/test/lion-radio-group-integrations.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { runChoiceGroupMixinSuite } from '@lion/form-core/test-suites';
-import '@lion/radio-group/define';
-
-runChoiceGroupMixinSuite({
-  parentTagString: 'lion-radio-group',
-  childTagString: 'lion-radio',
-  choiceType: 'single',
-});
diff --git a/packages/radio-group/test/lion-radio-integrations.test.js b/packages/radio-group/test/lion-radio-integrations.test.js
deleted file mode 100644
index 47bcd38cf..000000000
--- a/packages/radio-group/test/lion-radio-integrations.test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@lion/radio-group/define-radio';
-import { runChoiceInputMixinSuite } from '@lion/form-core/test-suites';
-
-runChoiceInputMixinSuite({ tagString: 'lion-radio' });
diff --git a/packages/select-rich/README.md b/packages/select-rich/README.md
deleted file mode 100644
index 1866b8aa3..000000000
--- a/packages/select-rich/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select Rich
-
-[=> See Source <=](../../docs/components/select-rich/overview.md)
diff --git a/packages/select-rich/define.js b/packages/select-rich/define.js
deleted file mode 100644
index 7f553dad9..000000000
--- a/packages/select-rich/define.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@lion/select-rich/define-option';
-import '@lion/select-rich/define-options';
-import '@lion/select-rich/define-select-invoker';
-import '@lion/select-rich/define-select-rich';
diff --git a/packages/select-rich/docs/overview.md b/packages/select-rich/docs/overview.md
deleted file mode 100644
index 166eec3a1..000000000
--- a/packages/select-rich/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select Rich
-
-[=> See Source <=](../../../docs/components/select-rich/overview.md)
diff --git a/packages/select-rich/docs/use-cases.md b/packages/select-rich/docs/use-cases.md
deleted file mode 100644
index bfdf5ab27..000000000
--- a/packages/select-rich/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select Rich Use Cases
-
-[=> See Source <=](../../../docs/components/select-rich/use-cases.md)
diff --git a/packages/select-rich/index.js b/packages/select-rich/index.js
deleted file mode 100644
index 0b34f75aa..000000000
--- a/packages/select-rich/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * !deprecated
- * Import here for backwards compatibility
- */
-export { LionOptions } from '@lion/listbox';
-
-/**
- * !deprecated
- * Import here for backwards compatibility
- */
-export { LionOption } from '@lion/listbox';
-export { LionSelectRich } from './src/LionSelectRich.js';
-export { LionSelectInvoker } from './src/LionSelectInvoker.js';
diff --git a/packages/select-rich/lion-option.js b/packages/select-rich/lion-option.js
deleted file mode 100644
index 690748366..000000000
--- a/packages/select-rich/lion-option.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * !deprecated
- * Import here for backwards compatibility
- */
-import '@lion/listbox/define-option';
diff --git a/packages/select-rich/lion-options.js b/packages/select-rich/lion-options.js
deleted file mode 100644
index 314c4e49a..000000000
--- a/packages/select-rich/lion-options.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * !deprecated
- * Import here for backwards compatibility
- */
-import '@lion/listbox/define-options';
diff --git a/packages/select-rich/package.json b/packages/select-rich/package.json
deleted file mode 100644
index 05158e857..000000000
--- a/packages/select-rich/package.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "name": "@lion/select-rich",
-  "version": "0.31.1",
-  "description": "Provides a select with options that can contain html",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/select-rich"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group select-rich",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group select-rich",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group select-rich",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group select-rich"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-option.js",
-    "lion-options",
-    "lion-select-invoker.js",
-    "lion-select-rich.js"
-  ],
-  "dependencies": {
-    "@lion/button": "^0.18.1",
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@lion/listbox": "^0.14.1",
-    "@lion/overlays": "^0.33.2"
-  },
-  "keywords": [
-    "field",
-    "form",
-    "lion",
-    "listbox",
-    "option",
-    "select",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./define-option": "./lion-option.js",
-    "./define-options": "./lion-options.js",
-    "./define-select-invoker": "./lion-select-invoker.js",
-    "./define-select-rich": "./lion-select-rich.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/select/README.md b/packages/select/README.md
deleted file mode 100644
index a687019e7..000000000
--- a/packages/select/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select
-
-[=> See Source <=](../../docs/components/select/overview.md)
diff --git a/packages/select/docs/overview.md b/packages/select/docs/overview.md
deleted file mode 100644
index 73aae83b0..000000000
--- a/packages/select/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select Overview
-
-[=> See Source <=](../../../docs/components/select/overview.md)
diff --git a/packages/select/docs/use-cases.md b/packages/select/docs/use-cases.md
deleted file mode 100644
index 8b26e34d8..000000000
--- a/packages/select/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Select Use Cases
-
-[=> See Source <=](../../../docs/components/select/use-cases.md)
diff --git a/packages/select/index.js b/packages/select/index.js
deleted file mode 100644
index 72c68553a..000000000
--- a/packages/select/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionSelect } from './src/LionSelect.js';
diff --git a/packages/select/package.json b/packages/select/package.json
deleted file mode 100644
index 9a09a4146..000000000
--- a/packages/select/package.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "@lion/select",
-  "version": "0.17.1",
-  "description": "Provide a set of options where you can select one",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/select"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group select",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group select",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group select",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group select"
-  },
-  "sideEffects": [
-    "lion-select.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3"
-  },
-  "keywords": [
-    "lion",
-    "select",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-select.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/steps/README.md b/packages/steps/README.md
deleted file mode 100644
index 472036b2f..000000000
--- a/packages/steps/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Steps
-
-[=> See Source <=](../../docs/components/steps/overview.md)
diff --git a/packages/steps/define.js b/packages/steps/define.js
deleted file mode 100644
index 5840eb723..000000000
--- a/packages/steps/define.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@lion/steps/define-step';
-import '@lion/steps/define-steps';
diff --git a/packages/steps/docs/overview.md b/packages/steps/docs/overview.md
deleted file mode 100644
index 6366cac59..000000000
--- a/packages/steps/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Steps Overview
-
-[=> See Source <=](../../../docs/components/steps/overview.md)
diff --git a/packages/steps/docs/use-cases.md b/packages/steps/docs/use-cases.md
deleted file mode 100644
index 0bdad390e..000000000
--- a/packages/steps/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Steps Use Cases
-
-[=> See Source <=](../../../docs/components/steps/use-cases.md)
diff --git a/packages/steps/index.js b/packages/steps/index.js
deleted file mode 100644
index f6287f6ee..000000000
--- a/packages/steps/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { LionSteps } from './src/LionSteps.js';
-export { LionStep } from './src/LionStep.js';
diff --git a/packages/steps/package.json b/packages/steps/package.json
deleted file mode 100644
index 19f7859b4..000000000
--- a/packages/steps/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@lion/steps",
-  "version": "0.12.1",
-  "description": "Breaks a single goal down into dependable sub-tasks.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/steps"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group steps",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group steps",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group steps",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group steps"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-step.js",
-    "lion-steps.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0"
-  },
-  "keywords": [
-    "lion",
-    "steps",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./define-step": "./lion-step.js",
-    "./define-steps": "./lion-steps.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/switch/README.md b/packages/switch/README.md
deleted file mode 100644
index bc9e4e9eb..000000000
--- a/packages/switch/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Switch
-
-[=> See Source <=](../../docs/components/switch/overview.md)
diff --git a/packages/switch/define.js b/packages/switch/define.js
deleted file mode 100644
index 87a6cea29..000000000
--- a/packages/switch/define.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@lion/switch/define-switch';
-import '@lion/switch/define-switch-button';
diff --git a/packages/switch/docs/overview.md b/packages/switch/docs/overview.md
deleted file mode 100644
index 1b252c02d..000000000
--- a/packages/switch/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Switch
-
-[=> See Source <=](../../../docs/components/switch/overview.md)
diff --git a/packages/switch/docs/reference.md b/packages/switch/docs/reference.md
deleted file mode 100644
index ea74cfa2b..000000000
--- a/packages/switch/docs/reference.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Switch Reference
-
-[=> See Source <=](../../../docs/components/switch/reference.md)
diff --git a/packages/switch/docs/use-cases.md b/packages/switch/docs/use-cases.md
deleted file mode 100644
index 01aff2059..000000000
--- a/packages/switch/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Switch Use Cases
-
-[=> See Source <=](../../../docs/components/switch/use-cases.md)
diff --git a/packages/switch/index.js b/packages/switch/index.js
deleted file mode 100644
index 5f0d624ac..000000000
--- a/packages/switch/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { LionSwitch } from './src/LionSwitch.js';
-export { LionSwitchButton } from './src/LionSwitchButton.js';
diff --git a/packages/switch/package.json b/packages/switch/package.json
deleted file mode 100644
index cba49119c..000000000
--- a/packages/switch/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "name": "@lion/switch",
-  "version": "0.21.2",
-  "description": "A Switch is used for switching a property or feature on and off",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/switch"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group switch",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group switch",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group switch",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group switch"
-  },
-  "sideEffects": [
-    "define.js",
-    "lion-switch.js",
-    "lion-switch-button.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3"
-  },
-  "keywords": [
-    "lion",
-    "switch",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./define.js",
-    "./define-switch": "./lion-switch.js",
-    "./define-switch-button": "./lion-switch-button.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/tabs/README.md b/packages/tabs/README.md
deleted file mode 100644
index 8356d26f9..000000000
--- a/packages/tabs/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Tabs
-
-[=> See Source <=](../../docs/components/tabs/overview.md)
diff --git a/packages/tabs/docs/overview.md b/packages/tabs/docs/overview.md
deleted file mode 100644
index fcb5b7024..000000000
--- a/packages/tabs/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Select Rich
-
-[=> See Source <=](../../../docs/components/tabs/overview.md)
diff --git a/packages/tabs/docs/use-cases.md b/packages/tabs/docs/use-cases.md
deleted file mode 100644
index 8f23b9679..000000000
--- a/packages/tabs/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Select Rich Use Cases
-
-[=> See Source <=](../../../docs/components/tabs/use-cases.md)
diff --git a/packages/tabs/index.js b/packages/tabs/index.js
deleted file mode 100644
index 1fa85c874..000000000
--- a/packages/tabs/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionTabs } from './src/LionTabs.js';
diff --git a/packages/tabs/package.json b/packages/tabs/package.json
deleted file mode 100644
index 2997e0438..000000000
--- a/packages/tabs/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "name": "@lion/tabs",
-  "version": "0.13.1",
-  "description": "Allows users to quickly move between a small number of equally important views.",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/tabs"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group tabs",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group tabs",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group tabs",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group tabs"
-  },
-  "sideEffects": [
-    "lion-tabs.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0"
-  },
-  "keywords": [
-    "lion",
-    "tabs",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-tabs.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/textarea/README.md b/packages/textarea/README.md
deleted file mode 100644
index 461955ea0..000000000
--- a/packages/textarea/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Textarea
-
-[=> See Source <=](../../docs/components/textarea/overview.md)
diff --git a/packages/textarea/docs/overview.md b/packages/textarea/docs/overview.md
deleted file mode 100644
index a990f3e2a..000000000
--- a/packages/textarea/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Textarea Overview
-
-[=> See Source <=](../../../docs/components/textarea/overview.md)
diff --git a/packages/textarea/docs/use-cases.md b/packages/textarea/docs/use-cases.md
deleted file mode 100644
index 71aed78fe..000000000
--- a/packages/textarea/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Textarea Use Cases
-
-[=> See Source <=](../../../docs/components/textarea/use-cases.md)
diff --git a/packages/textarea/index.js b/packages/textarea/index.js
deleted file mode 100644
index c2465421d..000000000
--- a/packages/textarea/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionTextarea } from './src/LionTextarea.js';
diff --git a/packages/textarea/package.json b/packages/textarea/package.json
deleted file mode 100644
index 798aaf0ab..000000000
--- a/packages/textarea/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "@lion/textarea",
-  "version": "0.16.1",
-  "description": "Provide a way for users to write text that is multiple lines long",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/textarea"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group textarea",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group textarea",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group textarea",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group textarea"
-  },
-  "sideEffects": [
-    "lion-textarea.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/form-core": "^0.18.3",
-    "@types/autosize": "^3.0.7",
-    "autosize": "4.0.2"
-  },
-  "keywords": [
-    "lion",
-    "textarea",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-textarea.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/tooltip/README.md b/packages/tooltip/README.md
deleted file mode 100644
index d869f3cd0..000000000
--- a/packages/tooltip/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Tooltip
-
-[=> See Source <=](../../docs/components/tooltip/overview.md)
diff --git a/packages/tooltip/docs/overview.md b/packages/tooltip/docs/overview.md
deleted file mode 100644
index 9f642ce5c..000000000
--- a/packages/tooltip/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Tooltip Overview
-
-[=> See Source <=](../../../docs/components/tooltip/overview.md)
diff --git a/packages/tooltip/docs/use-cases.md b/packages/tooltip/docs/use-cases.md
deleted file mode 100644
index f238be034..000000000
--- a/packages/tooltip/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Tooltip Use Cases
-
-[=> See Source <=](../../../docs/components/tooltip/use-cases.md)
diff --git a/packages/tooltip/index.js b/packages/tooltip/index.js
deleted file mode 100644
index 8668e4823..000000000
--- a/packages/tooltip/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LionTooltip } from './src/LionTooltip.js';
diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json
deleted file mode 100644
index c38800744..000000000
--- a/packages/tooltip/package.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "@lion/tooltip",
-  "version": "0.24.1",
-  "description": "Show relative overlay content on hover",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/tooltip"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "custom-elements-manifest": "custom-elements-manifest analyze --litelement --exclude \"docs/**/*\" \"test-helpers/**/*\"",
-    "debug": "cd ../../ && npm run debug -- --group tooltip",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group tooltip",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group tooltip",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
-    "test": "cd ../../ && npm run test:browser -- --group tooltip"
-  },
-  "sideEffects": [
-    "lion-tooltip.js"
-  ],
-  "dependencies": {
-    "@lion/core": "^0.24.0",
-    "@lion/overlays": "^0.33.2"
-  },
-  "keywords": [
-    "lion",
-    "tooltip",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-tooltip.js",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/packages/accordion/CHANGELOG.md b/packages/ui/_legacy-changelogs/accordion.md
similarity index 100%
rename from packages/accordion/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/accordion.md
diff --git a/packages/button/CHANGELOG.md b/packages/ui/_legacy-changelogs/button.md
similarity index 100%
rename from packages/button/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/button.md
diff --git a/packages/calendar/CHANGELOG.md b/packages/ui/_legacy-changelogs/calendar.md
similarity index 100%
rename from packages/calendar/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/calendar.md
diff --git a/packages/checkbox-group/CHANGELOG.md b/packages/ui/_legacy-changelogs/checkbox-group.md
similarity index 100%
rename from packages/checkbox-group/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/checkbox-group.md
diff --git a/packages/collapsible/CHANGELOG.md b/packages/ui/_legacy-changelogs/collapsible.md
similarity index 100%
rename from packages/collapsible/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/collapsible.md
diff --git a/packages/combobox/CHANGELOG.md b/packages/ui/_legacy-changelogs/combobox.md
similarity index 100%
rename from packages/combobox/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/combobox.md
diff --git a/packages/core/CHANGELOG.md b/packages/ui/_legacy-changelogs/core.md
similarity index 100%
rename from packages/core/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/core.md
diff --git a/packages/dialog/CHANGELOG.md b/packages/ui/_legacy-changelogs/dialog.md
similarity index 100%
rename from packages/dialog/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/dialog.md
diff --git a/packages/fieldset/CHANGELOG.md b/packages/ui/_legacy-changelogs/fieldset.md
similarity index 100%
rename from packages/fieldset/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/fieldset.md
diff --git a/packages/form-core/CHANGELOG.md b/packages/ui/_legacy-changelogs/form-core.md
similarity index 100%
rename from packages/form-core/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/form-core.md
diff --git a/packages/form-integrations/CHANGELOG.md b/packages/ui/_legacy-changelogs/form-integrations.md
similarity index 100%
rename from packages/form-integrations/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/form-integrations.md
diff --git a/packages/form/CHANGELOG.md b/packages/ui/_legacy-changelogs/form.md
similarity index 100%
rename from packages/form/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/form.md
diff --git a/packages/helpers/CHANGELOG.md b/packages/ui/_legacy-changelogs/helpers.md
similarity index 100%
rename from packages/helpers/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/helpers.md
diff --git a/packages/icon/CHANGELOG.md b/packages/ui/_legacy-changelogs/icon.md
similarity index 100%
rename from packages/icon/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/icon.md
diff --git a/packages/input-amount/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-amount.md
similarity index 100%
rename from packages/input-amount/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-amount.md
diff --git a/packages/input-date/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-date.md
similarity index 100%
rename from packages/input-date/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-date.md
diff --git a/packages/input-datepicker/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-datepicker.md
similarity index 100%
rename from packages/input-datepicker/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-datepicker.md
diff --git a/packages/input-email/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-email.md
similarity index 100%
rename from packages/input-email/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-email.md
diff --git a/packages/input-iban/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-iban.md
similarity index 100%
rename from packages/input-iban/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-iban.md
diff --git a/packages/input-range/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-range.md
similarity index 100%
rename from packages/input-range/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-range.md
diff --git a/packages/input-stepper/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-stepper.md
similarity index 100%
rename from packages/input-stepper/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-stepper.md
diff --git a/packages/input-tel-dropdown/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-tel-dropdown.md
similarity index 100%
rename from packages/input-tel-dropdown/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-tel-dropdown.md
diff --git a/packages/input-tel/CHANGELOG.md b/packages/ui/_legacy-changelogs/input-tel.md
similarity index 100%
rename from packages/input-tel/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input-tel.md
diff --git a/packages/input/CHANGELOG.md b/packages/ui/_legacy-changelogs/input.md
similarity index 100%
rename from packages/input/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/input.md
diff --git a/packages/listbox/CHANGELOG.md b/packages/ui/_legacy-changelogs/listbox.md
similarity index 100%
rename from packages/listbox/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/listbox.md
diff --git a/packages/localize/CHANGELOG.md b/packages/ui/_legacy-changelogs/localize.md
similarity index 100%
rename from packages/localize/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/localize.md
diff --git a/packages/overlays/CHANGELOG.md b/packages/ui/_legacy-changelogs/overlays.md
similarity index 100%
rename from packages/overlays/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/overlays.md
diff --git a/packages/pagination/CHANGELOG.md b/packages/ui/_legacy-changelogs/pagination.md
similarity index 100%
rename from packages/pagination/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/pagination.md
diff --git a/packages/progress-indicator/CHANGELOG.md b/packages/ui/_legacy-changelogs/progress-indicator.md
similarity index 100%
rename from packages/progress-indicator/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/progress-indicator.md
diff --git a/packages/radio-group/CHANGELOG.md b/packages/ui/_legacy-changelogs/radio-group.md
similarity index 100%
rename from packages/radio-group/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/radio-group.md
diff --git a/packages/select-rich/CHANGELOG.md b/packages/ui/_legacy-changelogs/select-rich.md
similarity index 100%
rename from packages/select-rich/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/select-rich.md
diff --git a/packages/select/CHANGELOG.md b/packages/ui/_legacy-changelogs/select.md
similarity index 100%
rename from packages/select/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/select.md
diff --git a/packages/steps/CHANGELOG.md b/packages/ui/_legacy-changelogs/steps.md
similarity index 100%
rename from packages/steps/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/steps.md
diff --git a/packages/switch/CHANGELOG.md b/packages/ui/_legacy-changelogs/switch.md
similarity index 100%
rename from packages/switch/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/switch.md
diff --git a/packages/tabs/CHANGELOG.md b/packages/ui/_legacy-changelogs/tabs.md
similarity index 100%
rename from packages/tabs/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/tabs.md
diff --git a/packages/textarea/CHANGELOG.md b/packages/ui/_legacy-changelogs/textarea.md
similarity index 100%
rename from packages/textarea/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/textarea.md
diff --git a/packages/tooltip/CHANGELOG.md b/packages/ui/_legacy-changelogs/tooltip.md
similarity index 100%
rename from packages/tooltip/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/tooltip.md
diff --git a/packages/validate-messages/CHANGELOG.md b/packages/ui/_legacy-changelogs/validate-messages.md
similarity index 100%
rename from packages/validate-messages/CHANGELOG.md
rename to packages/ui/_legacy-changelogs/validate-messages.md
diff --git a/packages/ui/exports/accordion.js b/packages/ui/exports/accordion.js
new file mode 100644
index 000000000..9f3c8b788
--- /dev/null
+++ b/packages/ui/exports/accordion.js
@@ -0,0 +1 @@
+export { LionAccordion } from '../src/accordion/LionAccordion.js';
diff --git a/packages/ui/exports/button.js b/packages/ui/exports/button.js
new file mode 100644
index 000000000..9d887bdb0
--- /dev/null
+++ b/packages/ui/exports/button.js
@@ -0,0 +1,3 @@
+export { LionButton } from '../src/button/LionButton.js';
+export { LionButtonReset } from '../src/button/LionButtonReset.js';
+export { LionButtonSubmit } from '../src/button/LionButtonSubmit.js';
diff --git a/packages/ui/exports/calendar-test-helpers.js b/packages/ui/exports/calendar-test-helpers.js
new file mode 100644
index 000000000..552f898a1
--- /dev/null
+++ b/packages/ui/exports/calendar-test-helpers.js
@@ -0,0 +1,3 @@
+export { CalendarObject } from '../src/calendar/test-helpers/CalendarObject.js';
+export { DayObject } from '../src/calendar/test-helpers/DayObject.js';
+export { weekdayNames } from '../src/calendar/test-helpers/weekdayNames.js';
diff --git a/packages/ui/exports/calendar.js b/packages/ui/exports/calendar.js
new file mode 100644
index 000000000..da8b18e2a
--- /dev/null
+++ b/packages/ui/exports/calendar.js
@@ -0,0 +1,2 @@
+export { isSameDate } from '../src/calendar/utils/isSameDate.js';
+export { LionCalendar } from '../src/calendar/LionCalendar.js';
diff --git a/packages/ui/exports/checkbox-group.js b/packages/ui/exports/checkbox-group.js
new file mode 100644
index 000000000..f9f41b20d
--- /dev/null
+++ b/packages/ui/exports/checkbox-group.js
@@ -0,0 +1,3 @@
+export { LionCheckboxGroup } from '../src/checkbox-group/LionCheckboxGroup.js';
+export { LionCheckboxIndeterminate } from '../src/checkbox-group/LionCheckboxIndeterminate.js';
+export { LionCheckbox } from '../src/checkbox-group/LionCheckbox.js';
diff --git a/packages/ui/exports/collapsible.js b/packages/ui/exports/collapsible.js
new file mode 100644
index 000000000..6364472c6
--- /dev/null
+++ b/packages/ui/exports/collapsible.js
@@ -0,0 +1 @@
+export { LionCollapsible } from '../src/collapsible/LionCollapsible.js';
diff --git a/packages/ui/exports/combobox.js b/packages/ui/exports/combobox.js
new file mode 100644
index 000000000..fb9680264
--- /dev/null
+++ b/packages/ui/exports/combobox.js
@@ -0,0 +1 @@
+export { LionCombobox } from '../src/combobox/LionCombobox.js';
diff --git a/packages/ui/exports/core.js b/packages/ui/exports/core.js
new file mode 100644
index 000000000..015bad6d4
--- /dev/null
+++ b/packages/ui/exports/core.js
@@ -0,0 +1,7 @@
+export { DisabledMixin } from '../src/core/DisabledMixin.js';
+export { DisabledWithTabIndexMixin } from '../src/core/DisabledWithTabIndexMixin.js';
+export { ScopedStylesController } from '../src/core/ScopedStylesController.js';
+export { SlotMixin } from '../src/core/SlotMixin.js';
+export { browserDetection } from '../src/core/browserDetection.js';
+export { EventTargetShim } from '../src/core/EventTargetShim.js';
+export { uuid } from '../src/core/uuid.js';
diff --git a/packages/ui/exports/define-helpers/sb-action-logger.js b/packages/ui/exports/define-helpers/sb-action-logger.js
new file mode 100644
index 000000000..7de9315d9
--- /dev/null
+++ b/packages/ui/exports/define-helpers/sb-action-logger.js
@@ -0,0 +1,3 @@
+import { SbActionLogger } from '../helpers.js';
+
+window.customElements.define('sb-action-logger', SbActionLogger);
diff --git a/packages/ui/exports/define-helpers/sb-locale-switcher.js b/packages/ui/exports/define-helpers/sb-locale-switcher.js
new file mode 100644
index 000000000..0923cdef7
--- /dev/null
+++ b/packages/ui/exports/define-helpers/sb-locale-switcher.js
@@ -0,0 +1,3 @@
+import { SbLocaleSwitcher } from '../helpers.js';
+
+window.customElements.define('sb-locale-switcher', SbLocaleSwitcher);
diff --git a/packages/accordion/lion-accordion.js b/packages/ui/exports/define/lion-accordion.js
similarity index 50%
rename from packages/accordion/lion-accordion.js
rename to packages/ui/exports/define/lion-accordion.js
index b113c589d..af26ea15a 100644
--- a/packages/accordion/lion-accordion.js
+++ b/packages/ui/exports/define/lion-accordion.js
@@ -1,3 +1,3 @@
-import { LionAccordion } from './src/LionAccordion.js';
+import { LionAccordion } from '../accordion.js';
 
 customElements.define('lion-accordion', LionAccordion);
diff --git a/packages/button/lion-button-reset.js b/packages/ui/exports/define/lion-button-reset.js
similarity index 50%
rename from packages/button/lion-button-reset.js
rename to packages/ui/exports/define/lion-button-reset.js
index 62c5eb0bc..c61f7a6a8 100644
--- a/packages/button/lion-button-reset.js
+++ b/packages/ui/exports/define/lion-button-reset.js
@@ -1,3 +1,3 @@
-import { LionButtonReset } from './src/LionButtonReset.js';
+import { LionButtonReset } from '../button.js';
 
 customElements.define('lion-button-reset', LionButtonReset);
diff --git a/packages/button/lion-button-submit.js b/packages/ui/exports/define/lion-button-submit.js
similarity index 50%
rename from packages/button/lion-button-submit.js
rename to packages/ui/exports/define/lion-button-submit.js
index 5b0037f52..b796ffbd5 100644
--- a/packages/button/lion-button-submit.js
+++ b/packages/ui/exports/define/lion-button-submit.js
@@ -1,3 +1,3 @@
-import { LionButtonSubmit } from './src/LionButtonSubmit.js';
+import { LionButtonSubmit } from '../button.js';
 
 customElements.define('lion-button-submit', LionButtonSubmit);
diff --git a/packages/button/lion-button.js b/packages/ui/exports/define/lion-button.js
similarity index 50%
rename from packages/button/lion-button.js
rename to packages/ui/exports/define/lion-button.js
index bbc70bcac..a0f77d8dd 100644
--- a/packages/button/lion-button.js
+++ b/packages/ui/exports/define/lion-button.js
@@ -1,3 +1,3 @@
-import { LionButton } from './src/LionButton.js';
+import { LionButton } from '../button.js';
 
 customElements.define('lion-button', LionButton);
diff --git a/packages/input-datepicker/src/lion-calendar-overlay-frame.js b/packages/ui/exports/define/lion-calendar-overlay-frame.js
similarity index 52%
rename from packages/input-datepicker/src/lion-calendar-overlay-frame.js
rename to packages/ui/exports/define/lion-calendar-overlay-frame.js
index ebe505e60..5100325d4 100644
--- a/packages/input-datepicker/src/lion-calendar-overlay-frame.js
+++ b/packages/ui/exports/define/lion-calendar-overlay-frame.js
@@ -1,3 +1,3 @@
-import { LionCalendarOverlayFrame } from './LionCalendarOverlayFrame.js';
+import { LionCalendarOverlayFrame } from '../input-datepicker.js';
 
 customElements.define('lion-calendar-overlay-frame', LionCalendarOverlayFrame);
diff --git a/packages/calendar/lion-calendar.js b/packages/ui/exports/define/lion-calendar.js
similarity index 50%
rename from packages/calendar/lion-calendar.js
rename to packages/ui/exports/define/lion-calendar.js
index 8ce7a637b..ed013ef8a 100644
--- a/packages/calendar/lion-calendar.js
+++ b/packages/ui/exports/define/lion-calendar.js
@@ -1,3 +1,3 @@
-import { LionCalendar } from './src/LionCalendar.js';
+import { LionCalendar } from '../calendar.js';
 
 customElements.define('lion-calendar', LionCalendar);
diff --git a/packages/checkbox-group/lion-checkbox-group.js b/packages/ui/exports/define/lion-checkbox-group.js
similarity index 50%
rename from packages/checkbox-group/lion-checkbox-group.js
rename to packages/ui/exports/define/lion-checkbox-group.js
index a3eca1586..b58c70743 100644
--- a/packages/checkbox-group/lion-checkbox-group.js
+++ b/packages/ui/exports/define/lion-checkbox-group.js
@@ -1,3 +1,3 @@
-import { LionCheckboxGroup } from './src/LionCheckboxGroup.js';
+import { LionCheckboxGroup } from '../checkbox-group.js';
 
 customElements.define('lion-checkbox-group', LionCheckboxGroup);
diff --git a/packages/checkbox-group/lion-checkbox-indeterminate.js b/packages/ui/exports/define/lion-checkbox-indeterminate.js
similarity index 50%
rename from packages/checkbox-group/lion-checkbox-indeterminate.js
rename to packages/ui/exports/define/lion-checkbox-indeterminate.js
index 37b65d36b..564780f48 100644
--- a/packages/checkbox-group/lion-checkbox-indeterminate.js
+++ b/packages/ui/exports/define/lion-checkbox-indeterminate.js
@@ -1,3 +1,3 @@
-import { LionCheckboxIndeterminate } from './src/LionCheckboxIndeterminate.js';
+import { LionCheckboxIndeterminate } from '../checkbox-group.js';
 
 customElements.define('lion-checkbox-indeterminate', LionCheckboxIndeterminate);
diff --git a/packages/checkbox-group/lion-checkbox.js b/packages/ui/exports/define/lion-checkbox.js
similarity index 50%
rename from packages/checkbox-group/lion-checkbox.js
rename to packages/ui/exports/define/lion-checkbox.js
index 533e06f74..60452257a 100644
--- a/packages/checkbox-group/lion-checkbox.js
+++ b/packages/ui/exports/define/lion-checkbox.js
@@ -1,3 +1,3 @@
-import { LionCheckbox } from './src/LionCheckbox.js';
+import { LionCheckbox } from '../checkbox-group.js';
 
 customElements.define('lion-checkbox', LionCheckbox);
diff --git a/packages/collapsible/lion-collapsible.js b/packages/ui/exports/define/lion-collapsible.js
similarity index 50%
rename from packages/collapsible/lion-collapsible.js
rename to packages/ui/exports/define/lion-collapsible.js
index 7b9321920..8def902de 100644
--- a/packages/collapsible/lion-collapsible.js
+++ b/packages/ui/exports/define/lion-collapsible.js
@@ -1,3 +1,3 @@
-import { LionCollapsible } from './src/LionCollapsible.js';
+import { LionCollapsible } from '../collapsible.js';
 
 customElements.define('lion-collapsible', LionCollapsible);
diff --git a/packages/combobox/lion-combobox.js b/packages/ui/exports/define/lion-combobox.js
similarity index 50%
rename from packages/combobox/lion-combobox.js
rename to packages/ui/exports/define/lion-combobox.js
index bb1ed0236..0f4712249 100644
--- a/packages/combobox/lion-combobox.js
+++ b/packages/ui/exports/define/lion-combobox.js
@@ -1,3 +1,3 @@
-import { LionCombobox } from './src/LionCombobox.js';
+import { LionCombobox } from '../combobox.js';
 
 customElements.define('lion-combobox', LionCombobox);
diff --git a/packages/dialog/lion-dialog.js b/packages/ui/exports/define/lion-dialog.js
similarity index 50%
rename from packages/dialog/lion-dialog.js
rename to packages/ui/exports/define/lion-dialog.js
index 6258411aa..98de9477a 100644
--- a/packages/dialog/lion-dialog.js
+++ b/packages/ui/exports/define/lion-dialog.js
@@ -1,3 +1,3 @@
-import { LionDialog } from './src/LionDialog.js';
+import { LionDialog } from '../dialog.js';
 
 customElements.define('lion-dialog', LionDialog);
diff --git a/packages/form-core/lion-field.js b/packages/ui/exports/define/lion-field.js
similarity index 50%
rename from packages/form-core/lion-field.js
rename to packages/ui/exports/define/lion-field.js
index 6e51260b4..95eb5bc9a 100644
--- a/packages/form-core/lion-field.js
+++ b/packages/ui/exports/define/lion-field.js
@@ -1,3 +1,3 @@
-import { LionField } from './src/LionField.js';
+import { LionField } from '../form-core.js';
 
 customElements.define('lion-field', LionField);
diff --git a/packages/fieldset/lion-fieldset.js b/packages/ui/exports/define/lion-fieldset.js
similarity index 50%
rename from packages/fieldset/lion-fieldset.js
rename to packages/ui/exports/define/lion-fieldset.js
index 477b5b56c..83063da81 100644
--- a/packages/fieldset/lion-fieldset.js
+++ b/packages/ui/exports/define/lion-fieldset.js
@@ -1,3 +1,3 @@
-import { LionFieldset } from './src/LionFieldset.js';
+import { LionFieldset } from '../fieldset.js';
 
 customElements.define('lion-fieldset', LionFieldset);
diff --git a/packages/form/lion-form.js b/packages/ui/exports/define/lion-form.js
similarity index 50%
rename from packages/form/lion-form.js
rename to packages/ui/exports/define/lion-form.js
index e1176e8da..53490598f 100644
--- a/packages/form/lion-form.js
+++ b/packages/ui/exports/define/lion-form.js
@@ -1,3 +1,3 @@
-import { LionForm } from './src/LionForm.js';
+import { LionForm } from '../form.js';
 
 customElements.define('lion-form', LionForm);
diff --git a/packages/icon/lion-icon.js b/packages/ui/exports/define/lion-icon.js
similarity index 50%
rename from packages/icon/lion-icon.js
rename to packages/ui/exports/define/lion-icon.js
index 3d6f97d61..6e82049b0 100644
--- a/packages/icon/lion-icon.js
+++ b/packages/ui/exports/define/lion-icon.js
@@ -1,3 +1,3 @@
-import { LionIcon } from './src/LionIcon.js';
+import { LionIcon } from '../icon.js';
 
 customElements.define('lion-icon', LionIcon);
diff --git a/packages/input-amount/lion-input-amount.js b/packages/ui/exports/define/lion-input-amount.js
similarity index 50%
rename from packages/input-amount/lion-input-amount.js
rename to packages/ui/exports/define/lion-input-amount.js
index 9e5f7493f..11407e1c0 100644
--- a/packages/input-amount/lion-input-amount.js
+++ b/packages/ui/exports/define/lion-input-amount.js
@@ -1,3 +1,3 @@
-import { LionInputAmount } from './src/LionInputAmount.js';
+import { LionInputAmount } from '../input-amount.js';
 
 customElements.define('lion-input-amount', LionInputAmount);
diff --git a/packages/input-date/lion-input-date.js b/packages/ui/exports/define/lion-input-date.js
similarity index 50%
rename from packages/input-date/lion-input-date.js
rename to packages/ui/exports/define/lion-input-date.js
index 6a6524ffb..f0757b595 100644
--- a/packages/input-date/lion-input-date.js
+++ b/packages/ui/exports/define/lion-input-date.js
@@ -1,3 +1,3 @@
-import { LionInputDate } from './src/LionInputDate.js';
+import { LionInputDate } from '../input-date.js';
 
 customElements.define('lion-input-date', LionInputDate);
diff --git a/packages/input-datepicker/lion-input-datepicker.js b/packages/ui/exports/define/lion-input-datepicker.js
similarity index 50%
rename from packages/input-datepicker/lion-input-datepicker.js
rename to packages/ui/exports/define/lion-input-datepicker.js
index 619dbc90d..730407f27 100644
--- a/packages/input-datepicker/lion-input-datepicker.js
+++ b/packages/ui/exports/define/lion-input-datepicker.js
@@ -1,3 +1,3 @@
-import { LionInputDatepicker } from './src/LionInputDatepicker.js';
+import { LionInputDatepicker } from '../input-datepicker.js';
 
 customElements.define('lion-input-datepicker', LionInputDatepicker);
diff --git a/packages/input-email/lion-input-email.js b/packages/ui/exports/define/lion-input-email.js
similarity index 50%
rename from packages/input-email/lion-input-email.js
rename to packages/ui/exports/define/lion-input-email.js
index 40ea17632..565098dc8 100644
--- a/packages/input-email/lion-input-email.js
+++ b/packages/ui/exports/define/lion-input-email.js
@@ -1,3 +1,3 @@
-import { LionInputEmail } from './src/LionInputEmail.js';
+import { LionInputEmail } from '../input-email.js';
 
 customElements.define('lion-input-email', LionInputEmail);
diff --git a/packages/input-iban/lion-input-iban.js b/packages/ui/exports/define/lion-input-iban.js
similarity index 50%
rename from packages/input-iban/lion-input-iban.js
rename to packages/ui/exports/define/lion-input-iban.js
index 03bb5e7f0..271939749 100644
--- a/packages/input-iban/lion-input-iban.js
+++ b/packages/ui/exports/define/lion-input-iban.js
@@ -1,3 +1,3 @@
-import { LionInputIban } from './src/LionInputIban.js';
+import { LionInputIban } from '../input-iban.js';
 
 customElements.define('lion-input-iban', LionInputIban);
diff --git a/packages/input-range/lion-input-range.js b/packages/ui/exports/define/lion-input-range.js
similarity index 50%
rename from packages/input-range/lion-input-range.js
rename to packages/ui/exports/define/lion-input-range.js
index f60d7d23d..7cdd1fc0b 100644
--- a/packages/input-range/lion-input-range.js
+++ b/packages/ui/exports/define/lion-input-range.js
@@ -1,3 +1,3 @@
-import { LionInputRange } from './src/LionInputRange.js';
+import { LionInputRange } from '../input-range.js';
 
 customElements.define('lion-input-range', LionInputRange);
diff --git a/packages/input-stepper/lion-input-stepper.js b/packages/ui/exports/define/lion-input-stepper.js
similarity index 50%
rename from packages/input-stepper/lion-input-stepper.js
rename to packages/ui/exports/define/lion-input-stepper.js
index 7b7273792..bc485cbb3 100644
--- a/packages/input-stepper/lion-input-stepper.js
+++ b/packages/ui/exports/define/lion-input-stepper.js
@@ -1,3 +1,3 @@
-import { LionInputStepper } from './src/LionInputStepper.js';
+import { LionInputStepper } from '../input-stepper.js';
 
 customElements.define('lion-input-stepper', LionInputStepper);
diff --git a/packages/input-tel-dropdown/lion-input-tel-dropdown.js b/packages/ui/exports/define/lion-input-tel-dropdown.js
similarity index 51%
rename from packages/input-tel-dropdown/lion-input-tel-dropdown.js
rename to packages/ui/exports/define/lion-input-tel-dropdown.js
index d696e2c09..827fb34ff 100644
--- a/packages/input-tel-dropdown/lion-input-tel-dropdown.js
+++ b/packages/ui/exports/define/lion-input-tel-dropdown.js
@@ -1,3 +1,3 @@
-import { LionInputTelDropdown } from './src/LionInputTelDropdown.js';
+import { LionInputTelDropdown } from '../input-tel-dropdown.js';
 
 customElements.define('lion-input-tel-dropdown', LionInputTelDropdown);
diff --git a/packages/input-tel/lion-input-tel.js b/packages/ui/exports/define/lion-input-tel.js
similarity index 50%
rename from packages/input-tel/lion-input-tel.js
rename to packages/ui/exports/define/lion-input-tel.js
index 156488776..eaa2e5a4d 100644
--- a/packages/input-tel/lion-input-tel.js
+++ b/packages/ui/exports/define/lion-input-tel.js
@@ -1,3 +1,3 @@
-import { LionInputTel } from './src/LionInputTel.js';
+import { LionInputTel } from '../input-tel.js';
 
 customElements.define('lion-input-tel', LionInputTel);
diff --git a/packages/input/lion-input.js b/packages/ui/exports/define/lion-input.js
similarity index 50%
rename from packages/input/lion-input.js
rename to packages/ui/exports/define/lion-input.js
index 9b0beb229..eaec87025 100644
--- a/packages/input/lion-input.js
+++ b/packages/ui/exports/define/lion-input.js
@@ -1,3 +1,3 @@
-import { LionInput } from './src/LionInput.js';
+import { LionInput } from '../input.js';
 
 customElements.define('lion-input', LionInput);
diff --git a/packages/listbox/lion-listbox.js b/packages/ui/exports/define/lion-listbox.js
similarity index 50%
rename from packages/listbox/lion-listbox.js
rename to packages/ui/exports/define/lion-listbox.js
index b908dca1d..22160df38 100644
--- a/packages/listbox/lion-listbox.js
+++ b/packages/ui/exports/define/lion-listbox.js
@@ -1,3 +1,3 @@
-import { LionListbox } from './src/LionListbox.js';
+import { LionListbox } from '../listbox.js';
 
 customElements.define('lion-listbox', LionListbox);
diff --git a/packages/listbox/lion-option.js b/packages/ui/exports/define/lion-option.js
similarity index 50%
rename from packages/listbox/lion-option.js
rename to packages/ui/exports/define/lion-option.js
index 47a8282f3..5dbb1fbc5 100644
--- a/packages/listbox/lion-option.js
+++ b/packages/ui/exports/define/lion-option.js
@@ -1,3 +1,3 @@
-import { LionOption } from './src/LionOption.js';
+import { LionOption } from '../listbox.js';
 
 customElements.define('lion-option', LionOption);
diff --git a/packages/listbox/lion-options.js b/packages/ui/exports/define/lion-options.js
similarity index 50%
rename from packages/listbox/lion-options.js
rename to packages/ui/exports/define/lion-options.js
index b7a91f95a..22389d8a0 100644
--- a/packages/listbox/lion-options.js
+++ b/packages/ui/exports/define/lion-options.js
@@ -1,3 +1,3 @@
-import { LionOptions } from './src/LionOptions.js';
+import { LionOptions } from '../listbox.js';
 
 customElements.define('lion-options', LionOptions);
diff --git a/packages/pagination/lion-pagination.js b/packages/ui/exports/define/lion-pagination.js
similarity index 50%
rename from packages/pagination/lion-pagination.js
rename to packages/ui/exports/define/lion-pagination.js
index bad17b764..37d91b2cb 100644
--- a/packages/pagination/lion-pagination.js
+++ b/packages/ui/exports/define/lion-pagination.js
@@ -1,3 +1,3 @@
-import { LionPagination } from './src/LionPagination.js';
+import { LionPagination } from '../pagination.js';
 
 customElements.define('lion-pagination', LionPagination);
diff --git a/packages/progress-indicator/lion-progress-indicator.js b/packages/ui/exports/define/lion-progress-indicator.js
similarity index 50%
rename from packages/progress-indicator/lion-progress-indicator.js
rename to packages/ui/exports/define/lion-progress-indicator.js
index 81977b6d2..b94c2321b 100644
--- a/packages/progress-indicator/lion-progress-indicator.js
+++ b/packages/ui/exports/define/lion-progress-indicator.js
@@ -1,3 +1,3 @@
-import { LionProgressIndicator } from './src/LionProgressIndicator.js';
+import { LionProgressIndicator } from '../progress-indicator.js';
 
 customElements.define('lion-progress-indicator', LionProgressIndicator);
diff --git a/packages/radio-group/lion-radio-group.js b/packages/ui/exports/define/lion-radio-group.js
similarity index 50%
rename from packages/radio-group/lion-radio-group.js
rename to packages/ui/exports/define/lion-radio-group.js
index ab967834a..1d8edcc43 100644
--- a/packages/radio-group/lion-radio-group.js
+++ b/packages/ui/exports/define/lion-radio-group.js
@@ -1,3 +1,3 @@
-import { LionRadioGroup } from './src/LionRadioGroup.js';
+import { LionRadioGroup } from '../radio-group.js';
 
 customElements.define('lion-radio-group', LionRadioGroup);
diff --git a/packages/radio-group/lion-radio.js b/packages/ui/exports/define/lion-radio.js
similarity index 50%
rename from packages/radio-group/lion-radio.js
rename to packages/ui/exports/define/lion-radio.js
index 20f414f65..c437e9c77 100644
--- a/packages/radio-group/lion-radio.js
+++ b/packages/ui/exports/define/lion-radio.js
@@ -1,3 +1,3 @@
-import { LionRadio } from './src/LionRadio.js';
+import { LionRadio } from '../radio-group.js';
 
 customElements.define('lion-radio', LionRadio);
diff --git a/packages/select-rich/lion-select-invoker.js b/packages/ui/exports/define/lion-select-invoker.js
similarity index 50%
rename from packages/select-rich/lion-select-invoker.js
rename to packages/ui/exports/define/lion-select-invoker.js
index 9edbf0c49..f3c093ee3 100644
--- a/packages/select-rich/lion-select-invoker.js
+++ b/packages/ui/exports/define/lion-select-invoker.js
@@ -1,3 +1,3 @@
-import { LionSelectInvoker } from './src/LionSelectInvoker.js';
+import { LionSelectInvoker } from '../select-rich.js';
 
 customElements.define('lion-select-invoker', LionSelectInvoker);
diff --git a/packages/select-rich/lion-select-rich.js b/packages/ui/exports/define/lion-select-rich.js
similarity index 50%
rename from packages/select-rich/lion-select-rich.js
rename to packages/ui/exports/define/lion-select-rich.js
index 13349a50c..d0e54e522 100644
--- a/packages/select-rich/lion-select-rich.js
+++ b/packages/ui/exports/define/lion-select-rich.js
@@ -1,3 +1,3 @@
-import { LionSelectRich } from './src/LionSelectRich.js';
+import { LionSelectRich } from '../select-rich.js';
 
 customElements.define('lion-select-rich', LionSelectRich);
diff --git a/packages/select/lion-select.js b/packages/ui/exports/define/lion-select.js
similarity index 50%
rename from packages/select/lion-select.js
rename to packages/ui/exports/define/lion-select.js
index 1bec4f77a..dfab4ac9b 100644
--- a/packages/select/lion-select.js
+++ b/packages/ui/exports/define/lion-select.js
@@ -1,3 +1,3 @@
-import { LionSelect } from './src/LionSelect.js';
+import { LionSelect } from '../select.js';
 
 customElements.define('lion-select', LionSelect);
diff --git a/packages/steps/lion-step.js b/packages/ui/exports/define/lion-step.js
similarity index 50%
rename from packages/steps/lion-step.js
rename to packages/ui/exports/define/lion-step.js
index 83a763116..1088f9006 100644
--- a/packages/steps/lion-step.js
+++ b/packages/ui/exports/define/lion-step.js
@@ -1,3 +1,3 @@
-import { LionStep } from './src/LionStep.js';
+import { LionStep } from '../steps.js';
 
 customElements.define('lion-step', LionStep);
diff --git a/packages/steps/lion-steps.js b/packages/ui/exports/define/lion-steps.js
similarity index 50%
rename from packages/steps/lion-steps.js
rename to packages/ui/exports/define/lion-steps.js
index 9de03a00e..91558afe7 100644
--- a/packages/steps/lion-steps.js
+++ b/packages/ui/exports/define/lion-steps.js
@@ -1,3 +1,3 @@
-import { LionSteps } from './src/LionSteps.js';
+import { LionSteps } from '../steps.js';
 
 customElements.define('lion-steps', LionSteps);
diff --git a/packages/switch/lion-switch-button.js b/packages/ui/exports/define/lion-switch-button.js
similarity index 50%
rename from packages/switch/lion-switch-button.js
rename to packages/ui/exports/define/lion-switch-button.js
index ef60c9e61..b99277987 100644
--- a/packages/switch/lion-switch-button.js
+++ b/packages/ui/exports/define/lion-switch-button.js
@@ -1,3 +1,3 @@
-import { LionSwitchButton } from './src/LionSwitchButton.js';
+import { LionSwitchButton } from '../switch.js';
 
 customElements.define('lion-switch-button', LionSwitchButton);
diff --git a/packages/switch/lion-switch.js b/packages/ui/exports/define/lion-switch.js
similarity index 50%
rename from packages/switch/lion-switch.js
rename to packages/ui/exports/define/lion-switch.js
index c73151554..afb33c0c8 100644
--- a/packages/switch/lion-switch.js
+++ b/packages/ui/exports/define/lion-switch.js
@@ -1,3 +1,3 @@
-import { LionSwitch } from './src/LionSwitch.js';
+import { LionSwitch } from '../switch.js';
 
 customElements.define('lion-switch', LionSwitch);
diff --git a/packages/tabs/lion-tabs.js b/packages/ui/exports/define/lion-tabs.js
similarity index 50%
rename from packages/tabs/lion-tabs.js
rename to packages/ui/exports/define/lion-tabs.js
index bc635b9f1..2f4f4771f 100644
--- a/packages/tabs/lion-tabs.js
+++ b/packages/ui/exports/define/lion-tabs.js
@@ -1,3 +1,3 @@
-import { LionTabs } from './src/LionTabs.js';
+import { LionTabs } from '../tabs.js';
 
 customElements.define('lion-tabs', LionTabs);
diff --git a/packages/textarea/lion-textarea.js b/packages/ui/exports/define/lion-textarea.js
similarity index 50%
rename from packages/textarea/lion-textarea.js
rename to packages/ui/exports/define/lion-textarea.js
index b0bf78936..0b436aadc 100644
--- a/packages/textarea/lion-textarea.js
+++ b/packages/ui/exports/define/lion-textarea.js
@@ -1,3 +1,3 @@
-import { LionTextarea } from './src/LionTextarea.js';
+import { LionTextarea } from '../textarea.js';
 
 customElements.define('lion-textarea', LionTextarea);
diff --git a/packages/tooltip/lion-tooltip.js b/packages/ui/exports/define/lion-tooltip.js
similarity index 50%
rename from packages/tooltip/lion-tooltip.js
rename to packages/ui/exports/define/lion-tooltip.js
index a7869bbd2..20eb6c848 100644
--- a/packages/tooltip/lion-tooltip.js
+++ b/packages/ui/exports/define/lion-tooltip.js
@@ -1,3 +1,3 @@
-import { LionTooltip } from './src/LionTooltip.js';
+import { LionTooltip } from '../tooltip.js';
 
 customElements.define('lion-tooltip', LionTooltip);
diff --git a/packages/ui/exports/define/lion-validation-feedback.js b/packages/ui/exports/define/lion-validation-feedback.js
new file mode 100644
index 000000000..a55325b8b
--- /dev/null
+++ b/packages/ui/exports/define/lion-validation-feedback.js
@@ -0,0 +1,3 @@
+import { LionValidationFeedback } from '../form-core.js';
+
+customElements.define('lion-validation-feedback', LionValidationFeedback);
diff --git a/packages/ui/exports/dialog.js b/packages/ui/exports/dialog.js
new file mode 100644
index 000000000..0f356ef4c
--- /dev/null
+++ b/packages/ui/exports/dialog.js
@@ -0,0 +1 @@
+export { LionDialog } from '../src/dialog/LionDialog.js';
diff --git a/packages/ui/exports/fieldset.js b/packages/ui/exports/fieldset.js
new file mode 100644
index 000000000..bbe080be9
--- /dev/null
+++ b/packages/ui/exports/fieldset.js
@@ -0,0 +1 @@
+export { LionFieldset } from '../src/fieldset/LionFieldset.js';
diff --git a/packages/ui/exports/form-core-test-helpers.js b/packages/ui/exports/form-core-test-helpers.js
new file mode 100644
index 000000000..467960715
--- /dev/null
+++ b/packages/ui/exports/form-core-test-helpers.js
@@ -0,0 +1,3 @@
+export * from '../src/form-core/test-helpers/ExampleValidators.js';
+export * from '../src/form-core/test-helpers/getFormControlMembers.js';
+export * from '../src/form-core/test-helpers/mimicUserInput.js';
diff --git a/packages/ui/exports/form-core-test-suites.js b/packages/ui/exports/form-core-test-suites.js
new file mode 100644
index 000000000..f2b502cf7
--- /dev/null
+++ b/packages/ui/exports/form-core-test-suites.js
@@ -0,0 +1,10 @@
+export { runChoiceGroupMixinSuite } from '../src/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js';
+export { runChoiceInputMixinSuite } from '../src/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js';
+export { runFormGroupMixinInputSuite } from '../src/form-core/test-suites/form-group/FormGroupMixin-input.suite.js';
+export { runFormGroupMixinSuite } from '../src/form-core/test-suites/form-group/FormGroupMixin.suite.js';
+export { runFormatMixinSuite } from '../src/form-core/test-suites/FormatMixin.suite.js';
+export { runRegistrationSuite } from '../src/form-core/test-suites/FormRegistrationMixins.suite.js';
+export { runInteractionStateMixinSuite } from '../src/form-core/test-suites/InteractionStateMixin.suite.js';
+export { runNativeTextFieldMixinSuite } from '../src/form-core/test-suites/NativeTextFieldMixin.suite.js';
+export { runValidateMixinSuite } from '../src/form-core/test-suites/ValidateMixin.suite.js';
+export { runValidateMixinFeedbackPart } from '../src/form-core/test-suites/ValidateMixinFeedbackPart.suite.js';
diff --git a/packages/ui/exports/form-core.js b/packages/ui/exports/form-core.js
new file mode 100644
index 000000000..216f2e280
--- /dev/null
+++ b/packages/ui/exports/form-core.js
@@ -0,0 +1,53 @@
+export { FocusMixin } from '../src/form-core/FocusMixin.js';
+export { FormatMixin } from '../src/form-core/FormatMixin.js';
+export { FormControlMixin } from '../src/form-core/FormControlMixin.js';
+export { InteractionStateMixin } from '../src/form-core/InteractionStateMixin.js'; // applies FocusMixin
+export { LionField } from '../src/form-core/LionField.js';
+export { FormRegisteringMixin } from '../src/form-core/registration/FormRegisteringMixin.js';
+export { FormRegistrarMixin } from '../src/form-core/registration/FormRegistrarMixin.js';
+export { FormRegistrarPortalMixin } from '../src/form-core/registration/FormRegistrarPortalMixin.js';
+export { NativeTextFieldMixin } from '../src/form-core/NativeTextFieldMixin.js';
+export { FormControlsCollection } from '../src/form-core/registration/FormControlsCollection.js';
+
+// validate
+
+export { ValidateMixin } from '../src/form-core/validate/ValidateMixin.js';
+export { Unparseable } from '../src/form-core/validate/Unparseable.js';
+export { Validator } from '../src/form-core/validate/Validator.js';
+export { ResultValidator } from '../src/form-core/validate/ResultValidator.js';
+
+export { Required } from '../src/form-core/validate/validators/Required.js';
+
+export {
+  IsString,
+  EqualsLength,
+  MinLength,
+  MaxLength,
+  MinMaxLength,
+  IsEmail,
+  Pattern,
+} from '../src/form-core/validate/validators/StringValidators.js';
+
+export {
+  IsNumber,
+  MinNumber,
+  MaxNumber,
+  MinMaxNumber,
+} from '../src/form-core/validate/validators/NumberValidators.js';
+
+export {
+  IsDate,
+  MinDate,
+  MaxDate,
+  MinMaxDate,
+  IsDateDisabled,
+} from '../src/form-core/validate/validators/DateValidators.js';
+
+export { DefaultSuccess } from '../src/form-core/validate/resultValidators/DefaultSuccess.js';
+
+export { LionValidationFeedback } from '../src/form-core/validate/LionValidationFeedback.js';
+
+export { ChoiceGroupMixin } from '../src/form-core/choice-group/ChoiceGroupMixin.js';
+export { ChoiceInputMixin } from '../src/form-core/choice-group/ChoiceInputMixin.js';
+
+export { FormGroupMixin } from '../src/form-core/form-group/FormGroupMixin.js';
diff --git a/packages/form-integrations/index.js b/packages/ui/exports/form-integrations.js
similarity index 100%
rename from packages/form-integrations/index.js
rename to packages/ui/exports/form-integrations.js
diff --git a/packages/ui/exports/form.js b/packages/ui/exports/form.js
new file mode 100644
index 000000000..a579a26c3
--- /dev/null
+++ b/packages/ui/exports/form.js
@@ -0,0 +1 @@
+export { LionForm } from '../src/form/LionForm.js';
diff --git a/packages/ui/exports/helpers.js b/packages/ui/exports/helpers.js
new file mode 100644
index 000000000..a1f31c3a0
--- /dev/null
+++ b/packages/ui/exports/helpers.js
@@ -0,0 +1,7 @@
+// Utilities
+export { renderLitAsNode } from '../src/helpers/renderLitAsNode.js';
+export { sortEachDepth } from '../src/helpers/sortEachDepth.js';
+
+// Components
+export { SbActionLogger } from '../src/helpers/SbActionLogger.js';
+export { SbLocaleSwitcher } from '../src/helpers/SbLocaleSwitcher.js';
diff --git a/packages/ui/exports/icon.js b/packages/ui/exports/icon.js
new file mode 100644
index 000000000..f7cb955e2
--- /dev/null
+++ b/packages/ui/exports/icon.js
@@ -0,0 +1,3 @@
+export { LionIcon } from '../src/icon/LionIcon.js';
+export { IconManager } from '../src/icon/IconManager.js';
+export { icons, setIcons } from '../src/icon/icons.js';
diff --git a/packages/ui/exports/input-amount.js b/packages/ui/exports/input-amount.js
new file mode 100644
index 000000000..f73be418f
--- /dev/null
+++ b/packages/ui/exports/input-amount.js
@@ -0,0 +1,4 @@
+export { LionInputAmount } from '../src/input-amount/LionInputAmount.js';
+export { formatAmount } from '../src/input-amount/formatters.js';
+export { parseAmount } from '../src/input-amount/parsers.js';
+export { preprocessAmount } from '../src/input-amount/preprocessors.js';
diff --git a/packages/ui/exports/input-date.js b/packages/ui/exports/input-date.js
new file mode 100644
index 000000000..7a2557d60
--- /dev/null
+++ b/packages/ui/exports/input-date.js
@@ -0,0 +1 @@
+export { LionInputDate } from '../src/input-date/LionInputDate.js';
diff --git a/packages/ui/exports/input-datepicker-test-helpers.js b/packages/ui/exports/input-datepicker-test-helpers.js
new file mode 100644
index 000000000..d8c3c1794
--- /dev/null
+++ b/packages/ui/exports/input-datepicker-test-helpers.js
@@ -0,0 +1 @@
+export { DatepickerInputObject } from '../src/input-datepicker/test-helpers/DatepickerInputObject.js';
diff --git a/packages/ui/exports/input-datepicker.js b/packages/ui/exports/input-datepicker.js
new file mode 100644
index 000000000..b9d0c54c7
--- /dev/null
+++ b/packages/ui/exports/input-datepicker.js
@@ -0,0 +1,2 @@
+export { LionInputDatepicker } from '../src/input-datepicker/LionInputDatepicker.js';
+export { LionCalendarOverlayFrame } from '../src/input-datepicker/LionCalendarOverlayFrame.js';
diff --git a/packages/ui/exports/input-email.js b/packages/ui/exports/input-email.js
new file mode 100644
index 000000000..9ccb00599
--- /dev/null
+++ b/packages/ui/exports/input-email.js
@@ -0,0 +1 @@
+export { LionInputEmail } from '../src/input-email/LionInputEmail.js';
diff --git a/packages/ui/exports/input-iban.js b/packages/ui/exports/input-iban.js
new file mode 100644
index 000000000..fee700896
--- /dev/null
+++ b/packages/ui/exports/input-iban.js
@@ -0,0 +1,4 @@
+export { LionInputIban } from '../src/input-iban/LionInputIban.js';
+export { formatIBAN } from '../src/input-iban/formatters.js';
+export { parseIBAN } from '../src/input-iban/parsers.js';
+export { IsIBAN, IsCountryIBAN, IsNotCountryIBAN } from '../src/input-iban/validators.js';
diff --git a/packages/ui/exports/input-range.js b/packages/ui/exports/input-range.js
new file mode 100644
index 000000000..02bb8d0aa
--- /dev/null
+++ b/packages/ui/exports/input-range.js
@@ -0,0 +1 @@
+export { LionInputRange } from '../src/input-range/LionInputRange.js';
diff --git a/packages/ui/exports/input-stepper.js b/packages/ui/exports/input-stepper.js
new file mode 100644
index 000000000..187bc8d88
--- /dev/null
+++ b/packages/ui/exports/input-stepper.js
@@ -0,0 +1 @@
+export { LionInputStepper } from '../src/input-stepper/LionInputStepper.js';
diff --git a/packages/ui/exports/input-tel-dropdown-test-suites.js b/packages/ui/exports/input-tel-dropdown-test-suites.js
new file mode 100644
index 000000000..e48a99259
--- /dev/null
+++ b/packages/ui/exports/input-tel-dropdown-test-suites.js
@@ -0,0 +1 @@
+export { runInputTelDropdownSuite } from '../src/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js';
diff --git a/packages/ui/exports/input-tel-dropdown.js b/packages/ui/exports/input-tel-dropdown.js
new file mode 100644
index 000000000..d6596398b
--- /dev/null
+++ b/packages/ui/exports/input-tel-dropdown.js
@@ -0,0 +1,2 @@
+export { getFlagSymbol } from '../src/input-tel-dropdown/getFlagSymbol.js';
+export { LionInputTelDropdown } from '../src/input-tel-dropdown/LionInputTelDropdown.js';
diff --git a/packages/ui/exports/input-tel-test-helpers.js b/packages/ui/exports/input-tel-test-helpers.js
new file mode 100644
index 000000000..5b1c095a5
--- /dev/null
+++ b/packages/ui/exports/input-tel-test-helpers.js
@@ -0,0 +1,4 @@
+export {
+  mockPhoneUtilManager,
+  restorePhoneUtilManager,
+} from '../src/input-tel/test-helpers/mockPhoneUtilManager.js';
diff --git a/packages/ui/exports/input-tel-test-suites.js b/packages/ui/exports/input-tel-test-suites.js
new file mode 100644
index 000000000..7d5c1f5f7
--- /dev/null
+++ b/packages/ui/exports/input-tel-test-suites.js
@@ -0,0 +1 @@
+export { runInputTelSuite } from '../src/input-tel/test-suites/LionInputTel.suite.js';
diff --git a/packages/ui/exports/input-tel.js b/packages/ui/exports/input-tel.js
new file mode 100644
index 000000000..3e3cc47f5
--- /dev/null
+++ b/packages/ui/exports/input-tel.js
@@ -0,0 +1,5 @@
+export { formatPhoneNumber } from '../src/input-tel/formatters.js';
+export { LionInputTel } from '../src/input-tel/LionInputTel.js';
+export { PhoneNumber } from '../src/input-tel/validators.js';
+export { PhoneUtilManager } from '../src/input-tel/PhoneUtilManager.js';
+export { liveFormatPhoneNumber } from '../src/input-tel/preprocessors.js';
diff --git a/packages/ui/exports/input-test-helpers.js b/packages/ui/exports/input-test-helpers.js
new file mode 100644
index 000000000..c0d614c65
--- /dev/null
+++ b/packages/ui/exports/input-test-helpers.js
@@ -0,0 +1 @@
+export { getInputMembers } from '../src/input/test-helpers/getInputMembers.js';
diff --git a/packages/ui/exports/input.js b/packages/ui/exports/input.js
new file mode 100644
index 000000000..2142a0b4c
--- /dev/null
+++ b/packages/ui/exports/input.js
@@ -0,0 +1 @@
+export { LionInput } from '../src/input/LionInput.js';
diff --git a/packages/ui/exports/listbox-test-helpers.js b/packages/ui/exports/listbox-test-helpers.js
new file mode 100644
index 000000000..c01b5bc84
--- /dev/null
+++ b/packages/ui/exports/listbox-test-helpers.js
@@ -0,0 +1 @@
+export { getListboxMembers } from '../src/listbox/test-helpers/getListboxMembers.js';
diff --git a/packages/ui/exports/listbox-test-suites.js b/packages/ui/exports/listbox-test-suites.js
new file mode 100644
index 000000000..b2b6aace7
--- /dev/null
+++ b/packages/ui/exports/listbox-test-suites.js
@@ -0,0 +1 @@
+export { runListboxMixinSuite } from '../src/listbox/test-suites/ListboxMixin.suite.js';
diff --git a/packages/ui/exports/listbox.js b/packages/ui/exports/listbox.js
new file mode 100644
index 000000000..fb9839d76
--- /dev/null
+++ b/packages/ui/exports/listbox.js
@@ -0,0 +1,4 @@
+export { LionListbox } from '../src/listbox/LionListbox.js';
+export { ListboxMixin } from '../src/listbox/ListboxMixin.js';
+export { LionOption } from '../src/listbox/LionOption.js';
+export { LionOptions } from '../src/listbox/LionOptions.js';
diff --git a/packages/ui/exports/localize-test-helpers.js b/packages/ui/exports/localize-test-helpers.js
new file mode 100644
index 000000000..7d94374d4
--- /dev/null
+++ b/packages/ui/exports/localize-test-helpers.js
@@ -0,0 +1,7 @@
+export {
+  fakeImport,
+  resetFakeImport,
+  setupEmptyFakeImportsFor,
+  setupFakeImport,
+} from '../src/localize/test-helpers/fake-imports.js';
+export { localizeTearDown } from '../src/localize/test-helpers/localizeTearDown.js';
diff --git a/packages/ui/exports/localize.js b/packages/ui/exports/localize.js
new file mode 100644
index 000000000..958c8acc1
--- /dev/null
+++ b/packages/ui/exports/localize.js
@@ -0,0 +1,21 @@
+export { LocalizeManager } from '../src/localize/LocalizeManager.js';
+
+export { formatDate } from '../src/localize/date/formatDate.js';
+export { getDateFormatBasedOnLocale } from '../src/localize/date/getDateFormatBasedOnLocale.js';
+export { getMonthNames } from '../src/localize/date/getMonthNames.js';
+export { getWeekdayNames } from '../src/localize/date/getWeekdayNames.js';
+export { normalizeDateTime } from '../src/localize/date/normalizeDateTime.js';
+export { parseDate } from '../src/localize/date/parseDate.js';
+export { LocalizeMixin } from '../src/localize/LocalizeMixin.js';
+export { formatNumber } from '../src/localize/number/formatNumber.js';
+export { formatNumberToParts } from '../src/localize/number/formatNumberToParts.js';
+export { getCurrencyName } from '../src/localize/number/getCurrencyName.js';
+export { getDecimalSeparator } from '../src/localize/number/getDecimalSeparator.js';
+export { getFractionDigits } from '../src/localize/number/getFractionDigits.js';
+export { getGroupSeparator } from '../src/localize/number/getGroupSeparator.js';
+export { getSeparatorsFromNumber } from '../src/localize/number/getSeparatorsFromNumber.js';
+export { normalizeCurrencyLabel } from '../src/localize/number/normalizeCurrencyLabel.js';
+export { parseNumber } from '../src/localize/number/parseNumber.js';
+export { getLocale } from '../src/localize/utils/getLocale.js';
+
+export { localize, setLocalize } from '../src/localize/singleton.js';
diff --git a/packages/ui/exports/overlays-test-helpers.js b/packages/ui/exports/overlays-test-helpers.js
new file mode 100644
index 000000000..6770bdd05
--- /dev/null
+++ b/packages/ui/exports/overlays-test-helpers.js
@@ -0,0 +1 @@
+export { mimicClick } from '../src/overlays/test-helpers/mimicClick.js';
diff --git a/packages/ui/exports/overlays.js b/packages/ui/exports/overlays.js
new file mode 100644
index 000000000..58fcd029f
--- /dev/null
+++ b/packages/ui/exports/overlays.js
@@ -0,0 +1,18 @@
+export { OverlaysManager } from '../src/overlays/OverlaysManager.js';
+
+export { globalOverlaysStyle } from '../src/overlays/globalOverlaysStyle.js';
+export { OverlayController } from '../src/overlays/OverlayController.js';
+export { OverlayMixin } from '../src/overlays/OverlayMixin.js';
+export { ArrowMixin } from '../src/overlays/ArrowMixin.js';
+
+export { withBottomSheetConfig } from '../src/overlays/configurations/withBottomSheetConfig.js';
+export { withModalDialogConfig } from '../src/overlays/configurations/withModalDialogConfig.js';
+export { withDropdownConfig } from '../src/overlays/configurations/withDropdownConfig.js';
+
+export { containFocus, rotateFocus } from '../src/overlays/utils/contain-focus.js';
+export { deepContains } from '../src/overlays/utils/deep-contains.js';
+export { getDeepActiveElement } from '../src/overlays/utils/get-deep-active-element.js';
+export { getFocusableElements } from '../src/overlays/utils/get-focusable-elements.js';
+export { setSiblingsInert, unsetSiblingsInert } from '../src/overlays/utils/inert-siblings.js';
+
+export { overlays, setOverlays } from '../src/overlays/singleton.js';
diff --git a/packages/ui/exports/pagination.js b/packages/ui/exports/pagination.js
new file mode 100644
index 000000000..8486f6711
--- /dev/null
+++ b/packages/ui/exports/pagination.js
@@ -0,0 +1 @@
+export { LionPagination } from '../src/pagination/LionPagination.js';
diff --git a/packages/ui/exports/progress-indicator.js b/packages/ui/exports/progress-indicator.js
new file mode 100644
index 000000000..afa1aef20
--- /dev/null
+++ b/packages/ui/exports/progress-indicator.js
@@ -0,0 +1 @@
+export { LionProgressIndicator } from '../src/progress-indicator/LionProgressIndicator.js';
diff --git a/packages/ui/exports/radio-group.js b/packages/ui/exports/radio-group.js
new file mode 100644
index 000000000..d2ff1e1a8
--- /dev/null
+++ b/packages/ui/exports/radio-group.js
@@ -0,0 +1,2 @@
+export { LionRadioGroup } from '../src/radio-group/LionRadioGroup.js';
+export { LionRadio } from '../src/radio-group/LionRadio.js';
diff --git a/packages/ui/exports/select-rich.js b/packages/ui/exports/select-rich.js
new file mode 100644
index 000000000..753316f03
--- /dev/null
+++ b/packages/ui/exports/select-rich.js
@@ -0,0 +1,2 @@
+export { LionSelectRich } from '../src/select-rich/LionSelectRich.js';
+export { LionSelectInvoker } from '../src/select-rich/LionSelectInvoker.js';
diff --git a/packages/ui/exports/select.js b/packages/ui/exports/select.js
new file mode 100644
index 000000000..8ac47c216
--- /dev/null
+++ b/packages/ui/exports/select.js
@@ -0,0 +1 @@
+export { LionSelect } from '../src/select/LionSelect.js';
diff --git a/packages/ui/exports/steps.js b/packages/ui/exports/steps.js
new file mode 100644
index 000000000..de63723f2
--- /dev/null
+++ b/packages/ui/exports/steps.js
@@ -0,0 +1,2 @@
+export { LionSteps } from '../src/steps/LionSteps.js';
+export { LionStep } from '../src/steps/LionStep.js';
diff --git a/packages/ui/exports/switch.js b/packages/ui/exports/switch.js
new file mode 100644
index 000000000..e05509da7
--- /dev/null
+++ b/packages/ui/exports/switch.js
@@ -0,0 +1,2 @@
+export { LionSwitch } from '../src/switch/LionSwitch.js';
+export { LionSwitchButton } from '../src/switch/LionSwitchButton.js';
diff --git a/packages/ui/exports/tabs.js b/packages/ui/exports/tabs.js
new file mode 100644
index 000000000..5b9ec6406
--- /dev/null
+++ b/packages/ui/exports/tabs.js
@@ -0,0 +1 @@
+export { LionTabs } from '../src/tabs/LionTabs.js';
diff --git a/packages/ui/exports/textarea.js b/packages/ui/exports/textarea.js
new file mode 100644
index 000000000..0c5eb3392
--- /dev/null
+++ b/packages/ui/exports/textarea.js
@@ -0,0 +1 @@
+export { LionTextarea } from '../src/textarea/LionTextarea.js';
diff --git a/packages/ui/exports/tooltip.js b/packages/ui/exports/tooltip.js
new file mode 100644
index 000000000..60d0b6575
--- /dev/null
+++ b/packages/ui/exports/tooltip.js
@@ -0,0 +1 @@
+export { LionTooltip } from '../src/tooltip/LionTooltip.js';
diff --git a/packages/ui/exports/validate-messages.js b/packages/ui/exports/validate-messages.js
new file mode 100644
index 000000000..b00365cb1
--- /dev/null
+++ b/packages/ui/exports/validate-messages.js
@@ -0,0 +1 @@
+export { loadDefaultFeedbackMessages } from '../src/validate-messages/loadDefaultFeedbackMessages.js';
diff --git a/packages/accordion/package.json b/packages/ui/package.json
similarity index 51%
rename from packages/accordion/package.json
rename to packages/ui/package.json
index 071e2729b..efee48fc3 100644
--- a/packages/accordion/package.json
+++ b/packages/ui/package.json
@@ -1,27 +1,34 @@
 {
-  "name": "@lion/accordion",
-  "version": "0.11.1",
-  "description": "Vertically stacked list of invokers that can be clicked to reveal or hide content associated with them.",
+  "name": "@lion/ui",
+  "version": "0.0.1",
+  "description": "A package of extendable web components",
   "license": "MIT",
   "author": "ing-bank",
   "homepage": "https://github.com/ing-bank/lion/",
   "repository": {
     "type": "git",
     "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/accordion"
+    "directory": "packages/ui"
   },
   "type": "module",
-  "main": "index.js",
-  "module": "index.js",
+  "exports": {
+    "./*": "./exports/*",
+    "./calendar-translations/*": "./src/calendar/translations/*",
+    "./pagination-translations/*": "./src/pagination/translations/*",
+    "./progress-indicator-translations/*": "./src/progress-indicator/translations/*",
+    "./input-datepicker-translations/*": "./src/input-datepicker/translations/*",
+    "./input-iban-translations/*": "./src/input-iban/translations/*",
+    "./input-tel-translations/*": "./src/input-tel/translations/*",
+    "./overlays-translations/*": "./src/overlays/translations/*",
+    "./validate-messages-translations/*": "./src/validate-messages/translations/*"
+  },
   "files": [
     "*.d.ts",
     "*.js",
     "custom-elements.json",
     "docs",
+    "exports",
     "src",
-    "test",
-    "test-helpers",
-    "translations",
     "types"
   ],
   "scripts": {
@@ -33,11 +40,15 @@
     "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
     "test": "cd ../../ && npm run test:browser -- --group accordion"
   },
-  "sideEffects": [
-    "lion-accordion.js"
-  ],
   "dependencies": {
-    "@lion/core": "^0.24.0"
+    "@bundled-es-modules/message-format": "^6.0.4",
+    "@open-wc/dedupe-mixin": "^1.3.1",
+    "@open-wc/scoped-elements": "^2.1.3",
+    "autosize": "4.0.2",
+    "awesome-phonenumber": "^3.0.1",
+    "ibantools": "^2.2.0",
+    "lit": "^2.4.0",
+    "singleton-manager": "^1.5.0"
   },
   "keywords": [
     "accordion",
@@ -47,10 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "customElements": "custom-elements.json",
-  "exports": {
-    ".": "./index.js",
-    "./define": "./lion-accordion.js",
-    "./docs/*": "./docs/*"
-  }
+  "customElements": "custom-elements.json"
 }
diff --git a/packages/accordion/src/LionAccordion.js b/packages/ui/src/accordion/LionAccordion.js
similarity index 99%
rename from packages/accordion/src/LionAccordion.js
rename to packages/ui/src/accordion/LionAccordion.js
index 66bdb0898..3ae3291ec 100644
--- a/packages/accordion/src/LionAccordion.js
+++ b/packages/ui/src/accordion/LionAccordion.js
@@ -1,5 +1,6 @@
 /* eslint-disable class-methods-use-this */
-import { LitElement, css, html, uuid } from '@lion/core';
+import { LitElement, css, html } from 'lit';
+import { uuid } from '@lion/ui/core.js';
 
 /**
  * @typedef {Object} StoreEntry
diff --git a/packages/accordion/test/lion-accordion.test.js b/packages/ui/src/accordion/test/lion-accordion.test.js
similarity index 99%
rename from packages/accordion/test/lion-accordion.test.js
rename to packages/ui/src/accordion/test/lion-accordion.test.js
index 9a49ab724..759f24a5c 100644
--- a/packages/accordion/test/lion-accordion.test.js
+++ b/packages/ui/src/accordion/test/lion-accordion.test.js
@@ -2,9 +2,9 @@ import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
 
-import '../lion-accordion.js';
+import '@lion/ui/define/lion-accordion.js';
 /**
- * @typedef {import('../src/LionAccordion.js').LionAccordion} LionAccordion
+ * @typedef {import('../LionAccordion.js').LionAccordion} LionAccordion
  */
 
 const basicAccordion = html`
diff --git a/packages/button/src/LionButton.js b/packages/ui/src/button/LionButton.js
similarity index 98%
rename from packages/button/src/LionButton.js
rename to packages/ui/src/button/LionButton.js
index 571749b7f..77546ab16 100644
--- a/packages/button/src/LionButton.js
+++ b/packages/ui/src/button/LionButton.js
@@ -1,4 +1,5 @@
-import { browserDetection, css, DisabledWithTabIndexMixin, html, LitElement } from '@lion/core';
+import { html, LitElement, css } from 'lit';
+import { browserDetection, DisabledWithTabIndexMixin } from '@lion/ui/core.js';
 
 const isKeyboardClickEvent = (/** @type {KeyboardEvent} */ e) => e.key === ' ' || e.key === 'Enter';
 const isSpaceKeyboardClickEvent = (/** @type {KeyboardEvent} */ e) => e.key === ' ';
diff --git a/packages/button/src/LionButtonReset.js b/packages/ui/src/button/LionButtonReset.js
similarity index 100%
rename from packages/button/src/LionButtonReset.js
rename to packages/ui/src/button/LionButtonReset.js
diff --git a/packages/button/src/LionButtonSubmit.js b/packages/ui/src/button/LionButtonSubmit.js
similarity index 100%
rename from packages/button/src/LionButtonSubmit.js
rename to packages/ui/src/button/LionButtonSubmit.js
diff --git a/packages/button/test-suites/LionButton.suite.js b/packages/ui/src/button/test-suites/LionButton.suite.js
similarity index 99%
rename from packages/button/test-suites/LionButton.suite.js
rename to packages/ui/src/button/test-suites/LionButton.suite.js
index 2b7d19ded..c5525bdb5 100644
--- a/packages/button/test-suites/LionButton.suite.js
+++ b/packages/ui/src/button/test-suites/LionButton.suite.js
@@ -1,6 +1,6 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { LionButton } from '@lion/button';
-import { browserDetection } from '@lion/core';
+import { LionButton } from '@lion/ui/button.js';
+import { browserDetection } from '@lion/ui/core.js';
 import {
   aTimeout,
   defineCE,
diff --git a/packages/button/test-suites/LionButtonReset.suite.js b/packages/ui/src/button/test-suites/LionButtonReset.suite.js
similarity index 99%
rename from packages/button/test-suites/LionButtonReset.suite.js
rename to packages/ui/src/button/test-suites/LionButtonReset.suite.js
index ba46989ce..fdc06b2f8 100644
--- a/packages/button/test-suites/LionButtonReset.suite.js
+++ b/packages/ui/src/button/test-suites/LionButtonReset.suite.js
@@ -1,5 +1,5 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { LionButtonReset } from '@lion/button';
+import { LionButtonReset } from '@lion/ui/button.js';
 import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 
diff --git a/packages/button/test-suites/LionButtonSubmit.suite.js b/packages/ui/src/button/test-suites/LionButtonSubmit.suite.js
similarity index 99%
rename from packages/button/test-suites/LionButtonSubmit.suite.js
rename to packages/ui/src/button/test-suites/LionButtonSubmit.suite.js
index a1d9ce15c..fb97dcd9b 100644
--- a/packages/button/test-suites/LionButtonSubmit.suite.js
+++ b/packages/ui/src/button/test-suites/LionButtonSubmit.suite.js
@@ -1,5 +1,5 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { LionButtonSubmit } from '@lion/button';
+import { LionButtonSubmit } from '@lion/ui/button.js';
 import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { sendKeys } from '@web/test-runner-commands';
 import sinon from 'sinon';
diff --git a/packages/button/test/demos.screenshots-test.js b/packages/ui/src/button/test/demos.screenshots-test.js
similarity index 100%
rename from packages/button/test/demos.screenshots-test.js
rename to packages/ui/src/button/test/demos.screenshots-test.js
diff --git a/packages/button/test/lion-button.test.js b/packages/ui/src/button/test/lion-button.test.js
similarity index 100%
rename from packages/button/test/lion-button.test.js
rename to packages/ui/src/button/test/lion-button.test.js
diff --git a/packages/calendar/src/LionCalendar.js b/packages/ui/src/calendar/LionCalendar.js
similarity index 95%
rename from packages/calendar/src/LionCalendar.js
rename to packages/ui/src/calendar/LionCalendar.js
index 48b99b4f7..457eb9a2f 100644
--- a/packages/calendar/src/LionCalendar.js
+++ b/packages/ui/src/calendar/LionCalendar.js
@@ -1,12 +1,12 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { html, LitElement } from '@lion/core';
+import { html, LitElement } from 'lit';
 import {
   getMonthNames,
   getWeekdayNames,
   localize,
   LocalizeMixin,
   normalizeDateTime,
-} from '@lion/localize';
+} from '@lion/ui/localize.js';
 
 import { calendarStyle } from './calendarStyle.js';
 import { createDay } from './utils/createDay.js';
@@ -34,57 +34,57 @@ export class LionCalendar extends LocalizeMixin(LitElement) {
           switch (locale) {
             case 'bg-BG':
             case 'bg':
-              return import('@lion/calendar/translations/bg.js');
+              return import('@lion/ui/calendar-translations/bg.js');
             case 'cs-CZ':
             case 'cs':
-              return import('@lion/calendar/translations/cs.js');
+              return import('@lion/ui/calendar-translations/cs.js');
             case 'de-AT':
             case 'de-DE':
             case 'de':
-              return import('@lion/calendar/translations/de.js');
+              return import('@lion/ui/calendar-translations/de.js');
             case 'en-AU':
             case 'en-GB':
             case 'en-PH':
             case 'en-US':
             case 'en':
-              return import('@lion/calendar/translations/en.js');
+              return import('@lion/ui/calendar-translations/en.js');
             case 'es-ES':
             case 'es':
-              return import('@lion/calendar/translations/es.js');
+              return import('@lion/ui/calendar-translations/es.js');
             case 'fr-FR':
             case 'fr-BE':
             case 'fr':
-              return import('@lion/calendar/translations/fr.js');
+              return import('@lion/ui/calendar-translations/fr.js');
             case 'hu-HU':
             case 'hu':
-              return import('@lion/calendar/translations/hu.js');
+              return import('@lion/ui/calendar-translations/hu.js');
             case 'it-IT':
             case 'it':
-              return import('@lion/calendar/translations/it.js');
+              return import('@lion/ui/calendar-translations/it.js');
             case 'nl-BE':
             case 'nl-NL':
             case 'nl':
-              return import('@lion/calendar/translations/nl.js');
+              return import('@lion/ui/calendar-translations/nl.js');
             case 'pl-PL':
             case 'pl':
-              return import('@lion/calendar/translations/pl.js');
+              return import('@lion/ui/calendar-translations/pl.js');
             case 'ro-RO':
             case 'ro':
-              return import('@lion/calendar/translations/ro.js');
+              return import('@lion/ui/calendar-translations/ro.js');
             case 'ru-RU':
             case 'ru':
-              return import('@lion/calendar/translations/ru.js');
+              return import('@lion/ui/calendar-translations/ru.js');
             case 'sk-SK':
             case 'sk':
-              return import('@lion/calendar/translations/sk.js');
+              return import('@lion/ui/calendar-translations/sk.js');
             case 'uk-UA':
             case 'uk':
-              return import('@lion/calendar/translations/uk.js');
+              return import('@lion/ui/calendar-translations/uk.js');
             case 'zh-CN':
             case 'zh':
-              return import('@lion/calendar/translations/zh.js');
+              return import('@lion/ui/calendar-translations/zh.js');
             default:
-              return import('@lion/calendar/translations/en.js');
+              return import('@lion/ui/calendar-translations/en.js');
           }
         },
       },
diff --git a/packages/calendar/src/calendarStyle.js b/packages/ui/src/calendar/calendarStyle.js
similarity index 97%
rename from packages/calendar/src/calendarStyle.js
rename to packages/ui/src/calendar/calendarStyle.js
index 7eb16cad8..e2f74bf6f 100644
--- a/packages/calendar/src/calendarStyle.js
+++ b/packages/ui/src/calendar/calendarStyle.js
@@ -1,4 +1,4 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 export const calendarStyle = css`
   :host {
diff --git a/packages/calendar/test-helpers.js b/packages/ui/src/calendar/test-helpers.js
similarity index 100%
rename from packages/calendar/test-helpers.js
rename to packages/ui/src/calendar/test-helpers.js
diff --git a/packages/calendar/test-helpers/CalendarObject.js b/packages/ui/src/calendar/test-helpers/CalendarObject.js
similarity index 100%
rename from packages/calendar/test-helpers/CalendarObject.js
rename to packages/ui/src/calendar/test-helpers/CalendarObject.js
diff --git a/packages/calendar/test-helpers/DayObject.js b/packages/ui/src/calendar/test-helpers/DayObject.js
similarity index 100%
rename from packages/calendar/test-helpers/DayObject.js
rename to packages/ui/src/calendar/test-helpers/DayObject.js
diff --git a/packages/calendar/test-helpers/weekdayNames.js b/packages/ui/src/calendar/test-helpers/weekdayNames.js
similarity index 100%
rename from packages/calendar/test-helpers/weekdayNames.js
rename to packages/ui/src/calendar/test-helpers/weekdayNames.js
diff --git a/packages/calendar/test/demos.screenshots-test.js b/packages/ui/src/calendar/test/demos.screenshots-test.js
similarity index 100%
rename from packages/calendar/test/demos.screenshots-test.js
rename to packages/ui/src/calendar/test/demos.screenshots-test.js
diff --git a/packages/calendar/test/lion-calendar.test.js b/packages/ui/src/calendar/test/lion-calendar.test.js
similarity index 99%
rename from packages/calendar/test/lion-calendar.test.js
rename to packages/ui/src/calendar/test/lion-calendar.test.js
index 9b3788ea4..2d2e91028 100644
--- a/packages/calendar/test/lion-calendar.test.js
+++ b/packages/ui/src/calendar/test/lion-calendar.test.js
@@ -1,10 +1,10 @@
-import { html } from '@lion/core';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { html } from 'lit';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import sinon from 'sinon';
-import '@lion/calendar/define';
-import { isSameDate } from '../src/utils/isSameDate.js';
+import '@lion/ui/define/lion-calendar.js';
+import { isSameDate } from '@lion/ui/calendar.js';
 import { CalendarObject, DayObject } from '../test-helpers.js';
 
 /**
diff --git a/packages/calendar/test/utils/createMonth.test.js b/packages/ui/src/calendar/test/utils/createMonth.test.js
similarity index 93%
rename from packages/calendar/test/utils/createMonth.test.js
rename to packages/ui/src/calendar/test/utils/createMonth.test.js
index 64a4daf6f..fe43d0101 100644
--- a/packages/calendar/test/utils/createMonth.test.js
+++ b/packages/ui/src/calendar/test/utils/createMonth.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { createMonth } from '../../src/utils/createMonth.js';
-import { createWeek } from '../../src/utils/createWeek.js';
+import { createMonth } from '../../utils/createMonth.js';
+import { createWeek } from '../../utils/createWeek.js';
 
 /**
  * @param {import('../../types/day').Month} obj
diff --git a/packages/calendar/test/utils/createMultipleMonth.test.js b/packages/ui/src/calendar/test/utils/createMultipleMonth.test.js
similarity index 93%
rename from packages/calendar/test/utils/createMultipleMonth.test.js
rename to packages/ui/src/calendar/test/utils/createMultipleMonth.test.js
index 00329e6a9..b2bdd17fe 100644
--- a/packages/calendar/test/utils/createMultipleMonth.test.js
+++ b/packages/ui/src/calendar/test/utils/createMultipleMonth.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { createMultipleMonth } from '../../src/utils/createMultipleMonth.js';
-import { createMonth } from '../../src/utils/createMonth.js';
+import { createMultipleMonth } from '../../utils/createMultipleMonth.js';
+import { createMonth } from '../../utils/createMonth.js';
 
 /**
  * @param {{ months: import('../../types/day').Month[]}} obj
diff --git a/packages/calendar/test/utils/createWeek.test.js b/packages/ui/src/calendar/test/utils/createWeek.test.js
similarity index 94%
rename from packages/calendar/test/utils/createWeek.test.js
rename to packages/ui/src/calendar/test/utils/createWeek.test.js
index 0bf65a465..0675e712f 100644
--- a/packages/calendar/test/utils/createWeek.test.js
+++ b/packages/ui/src/calendar/test/utils/createWeek.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { createWeek } from '../../src/utils/createWeek.js';
-import { createDay } from '../../src/utils/createDay.js';
+import { createWeek } from '../../utils/createWeek.js';
+import { createDay } from '../../utils/createDay.js';
 
 /**
  * @param {import('../../types/day').Week} obj
diff --git a/packages/calendar/test/utils/dataTemplate.test.js b/packages/ui/src/calendar/test/utils/dataTemplate.test.js
similarity index 83%
rename from packages/calendar/test/utils/dataTemplate.test.js
rename to packages/ui/src/calendar/test/utils/dataTemplate.test.js
index 41c53e349..941fc974c 100644
--- a/packages/calendar/test/utils/dataTemplate.test.js
+++ b/packages/ui/src/calendar/test/utils/dataTemplate.test.js
@@ -1,8 +1,8 @@
 /* eslint-disable no-unused-expressions */
 import { expect, fixture } from '@open-wc/testing';
 
-import { createMultipleMonth } from '../../src/utils/createMultipleMonth.js';
-import { dataTemplate } from '../../src/utils/dataTemplate.js';
+import { createMultipleMonth } from '../../utils/createMultipleMonth.js';
+import { dataTemplate } from '../../utils/dataTemplate.js';
 import { weekdayNames } from '../../test-helpers.js';
 
 // eslint-disable-next-line camelcase
diff --git a/packages/calendar/test/utils/dayTemplate.test.js b/packages/ui/src/calendar/test/utils/dayTemplate.test.js
similarity index 96%
rename from packages/calendar/test/utils/dayTemplate.test.js
rename to packages/ui/src/calendar/test/utils/dayTemplate.test.js
index 47387baab..a86910ece 100644
--- a/packages/calendar/test/utils/dayTemplate.test.js
+++ b/packages/ui/src/calendar/test/utils/dayTemplate.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-expressions */
 import { expect, fixture } from '@open-wc/testing';
-import { createDay } from '../../src/utils/createDay.js';
-import { dayTemplate } from '../../src/utils/dayTemplate.js';
+import { createDay } from '../../utils/createDay.js';
+import { dayTemplate } from '../../utils/dayTemplate.js';
 
 const weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
diff --git a/packages/calendar/test/utils/getFirstDayNextMonth.test.js b/packages/ui/src/calendar/test/utils/getFirstDayNextMonth.test.js
similarity index 78%
rename from packages/calendar/test/utils/getFirstDayNextMonth.test.js
rename to packages/ui/src/calendar/test/utils/getFirstDayNextMonth.test.js
index 579cd946a..e210e444f 100644
--- a/packages/calendar/test/utils/getFirstDayNextMonth.test.js
+++ b/packages/ui/src/calendar/test/utils/getFirstDayNextMonth.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { isSameDate } from '../../src/utils/isSameDate.js';
-import { getFirstDayNextMonth } from '../../src/utils/getFirstDayNextMonth.js';
+import { isSameDate } from '@lion/ui/calendar.js';
+import { getFirstDayNextMonth } from '../../utils/getFirstDayNextMonth.js';
 
 describe('getFirstDayNextMonth', () => {
   it('returns the first day of the next month', () => {
diff --git a/packages/calendar/test/utils/getLastDayPreviousMonth.test.js b/packages/ui/src/calendar/test/utils/getLastDayPreviousMonth.test.js
similarity index 78%
rename from packages/calendar/test/utils/getLastDayPreviousMonth.test.js
rename to packages/ui/src/calendar/test/utils/getLastDayPreviousMonth.test.js
index c517c66d7..64cbaf376 100644
--- a/packages/calendar/test/utils/getLastDayPreviousMonth.test.js
+++ b/packages/ui/src/calendar/test/utils/getLastDayPreviousMonth.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { isSameDate } from '../../src/utils/isSameDate.js';
-import { getLastDayPreviousMonth } from '../../src/utils/getLastDayPreviousMonth.js';
+import { isSameDate } from '@lion/ui/calendar.js';
+import { getLastDayPreviousMonth } from '../../utils/getLastDayPreviousMonth.js';
 
 describe('getLastDayPreviousMonth', () => {
   it('returns the last day of the previous month', () => {
diff --git a/packages/calendar/test/utils/isSameDate.test.js b/packages/ui/src/calendar/test/utils/isSameDate.test.js
similarity index 85%
rename from packages/calendar/test/utils/isSameDate.test.js
rename to packages/ui/src/calendar/test/utils/isSameDate.test.js
index bcaf69d54..5fe1c550d 100644
--- a/packages/calendar/test/utils/isSameDate.test.js
+++ b/packages/ui/src/calendar/test/utils/isSameDate.test.js
@@ -1,5 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { isSameDate } from '../../src/utils/isSameDate.js';
+import { isSameDate } from '@lion/ui/calendar.js';
 
 describe('isSameDate', () => {
   it('returns true if the same date is given', () => {
diff --git a/packages/calendar/test/utils/snapshots/monthTemplate_en-GB_Sunday_2018-12.js b/packages/ui/src/calendar/test/utils/snapshots/monthTemplate_en-GB_Sunday_2018-12.js
similarity index 100%
rename from packages/calendar/test/utils/snapshots/monthTemplate_en-GB_Sunday_2018-12.js
rename to packages/ui/src/calendar/test/utils/snapshots/monthTemplate_en-GB_Sunday_2018-12.js
diff --git a/packages/calendar/translations/bg.js b/packages/ui/src/calendar/translations/bg.js
similarity index 100%
rename from packages/calendar/translations/bg.js
rename to packages/ui/src/calendar/translations/bg.js
diff --git a/packages/calendar/translations/cs.js b/packages/ui/src/calendar/translations/cs.js
similarity index 100%
rename from packages/calendar/translations/cs.js
rename to packages/ui/src/calendar/translations/cs.js
diff --git a/packages/calendar/translations/de.js b/packages/ui/src/calendar/translations/de.js
similarity index 100%
rename from packages/calendar/translations/de.js
rename to packages/ui/src/calendar/translations/de.js
diff --git a/packages/calendar/translations/en.js b/packages/ui/src/calendar/translations/en.js
similarity index 100%
rename from packages/calendar/translations/en.js
rename to packages/ui/src/calendar/translations/en.js
diff --git a/packages/calendar/translations/es.js b/packages/ui/src/calendar/translations/es.js
similarity index 100%
rename from packages/calendar/translations/es.js
rename to packages/ui/src/calendar/translations/es.js
diff --git a/packages/calendar/translations/fr.js b/packages/ui/src/calendar/translations/fr.js
similarity index 100%
rename from packages/calendar/translations/fr.js
rename to packages/ui/src/calendar/translations/fr.js
diff --git a/packages/calendar/translations/hu.js b/packages/ui/src/calendar/translations/hu.js
similarity index 100%
rename from packages/calendar/translations/hu.js
rename to packages/ui/src/calendar/translations/hu.js
diff --git a/packages/calendar/translations/it.js b/packages/ui/src/calendar/translations/it.js
similarity index 100%
rename from packages/calendar/translations/it.js
rename to packages/ui/src/calendar/translations/it.js
diff --git a/packages/calendar/translations/nl.js b/packages/ui/src/calendar/translations/nl.js
similarity index 100%
rename from packages/calendar/translations/nl.js
rename to packages/ui/src/calendar/translations/nl.js
diff --git a/packages/calendar/translations/pl.js b/packages/ui/src/calendar/translations/pl.js
similarity index 100%
rename from packages/calendar/translations/pl.js
rename to packages/ui/src/calendar/translations/pl.js
diff --git a/packages/calendar/translations/ro.js b/packages/ui/src/calendar/translations/ro.js
similarity index 100%
rename from packages/calendar/translations/ro.js
rename to packages/ui/src/calendar/translations/ro.js
diff --git a/packages/calendar/translations/ru.js b/packages/ui/src/calendar/translations/ru.js
similarity index 100%
rename from packages/calendar/translations/ru.js
rename to packages/ui/src/calendar/translations/ru.js
diff --git a/packages/calendar/translations/sk.js b/packages/ui/src/calendar/translations/sk.js
similarity index 100%
rename from packages/calendar/translations/sk.js
rename to packages/ui/src/calendar/translations/sk.js
diff --git a/packages/calendar/translations/uk.js b/packages/ui/src/calendar/translations/uk.js
similarity index 100%
rename from packages/calendar/translations/uk.js
rename to packages/ui/src/calendar/translations/uk.js
diff --git a/packages/calendar/translations/zh.js b/packages/ui/src/calendar/translations/zh.js
similarity index 100%
rename from packages/calendar/translations/zh.js
rename to packages/ui/src/calendar/translations/zh.js
diff --git a/packages/calendar/types/day.d.ts b/packages/ui/src/calendar/types/day.d.ts
similarity index 100%
rename from packages/calendar/types/day.d.ts
rename to packages/ui/src/calendar/types/day.d.ts
diff --git a/packages/calendar/src/utils/createDay.js b/packages/ui/src/calendar/utils/createDay.js
similarity index 100%
rename from packages/calendar/src/utils/createDay.js
rename to packages/ui/src/calendar/utils/createDay.js
diff --git a/packages/calendar/src/utils/createMonth.js b/packages/ui/src/calendar/utils/createMonth.js
similarity index 100%
rename from packages/calendar/src/utils/createMonth.js
rename to packages/ui/src/calendar/utils/createMonth.js
diff --git a/packages/calendar/src/utils/createMultipleMonth.js b/packages/ui/src/calendar/utils/createMultipleMonth.js
similarity index 100%
rename from packages/calendar/src/utils/createMultipleMonth.js
rename to packages/ui/src/calendar/utils/createMultipleMonth.js
diff --git a/packages/calendar/src/utils/createWeek.js b/packages/ui/src/calendar/utils/createWeek.js
similarity index 100%
rename from packages/calendar/src/utils/createWeek.js
rename to packages/ui/src/calendar/utils/createWeek.js
diff --git a/packages/calendar/src/utils/dataTemplate.js b/packages/ui/src/calendar/utils/dataTemplate.js
similarity index 97%
rename from packages/calendar/src/utils/dataTemplate.js
rename to packages/ui/src/calendar/utils/dataTemplate.js
index 268c1a014..81a16303e 100644
--- a/packages/calendar/src/utils/dataTemplate.js
+++ b/packages/ui/src/calendar/utils/dataTemplate.js
@@ -1,4 +1,4 @@
-import { html } from '@lion/core';
+import { html } from 'lit';
 import { dayTemplate as defaultDayTemplate } from './dayTemplate.js';
 
 /**
diff --git a/packages/calendar/src/utils/dayTemplate.js b/packages/ui/src/calendar/utils/dayTemplate.js
similarity index 96%
rename from packages/calendar/src/utils/dayTemplate.js
rename to packages/ui/src/calendar/utils/dayTemplate.js
index aeb2578fc..fd78fa940 100644
--- a/packages/calendar/src/utils/dayTemplate.js
+++ b/packages/ui/src/calendar/utils/dayTemplate.js
@@ -1,4 +1,5 @@
-import { html, ifDefined } from '@lion/core';
+import { html } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
 
 const defaultMonthLabels = [
   'January',
diff --git a/packages/calendar/src/utils/getFirstDayNextMonth.js b/packages/ui/src/calendar/utils/getFirstDayNextMonth.js
similarity index 100%
rename from packages/calendar/src/utils/getFirstDayNextMonth.js
rename to packages/ui/src/calendar/utils/getFirstDayNextMonth.js
diff --git a/packages/calendar/src/utils/getLastDayPreviousMonth.js b/packages/ui/src/calendar/utils/getLastDayPreviousMonth.js
similarity index 100%
rename from packages/calendar/src/utils/getLastDayPreviousMonth.js
rename to packages/ui/src/calendar/utils/getLastDayPreviousMonth.js
diff --git a/packages/calendar/src/utils/isSameDate.js b/packages/ui/src/calendar/utils/isSameDate.js
similarity index 100%
rename from packages/calendar/src/utils/isSameDate.js
rename to packages/ui/src/calendar/utils/isSameDate.js
diff --git a/packages/checkbox-group/src/LionCheckbox.js b/packages/ui/src/checkbox-group/LionCheckbox.js
similarity index 59%
rename from packages/checkbox-group/src/LionCheckbox.js
rename to packages/ui/src/checkbox-group/LionCheckbox.js
index 0487e9234..b4243f83f 100644
--- a/packages/checkbox-group/src/LionCheckbox.js
+++ b/packages/ui/src/checkbox-group/LionCheckbox.js
@@ -1,5 +1,5 @@
-import { LionInput } from '@lion/input';
-import { ChoiceInputMixin } from '@lion/form-core';
+import { LionInput } from '@lion/ui/input.js';
+import { ChoiceInputMixin } from '@lion/ui/form-core.js';
 
 export class LionCheckbox extends ChoiceInputMixin(LionInput) {
   connectedCallback() {
diff --git a/packages/checkbox-group/src/LionCheckboxGroup.js b/packages/ui/src/checkbox-group/LionCheckboxGroup.js
similarity index 65%
rename from packages/checkbox-group/src/LionCheckboxGroup.js
rename to packages/ui/src/checkbox-group/LionCheckboxGroup.js
index 22cf96a7b..a96ddbcc3 100644
--- a/packages/checkbox-group/src/LionCheckboxGroup.js
+++ b/packages/ui/src/checkbox-group/LionCheckboxGroup.js
@@ -1,5 +1,5 @@
-import { LitElement } from '@lion/core';
-import { ChoiceGroupMixin, FormGroupMixin } from '@lion/form-core';
+import { LitElement } from 'lit';
+import { ChoiceGroupMixin, FormGroupMixin } from '@lion/ui/form-core.js';
 
 /**
  * A wrapper around multiple checkboxes
diff --git a/packages/checkbox-group/src/LionCheckboxIndeterminate.js b/packages/ui/src/checkbox-group/LionCheckboxIndeterminate.js
similarity index 99%
rename from packages/checkbox-group/src/LionCheckboxIndeterminate.js
rename to packages/ui/src/checkbox-group/LionCheckboxIndeterminate.js
index 7a49cdf20..cfe40abc0 100644
--- a/packages/checkbox-group/src/LionCheckboxIndeterminate.js
+++ b/packages/ui/src/checkbox-group/LionCheckboxIndeterminate.js
@@ -1,4 +1,4 @@
-import { html, css } from '@lion/core';
+import { html, css } from 'lit';
 import { LionCheckbox } from './LionCheckbox.js';
 
 /**
diff --git a/packages/checkbox-group/index.d.ts b/packages/ui/src/checkbox-group/index.d.ts
similarity index 100%
rename from packages/checkbox-group/index.d.ts
rename to packages/ui/src/checkbox-group/index.d.ts
diff --git a/packages/checkbox-group/test/lion-checkbox-group-integrations.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox-group-integrations.test.js
similarity index 51%
rename from packages/checkbox-group/test/lion-checkbox-group-integrations.test.js
rename to packages/ui/src/checkbox-group/test/lion-checkbox-group-integrations.test.js
index 5bbbc8315..9e23b08f9 100644
--- a/packages/checkbox-group/test/lion-checkbox-group-integrations.test.js
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox-group-integrations.test.js
@@ -1,5 +1,5 @@
-import { runChoiceGroupMixinSuite } from '@lion/form-core/test-suites';
-import '@lion/checkbox-group/define';
+import { runChoiceGroupMixinSuite } from '@lion/ui/form-core-test-suites.js';
+import '@lion/ui/define/lion-checkbox-group.js';
 
 runChoiceGroupMixinSuite({
   parentTagString: 'lion-checkbox-group',
diff --git a/packages/checkbox-group/test/lion-checkbox-group.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox-group.test.js
similarity index 96%
rename from packages/checkbox-group/test/lion-checkbox-group.test.js
rename to packages/ui/src/checkbox-group/test/lion-checkbox-group.test.js
index 73dbd1678..c092475e8 100644
--- a/packages/checkbox-group/test/lion-checkbox-group.test.js
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox-group.test.js
@@ -1,7 +1,8 @@
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/checkbox-group/define';
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-checkbox-group.js';
 
 /**
  * @typedef {import('../src/LionCheckboxGroup').LionCheckboxGroup} LionCheckboxGroup
diff --git a/packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js
new file mode 100644
index 000000000..0f01a6816
--- /dev/null
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate-integrations.test.js
@@ -0,0 +1,4 @@
+import '@lion/ui/define/lion-checkbox-indeterminate.js';
+import { runChoiceInputMixinSuite } from '@lion/ui/form-core-test-suites.js';
+
+runChoiceInputMixinSuite({ tagString: 'lion-checkbox-indeterminate' });
diff --git a/packages/checkbox-group/test/lion-checkbox-indeterminate.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate.test.js
similarity index 99%
rename from packages/checkbox-group/test/lion-checkbox-indeterminate.test.js
rename to packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate.test.js
index 334031335..fab501408 100644
--- a/packages/checkbox-group/test/lion-checkbox-indeterminate.test.js
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox-indeterminate.test.js
@@ -1,7 +1,9 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
-import '@lion/checkbox-group/define';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox-indeterminate.js';
 
 /**
  * @typedef {import('../src/LionCheckbox').LionCheckbox} LionCheckbox
diff --git a/packages/ui/src/checkbox-group/test/lion-checkbox-integrations.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox-integrations.test.js
new file mode 100644
index 000000000..576ef860c
--- /dev/null
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox-integrations.test.js
@@ -0,0 +1,4 @@
+import '@lion/ui/define/lion-checkbox.js';
+import { runChoiceInputMixinSuite } from '@lion/ui/form-core-test-suites.js';
+
+runChoiceInputMixinSuite({ tagString: 'lion-checkbox' });
diff --git a/packages/checkbox-group/test/lion-checkbox.test.js b/packages/ui/src/checkbox-group/test/lion-checkbox.test.js
similarity index 96%
rename from packages/checkbox-group/test/lion-checkbox.test.js
rename to packages/ui/src/checkbox-group/test/lion-checkbox.test.js
index a4e62f2af..ef3709f02 100644
--- a/packages/checkbox-group/test/lion-checkbox.test.js
+++ b/packages/ui/src/checkbox-group/test/lion-checkbox.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/checkbox-group/define-checkbox';
+import '@lion/ui/define/lion-checkbox.js';
 
 /**
  * @typedef {import('../src/LionCheckbox').LionCheckbox} LionCheckbox
diff --git a/packages/collapsible/src/LionCollapsible.js b/packages/ui/src/collapsible/LionCollapsible.js
similarity index 97%
rename from packages/collapsible/src/LionCollapsible.js
rename to packages/ui/src/collapsible/LionCollapsible.js
index 31ddb5d7b..9593b9be7 100644
--- a/packages/collapsible/src/LionCollapsible.js
+++ b/packages/ui/src/collapsible/LionCollapsible.js
@@ -1,4 +1,5 @@
-import { LitElement, html, css, uuid } from '@lion/core';
+import { LitElement, html, css } from 'lit';
+import { uuid } from '@lion/ui/core.js';
 /**
  * `LionCollapsible` is a class for custom collapsible element (`<lion-collapsible>` web component).
  *
diff --git a/packages/collapsible/index.d.ts b/packages/ui/src/collapsible/index.d.ts
similarity index 100%
rename from packages/collapsible/index.d.ts
rename to packages/ui/src/collapsible/index.d.ts
diff --git a/packages/collapsible/test/lion-collapsible.test.js b/packages/ui/src/collapsible/test/lion-collapsible.test.js
similarity index 99%
rename from packages/collapsible/test/lion-collapsible.test.js
rename to packages/ui/src/collapsible/test/lion-collapsible.test.js
index 28b5b1e0d..fef835b78 100644
--- a/packages/collapsible/test/lion-collapsible.test.js
+++ b/packages/ui/src/collapsible/test/lion-collapsible.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 
-import '@lion/collapsible/define';
+import '@lion/ui/define/lion-collapsible.js';
 
 /**
 
diff --git a/packages/combobox/src/LionCombobox.js b/packages/ui/src/combobox/LionCombobox.js
similarity index 99%
rename from packages/combobox/src/LionCombobox.js
rename to packages/ui/src/combobox/LionCombobox.js
index 84ad0c951..c048d3be2 100644
--- a/packages/combobox/src/LionCombobox.js
+++ b/packages/ui/src/combobox/LionCombobox.js
@@ -1,6 +1,7 @@
-import { html, css, browserDetection } from '@lion/core';
-import { OverlayMixin, withDropdownConfig } from '@lion/overlays';
-import { LionListbox } from '@lion/listbox';
+import { html, css } from 'lit';
+import { browserDetection } from '@lion/ui/core.js';
+import { OverlayMixin, withDropdownConfig } from '@lion/ui/overlays.js';
+import { LionListbox } from '@lion/ui/listbox.js';
 
 const matchReverseFns = new WeakMap();
 const matchA11ySpanReverseFns = new WeakMap();
diff --git a/packages/ui/src/combobox/test/lion-combobox-integrations.test.js b/packages/ui/src/combobox/test/lion-combobox-integrations.test.js
new file mode 100644
index 000000000..19b850076
--- /dev/null
+++ b/packages/ui/src/combobox/test/lion-combobox-integrations.test.js
@@ -0,0 +1,4 @@
+import { runListboxMixinSuite } from '@lion/ui/listbox-test-suites.js';
+import '@lion/ui/define/lion-combobox.js';
+
+runListboxMixinSuite({ tagString: 'lion-combobox' });
diff --git a/packages/combobox/test/lion-combobox.test.js b/packages/ui/src/combobox/test/lion-combobox.test.js
similarity index 99%
rename from packages/combobox/test/lion-combobox.test.js
rename to packages/ui/src/combobox/test/lion-combobox.test.js
index b18edacb7..3792cc38e 100644
--- a/packages/combobox/test/lion-combobox.test.js
+++ b/packages/ui/src/combobox/test/lion-combobox.test.js
@@ -1,11 +1,13 @@
-import '@lion/combobox/define';
-import { browserDetection, LitElement } from '@lion/core';
-import { Required } from '@lion/form-core';
-import '@lion/listbox/define-option';
-import { getListboxMembers } from '@lion/listbox/test-helpers';
+import '@lion/ui/define/lion-combobox.js';
+import { LitElement } from 'lit';
+import { browserDetection } from '@lion/ui/core.js';
+import { Required } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
+import { getListboxMembers } from '@lion/ui/listbox-test-helpers.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { LionCombobox } from '../src/LionCombobox.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 
 /**
  * @typedef {import('../types/SelectionDisplay').SelectionDisplay} SelectionDisplay
diff --git a/packages/combobox/types/SelectionDisplay.d.ts b/packages/ui/src/combobox/types/SelectionDisplay.d.ts
similarity index 69%
rename from packages/combobox/types/SelectionDisplay.d.ts
rename to packages/ui/src/combobox/types/SelectionDisplay.d.ts
index be9db4ab6..a97afca29 100644
--- a/packages/combobox/types/SelectionDisplay.d.ts
+++ b/packages/ui/src/combobox/types/SelectionDisplay.d.ts
@@ -1,4 +1,4 @@
-import { LionCombobox } from '../src/LionCombobox.js';
+import { LionCombobox } from '../src/LionCombobox.js.js';
 
 export interface SelectionDisplay extends HTMLElement {
   comboboxElement: LionCombobox;
diff --git a/packages/core/src/DisabledMixin.js b/packages/ui/src/core/DisabledMixin.js
similarity index 100%
rename from packages/core/src/DisabledMixin.js
rename to packages/ui/src/core/DisabledMixin.js
diff --git a/packages/core/src/DisabledWithTabIndexMixin.js b/packages/ui/src/core/DisabledWithTabIndexMixin.js
similarity index 100%
rename from packages/core/src/DisabledWithTabIndexMixin.js
rename to packages/ui/src/core/DisabledWithTabIndexMixin.js
diff --git a/packages/core/src/EventTargetShim.js b/packages/ui/src/core/EventTargetShim.js
similarity index 100%
rename from packages/core/src/EventTargetShim.js
rename to packages/ui/src/core/EventTargetShim.js
diff --git a/packages/core/src/ScopedStylesController.js b/packages/ui/src/core/ScopedStylesController.js
similarity index 100%
rename from packages/core/src/ScopedStylesController.js
rename to packages/ui/src/core/ScopedStylesController.js
diff --git a/packages/core/src/SlotMixin.js b/packages/ui/src/core/SlotMixin.js
similarity index 100%
rename from packages/core/src/SlotMixin.js
rename to packages/ui/src/core/SlotMixin.js
diff --git a/packages/core/src/browserDetection.js b/packages/ui/src/core/browserDetection.js
similarity index 100%
rename from packages/core/src/browserDetection.js
rename to packages/ui/src/core/browserDetection.js
diff --git a/packages/core/index.d.ts b/packages/ui/src/core/index.d.ts
similarity index 100%
rename from packages/core/index.d.ts
rename to packages/ui/src/core/index.d.ts
diff --git a/packages/core/test/DisabledMixin.test.js b/packages/ui/src/core/test/DisabledMixin.test.js
similarity index 96%
rename from packages/core/test/DisabledMixin.test.js
rename to packages/ui/src/core/test/DisabledMixin.test.js
index bed72df8c..70ad35e37 100644
--- a/packages/core/test/DisabledMixin.test.js
+++ b/packages/ui/src/core/test/DisabledMixin.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { LitElement } from '../index.js';
-import { DisabledMixin } from '../src/DisabledMixin.js';
+import { LitElement } from 'lit';
+import { DisabledMixin } from '@lion/ui/core.js';
 
 describe('DisabledMixin', () => {
   class CanBeDisabled extends DisabledMixin(LitElement) {}
diff --git a/packages/core/test/DisabledWithTabIndexMixin.test.js b/packages/ui/src/core/test/DisabledWithTabIndexMixin.test.js
similarity index 96%
rename from packages/core/test/DisabledWithTabIndexMixin.test.js
rename to packages/ui/src/core/test/DisabledWithTabIndexMixin.test.js
index be34689fe..ac1eb1be6 100644
--- a/packages/core/test/DisabledWithTabIndexMixin.test.js
+++ b/packages/ui/src/core/test/DisabledWithTabIndexMixin.test.js
@@ -1,8 +1,8 @@
 /* eslint-disable lit-a11y/tabindex-no-positive */
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { LitElement } from '../index.js';
-import { DisabledWithTabIndexMixin } from '../src/DisabledWithTabIndexMixin.js';
+import { LitElement } from 'lit';
+import { DisabledWithTabIndexMixin } from '@lion/ui/core.js';
 
 describe('DisabledWithTabIndexMixin', () => {
   class WithTabIndex extends DisabledWithTabIndexMixin(LitElement) {}
diff --git a/packages/core/test/EventTargetShim.test.js b/packages/ui/src/core/test/EventTargetShim.test.js
similarity index 95%
rename from packages/core/test/EventTargetShim.test.js
rename to packages/ui/src/core/test/EventTargetShim.test.js
index 7478912a1..19e0ac049 100644
--- a/packages/core/test/EventTargetShim.test.js
+++ b/packages/ui/src/core/test/EventTargetShim.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 import sinon from 'sinon';
-import { EventTargetShim } from '../src/EventTargetShim.js';
+import { EventTargetShim } from '@lion/ui/core.js';
 
 describe('EventTargetShim', () => {
   class NonElementClass extends EventTargetShim {}
diff --git a/packages/core/test/ScopedStylesController.test.js b/packages/ui/src/core/test/ScopedStylesController.test.js
similarity index 94%
rename from packages/core/test/ScopedStylesController.test.js
rename to packages/ui/src/core/test/ScopedStylesController.test.js
index a24c331e0..68571a1c9 100644
--- a/packages/core/test/ScopedStylesController.test.js
+++ b/packages/ui/src/core/test/ScopedStylesController.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture } from '@open-wc/testing';
 // import { html as _html } from 'lit/static-html.js';
-import { LitElement, css, html } from '../index.js';
-import { ScopedStylesController } from '../src/ScopedStylesController.js';
+import { LitElement, css, html } from 'lit';
+import { ScopedStylesController } from '@lion/ui/core.js';
 
 describe('ScopedStylesMixin', () => {
   class Scoped extends LitElement {
diff --git a/packages/core/test/SlotMixin.test.js b/packages/ui/src/core/test/SlotMixin.test.js
similarity index 98%
rename from packages/core/test/SlotMixin.test.js
rename to packages/ui/src/core/test/SlotMixin.test.js
index d205ccece..a4b2ff340 100644
--- a/packages/core/test/SlotMixin.test.js
+++ b/packages/ui/src/core/test/SlotMixin.test.js
@@ -1,7 +1,8 @@
 import sinon from 'sinon';
 import { defineCE, expect, fixture } from '@open-wc/testing';
-import { SlotMixin } from '../src/SlotMixin.js';
-import { LitElement, ScopedElementsMixin, html } from '../index.js';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { SlotMixin } from '@lion/ui/core.js';
+import { LitElement, html } from 'lit';
 
 function mockScopedRegistry() {
   // @ts-expect-error wait for browser support
diff --git a/packages/core/types/DisabledMixinTypes.d.ts b/packages/ui/src/core/types/DisabledMixinTypes.d.ts
similarity index 94%
rename from packages/core/types/DisabledMixinTypes.d.ts
rename to packages/ui/src/core/types/DisabledMixinTypes.d.ts
index 74c48a23b..f3d8d1645 100644
--- a/packages/core/types/DisabledMixinTypes.d.ts
+++ b/packages/ui/src/core/types/DisabledMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '../index.js';
+import { LitElement } from 'lit';
 
 export declare class DisabledHost {
   disabled: boolean;
diff --git a/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts b/packages/ui/src/core/types/DisabledWithTabIndexMixinTypes.d.ts
similarity index 96%
rename from packages/core/types/DisabledWithTabIndexMixinTypes.d.ts
rename to packages/ui/src/core/types/DisabledWithTabIndexMixinTypes.d.ts
index 7b26e5fe7..4d058889b 100644
--- a/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts
+++ b/packages/ui/src/core/types/DisabledWithTabIndexMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { DisabledHost } from './DisabledMixinTypes';
-import { LitElement } from '../index.js';
+import { LitElement } from 'lit';
 export declare class DisabledWithTabIndexHost {
   tabIndex: number;
   /**
diff --git a/packages/core/types/SlotMixinTypes.d.ts b/packages/ui/src/core/types/SlotMixinTypes.d.ts
similarity index 100%
rename from packages/core/types/SlotMixinTypes.d.ts
rename to packages/ui/src/core/types/SlotMixinTypes.d.ts
diff --git a/packages/core/src/uuid.js b/packages/ui/src/core/uuid.js
similarity index 100%
rename from packages/core/src/uuid.js
rename to packages/ui/src/core/uuid.js
diff --git a/packages/dialog/src/LionDialog.js b/packages/ui/src/dialog/LionDialog.js
similarity index 89%
rename from packages/dialog/src/LionDialog.js
rename to packages/ui/src/dialog/LionDialog.js
index e94f8c7ea..5ee709fa6 100644
--- a/packages/dialog/src/LionDialog.js
+++ b/packages/ui/src/dialog/LionDialog.js
@@ -1,5 +1,5 @@
-import { html, LitElement } from '@lion/core';
-import { OverlayMixin, withModalDialogConfig } from '@lion/overlays';
+import { html, LitElement } from 'lit';
+import { OverlayMixin, withModalDialogConfig } from '@lion/ui/overlays.js';
 
 export class LionDialog extends OverlayMixin(LitElement) {
   constructor() {
diff --git a/packages/dialog/test/lion-dialog.test.js b/packages/ui/src/dialog/test/lion-dialog.test.js
similarity index 96%
rename from packages/dialog/test/lion-dialog.test.js
rename to packages/ui/src/dialog/test/lion-dialog.test.js
index 0ef4892a4..91c32b969 100644
--- a/packages/dialog/test/lion-dialog.test.js
+++ b/packages/ui/src/dialog/test/lion-dialog.test.js
@@ -1,10 +1,10 @@
 import { expect, fixture as _fixture, html, unsafeStatic } from '@open-wc/testing';
 import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js';
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
 
 /**
 
- * @typedef {import('../src/LionDialog').LionDialog} LionDialog
+ * @typedef {import('../LionDialog').LionDialog} LionDialog
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionDialog>} */ (_fixture);
diff --git a/packages/fieldset/src/LionFieldset.js b/packages/ui/src/fieldset/LionFieldset.js
similarity index 93%
rename from packages/fieldset/src/LionFieldset.js
rename to packages/ui/src/fieldset/LionFieldset.js
index 89b4c7070..075b221bd 100644
--- a/packages/fieldset/src/LionFieldset.js
+++ b/packages/ui/src/fieldset/LionFieldset.js
@@ -1,5 +1,5 @@
-import { LitElement } from '@lion/core';
-import { FormGroupMixin } from '@lion/form-core';
+import { LitElement } from 'lit';
+import { FormGroupMixin } from '@lion/ui/form-core.js';
 
 /**
  * @desc LionFieldset is basically a 'sub form' and can have its own nested sub forms.
diff --git a/packages/ui/src/fieldset/test/lion-fieldset.test.js b/packages/ui/src/fieldset/test/lion-fieldset.test.js
new file mode 100644
index 000000000..cf238f9ae
--- /dev/null
+++ b/packages/ui/src/fieldset/test/lion-fieldset.test.js
@@ -0,0 +1,9 @@
+import {
+  runFormGroupMixinSuite,
+  runFormGroupMixinInputSuite,
+} from '@lion/ui/form-core-test-suites.js';
+
+import '@lion/ui/define/lion-fieldset.js';
+
+runFormGroupMixinSuite({ tagString: 'lion-fieldset' });
+runFormGroupMixinInputSuite({ tagString: 'lion-fieldset' });
diff --git a/packages/form-core/src/FocusMixin.js b/packages/ui/src/form-core/FocusMixin.js
similarity index 99%
rename from packages/form-core/src/FocusMixin.js
rename to packages/ui/src/form-core/FocusMixin.js
index 4b46f7d59..21f7e6b82 100644
--- a/packages/form-core/src/FocusMixin.js
+++ b/packages/ui/src/form-core/FocusMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 const windowWithOptionalPolyfill =
   /** @type {Window & typeof globalThis & {applyFocusVisiblePolyfill?: function}} */ (window);
diff --git a/packages/form-core/src/FormControlMixin.js b/packages/ui/src/form-core/FormControlMixin.js
similarity index 98%
rename from packages/form-core/src/FormControlMixin.js
rename to packages/ui/src/form-core/FormControlMixin.js
index 9215f5e4a..0bf8a5752 100644
--- a/packages/form-core/src/FormControlMixin.js
+++ b/packages/ui/src/form-core/FormControlMixin.js
@@ -1,4 +1,6 @@
-import { css, dedupeMixin, html, nothing, SlotMixin, DisabledMixin, uuid } from '@lion/core';
+import { SlotMixin, DisabledMixin, uuid } from '@lion/ui/core.js';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
+import { css, html, nothing } from 'lit';
 import { getAriaElementsInRightDomOrder } from './utils/getAriaElementsInRightDomOrder.js';
 import { Unparseable } from './validate/Unparseable.js';
 import { FormRegisteringMixin } from './registration/FormRegisteringMixin.js';
@@ -10,10 +12,10 @@ import { FormRegisteringMixin } from './registration/FormRegisteringMixin.js';
  * @typedef {import('@lion/core/types/SlotMixinTypes').SlotsMap} SlotsMap
  * @typedef {import('./validate/LionValidationFeedback').LionValidationFeedback} LionValidationFeedback
  * @typedef {import('../types/choice-group/ChoiceInputMixinTypes').ChoiceInputHost} ChoiceInputHost
- * @typedef {import('../types/FormControlMixinTypes.js').FormControlHost} FormControlHost
- * @typedef {import('../types/FormControlMixinTypes.js').HTMLElementWithValue} HTMLElementWithValue
- * @typedef {import('../types/FormControlMixinTypes.js').FormControlMixin} FormControlMixin
- * @typedef {import('../types/FormControlMixinTypes.js').ModelValueEventDetails} ModelValueEventDetails
+ * @typedef {import('../types/FormControlMixinTypes.js.js').FormControlHost} FormControlHost
+ * @typedef {import('../types/FormControlMixinTypes.js.js').HTMLElementWithValue} HTMLElementWithValue
+ * @typedef {import('../types/FormControlMixinTypes.js.js').FormControlMixin} FormControlMixin
+ * @typedef {import('../types/FormControlMixinTypes.js.js').ModelValueEventDetails} ModelValueEventDetails
  */
 
 /**
diff --git a/packages/form-core/src/FormatMixin.js b/packages/ui/src/form-core/FormatMixin.js
similarity index 99%
rename from packages/form-core/src/FormatMixin.js
rename to packages/ui/src/form-core/FormatMixin.js
index 5c6a53820..6063e9740 100644
--- a/packages/form-core/src/FormatMixin.js
+++ b/packages/ui/src/form-core/FormatMixin.js
@@ -1,6 +1,6 @@
 /* eslint-disable class-methods-use-this */
 
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormControlMixin } from './FormControlMixin.js';
 import { Unparseable } from './validate/Unparseable.js';
 import { ValidateMixin } from './validate/ValidateMixin.js';
@@ -8,7 +8,7 @@ import { ValidateMixin } from './validate/ValidateMixin.js';
 /**
  * @typedef {import('../types/FormatMixinTypes').FormatMixin} FormatMixin
  * @typedef {import('../types/FormatMixinTypes').FormatOptions} FormatOptions
- * @typedef {import('../types/FormControlMixinTypes.js').ModelValueEventDetails} ModelValueEventDetails
+ * @typedef {import('../types/FormControlMixinTypes.js.js').ModelValueEventDetails} ModelValueEventDetails
  */
 
 // For a future breaking release:
diff --git a/packages/form-core/src/InteractionStateMixin.js b/packages/ui/src/form-core/InteractionStateMixin.js
similarity index 99%
rename from packages/form-core/src/InteractionStateMixin.js
rename to packages/ui/src/form-core/InteractionStateMixin.js
index 92e9bb58b..bf8d97529 100644
--- a/packages/form-core/src/InteractionStateMixin.js
+++ b/packages/ui/src/form-core/InteractionStateMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormControlMixin } from './FormControlMixin.js';
 
 /**
diff --git a/packages/form-core/src/LionField.js b/packages/ui/src/form-core/LionField.js
similarity index 96%
rename from packages/form-core/src/LionField.js
rename to packages/ui/src/form-core/LionField.js
index 2b998380b..30f680a74 100644
--- a/packages/form-core/src/LionField.js
+++ b/packages/ui/src/form-core/LionField.js
@@ -1,4 +1,5 @@
-import { LitElement, SlotMixin } from '@lion/core';
+import { LitElement } from 'lit';
+import { SlotMixin } from '@lion/ui/core.js';
 import { ValidateMixin } from './validate/ValidateMixin.js';
 import { FocusMixin } from './FocusMixin.js';
 import { FormatMixin } from './FormatMixin.js';
diff --git a/packages/form-core/src/NativeTextFieldMixin.js b/packages/ui/src/form-core/NativeTextFieldMixin.js
similarity index 98%
rename from packages/form-core/src/NativeTextFieldMixin.js
rename to packages/ui/src/form-core/NativeTextFieldMixin.js
index c4f39931a..ead9e66ef 100644
--- a/packages/form-core/src/NativeTextFieldMixin.js
+++ b/packages/ui/src/form-core/NativeTextFieldMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormControlMixin } from './FormControlMixin.js';
 import { FocusMixin } from './FocusMixin.js';
 import { FormatMixin } from './FormatMixin.js';
diff --git a/packages/form-core/src/choice-group/ChoiceGroupMixin.js b/packages/ui/src/form-core/choice-group/ChoiceGroupMixin.js
similarity index 99%
rename from packages/form-core/src/choice-group/ChoiceGroupMixin.js
rename to packages/ui/src/form-core/choice-group/ChoiceGroupMixin.js
index 770955a03..28aecf1f4 100644
--- a/packages/form-core/src/choice-group/ChoiceGroupMixin.js
+++ b/packages/ui/src/form-core/choice-group/ChoiceGroupMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormRegistrarMixin } from '../registration/FormRegistrarMixin.js';
 import { InteractionStateMixin } from '../InteractionStateMixin.js';
 
diff --git a/packages/form-core/src/choice-group/ChoiceInputMixin.js b/packages/ui/src/form-core/choice-group/ChoiceInputMixin.js
similarity index 99%
rename from packages/form-core/src/choice-group/ChoiceInputMixin.js
rename to packages/ui/src/form-core/choice-group/ChoiceInputMixin.js
index f49e0656a..bcd9d928b 100644
--- a/packages/form-core/src/choice-group/ChoiceInputMixin.js
+++ b/packages/ui/src/form-core/choice-group/ChoiceInputMixin.js
@@ -1,6 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { css, html, nothing, dedupeMixin } from '@lion/core';
+import { css, html, nothing } from 'lit';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormatMixin } from '../FormatMixin.js';
 
 /**
diff --git a/packages/form-core/src/form-group/FormElementsHaveNoError.js b/packages/ui/src/form-core/form-group/FormElementsHaveNoError.js
similarity index 100%
rename from packages/form-core/src/form-group/FormElementsHaveNoError.js
rename to packages/ui/src/form-core/form-group/FormElementsHaveNoError.js
diff --git a/packages/form-core/src/form-group/FormGroupMixin.js b/packages/ui/src/form-core/form-group/FormGroupMixin.js
similarity index 99%
rename from packages/form-core/src/form-group/FormGroupMixin.js
rename to packages/ui/src/form-core/form-group/FormGroupMixin.js
index e55c7475a..5d556233d 100644
--- a/packages/form-core/src/form-group/FormGroupMixin.js
+++ b/packages/ui/src/form-core/form-group/FormGroupMixin.js
@@ -1,4 +1,6 @@
-import { dedupeMixin, html, SlotMixin, DisabledMixin } from '@lion/core';
+import { html } from 'lit';
+import { SlotMixin, DisabledMixin } from '@lion/ui/core.js';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormControlMixin } from '../FormControlMixin.js';
 import { FormControlsCollection } from '../registration/FormControlsCollection.js';
 import { FormRegistrarMixin } from '../registration/FormRegistrarMixin.js';
diff --git a/packages/form-core/src/registration/FormControlsCollection.js b/packages/ui/src/form-core/registration/FormControlsCollection.js
similarity index 100%
rename from packages/form-core/src/registration/FormControlsCollection.js
rename to packages/ui/src/form-core/registration/FormControlsCollection.js
diff --git a/packages/form-core/src/registration/FormRegisteringMixin.js b/packages/ui/src/form-core/registration/FormRegisteringMixin.js
similarity index 97%
rename from packages/form-core/src/registration/FormRegisteringMixin.js
rename to packages/ui/src/form-core/registration/FormRegisteringMixin.js
index bdea2910b..d48a9f136 100644
--- a/packages/form-core/src/registration/FormRegisteringMixin.js
+++ b/packages/ui/src/form-core/registration/FormRegisteringMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 /**
  * @typedef {import('@lion/core').LitElement} LitElement
diff --git a/packages/form-core/src/registration/FormRegistrarMixin.js b/packages/ui/src/form-core/registration/FormRegistrarMixin.js
similarity index 99%
rename from packages/form-core/src/registration/FormRegistrarMixin.js
rename to packages/ui/src/form-core/registration/FormRegistrarMixin.js
index 7ecd5fc71..0bd2fbc7a 100644
--- a/packages/form-core/src/registration/FormRegistrarMixin.js
+++ b/packages/ui/src/form-core/registration/FormRegistrarMixin.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FormControlsCollection } from './FormControlsCollection.js';
 import { FormRegisteringMixin } from './FormRegisteringMixin.js';
 
diff --git a/packages/form-core/src/registration/FormRegistrarPortalMixin.js b/packages/ui/src/form-core/registration/FormRegistrarPortalMixin.js
similarity index 97%
rename from packages/form-core/src/registration/FormRegistrarPortalMixin.js
rename to packages/ui/src/form-core/registration/FormRegistrarPortalMixin.js
index 9e9e768c9..102f1b469 100644
--- a/packages/form-core/src/registration/FormRegistrarPortalMixin.js
+++ b/packages/ui/src/form-core/registration/FormRegistrarPortalMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 /**
  * @typedef {import('../../types/registration/FormRegistrarPortalMixinTypes').FormRegistrarPortalMixin} FormRegistrarPortalMixin
diff --git a/packages/form-core/test-helpers/ExampleValidators.js b/packages/ui/src/form-core/test-helpers/ExampleValidators.js
similarity index 93%
rename from packages/form-core/test-helpers/ExampleValidators.js
rename to packages/ui/src/form-core/test-helpers/ExampleValidators.js
index 335b56ee7..52c6b26c6 100644
--- a/packages/form-core/test-helpers/ExampleValidators.js
+++ b/packages/ui/src/form-core/test-helpers/ExampleValidators.js
@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file, class-methods-use-this */
-import { Validator } from '../src/validate/Validator.js';
+import { Validator } from '@lion/ui/form-core.js';
 
 export class AlwaysInvalid extends Validator {
   static get validatorName() {
diff --git a/packages/form-core/test-helpers/getFormControlMembers.js b/packages/ui/src/form-core/test-helpers/getFormControlMembers.js
similarity index 100%
rename from packages/form-core/test-helpers/getFormControlMembers.js
rename to packages/ui/src/form-core/test-helpers/getFormControlMembers.js
diff --git a/packages/form-core/test-helpers/mimicUserInput.js b/packages/ui/src/form-core/test-helpers/mimicUserInput.js
similarity index 100%
rename from packages/form-core/test-helpers/mimicUserInput.js
rename to packages/ui/src/form-core/test-helpers/mimicUserInput.js
diff --git a/packages/form-core/test-suites/FormRegistrationMixins.suite.js b/packages/ui/src/form-core/test-suites/FormRegistrationMixins.suite.js
similarity index 97%
rename from packages/form-core/test-suites/FormRegistrationMixins.suite.js
rename to packages/ui/src/form-core/test-suites/FormRegistrationMixins.suite.js
index 67363b43d..49b691d27 100644
--- a/packages/form-core/test-suites/FormRegistrationMixins.suite.js
+++ b/packages/ui/src/form-core/test-suites/FormRegistrationMixins.suite.js
@@ -1,8 +1,11 @@
-import { LitElement, uuid } from '@lion/core';
+import { LitElement } from 'lit';
+import { uuid } from '@lion/ui/core.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
-import { FormRegisteringMixin } from '../src/registration/FormRegisteringMixin.js';
-import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js';
-import { FormRegistrarPortalMixin } from '../src/registration/FormRegistrarPortalMixin.js';
+import {
+  FormRegisteringMixin,
+  FormRegistrarMixin,
+  FormRegistrarPortalMixin,
+} from '@lion/ui/form-core.js';
 
 /**
  * @typedef {Object} customConfig
diff --git a/packages/form-core/test-suites/FormatMixin.suite.js b/packages/ui/src/form-core/test-suites/FormatMixin.suite.js
similarity index 98%
rename from packages/form-core/test-suites/FormatMixin.suite.js
rename to packages/ui/src/form-core/test-suites/FormatMixin.suite.js
index c09a6ee32..264c7f63c 100644
--- a/packages/form-core/test-suites/FormatMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/FormatMixin.suite.js
@@ -1,10 +1,9 @@
-import { LitElement } from '@lion/core';
-import { parseDate } from '@lion/localize';
+import { LitElement } from 'lit';
+import { parseDate } from '@lion/ui/localize.js';
 import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { Unparseable, Validator } from '../index.js';
-import { FormatMixin } from '../src/FormatMixin.js';
-import { getFormControlMembers, mimicUserInput } from '../test-helpers/index.js';
+import { Unparseable, Validator, FormatMixin } from '@lion/ui/form-core.js';
+import { getFormControlMembers, mimicUserInput } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @typedef {import('../types/FormControlMixinTypes').FormControlHost} FormControlHost
diff --git a/packages/form-core/test-suites/InteractionStateMixin.suite.js b/packages/ui/src/form-core/test-suites/InteractionStateMixin.suite.js
similarity index 96%
rename from packages/form-core/test-suites/InteractionStateMixin.suite.js
rename to packages/ui/src/form-core/test-suites/InteractionStateMixin.suite.js
index 7a61b4002..4c4d460a6 100644
--- a/packages/form-core/test-suites/InteractionStateMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/InteractionStateMixin.suite.js
@@ -1,4 +1,4 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import {
   defineCE,
   expect,
@@ -9,10 +9,8 @@ import {
   unsafeStatic,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
-import { InteractionStateMixin } from '../src/InteractionStateMixin.js';
-import { ValidateMixin } from '../src/validate/ValidateMixin.js';
-import { MinLength } from '../src/validate/validators/StringValidators.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+import { InteractionStateMixin, ValidateMixin, MinLength } from '@lion/ui/form-core.js';
 
 /**
  * @param {{tagString?: string, allowedModelValueTypes?: Array.<ArrayConstructor | ObjectConstructor | NumberConstructor | BooleanConstructor | StringConstructor | DateConstructor>}} [customConfig]
diff --git a/packages/form-core/test-suites/NativeTextFieldMixin.suite.js b/packages/ui/src/form-core/test-suites/NativeTextFieldMixin.suite.js
similarity index 94%
rename from packages/form-core/test-suites/NativeTextFieldMixin.suite.js
rename to packages/ui/src/form-core/test-suites/NativeTextFieldMixin.suite.js
index ea49a855c..9549d89a8 100644
--- a/packages/form-core/test-suites/NativeTextFieldMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/NativeTextFieldMixin.suite.js
@@ -1,9 +1,9 @@
-import { LitElement } from '@lion/core';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { LitElement } from 'lit';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 import { defineCE, expect, fixture, html, triggerFocusFor, unsafeStatic } from '@open-wc/testing';
 import { sendKeys } from '@web/test-runner-commands';
 import { spy } from 'sinon';
-import { NativeTextFieldMixin } from '../src/NativeTextFieldMixin.js';
+import { NativeTextFieldMixin } from '@lion/ui/form-core.js';
 
 const isFirefox = (() => {
   const ua = navigator.userAgent.toLowerCase();
diff --git a/packages/form-core/test-suites/ValidateMixin.suite.js b/packages/ui/src/form-core/test-suites/ValidateMixin.suite.js
similarity index 99%
rename from packages/form-core/test-suites/ValidateMixin.suite.js
rename to packages/ui/src/form-core/test-suites/ValidateMixin.suite.js
index c92744f4d..f05065760 100644
--- a/packages/form-core/test-suites/ValidateMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/ValidateMixin.suite.js
@@ -1,6 +1,12 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import {
+  getFormControlMembers,
+  AlwaysInvalid,
+  AlwaysValid,
+  AsyncAlwaysInvalid,
+  AsyncAlwaysValid,
+} from '@lion/ui/form-core-test-helpers.js';
 import sinon from 'sinon';
 import {
   MaxLength,
@@ -10,17 +16,13 @@ import {
   Unparseable,
   ValidateMixin,
   Validator,
-} from '../index.js';
-import {
-  AlwaysInvalid,
-  AlwaysValid,
-  AsyncAlwaysInvalid,
-  AsyncAlwaysValid,
-} from '../test-helpers/index.js';
-import '../define.js';
+} from '@lion/ui/form-core.js';
+
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
 
 /**
- * @typedef {import('../').LionField} LionField
+ * @typedef {import('..').LionField} LionField
  */
 
 /**
diff --git a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js b/packages/ui/src/form-core/test-suites/ValidateMixinFeedbackPart.suite.js
similarity index 98%
rename from packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js
rename to packages/ui/src/form-core/test-suites/ValidateMixinFeedbackPart.suite.js
index 6fcc86478..5dc882f0e 100644
--- a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js
+++ b/packages/ui/src/form-core/test-suites/ValidateMixinFeedbackPart.suite.js
@@ -1,8 +1,8 @@
-import { LitElement } from '@lion/core';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { LitElement } from 'lit';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers, AlwaysInvalid } from '@lion/ui/form-core-test-helpers.js';
 import sinon from 'sinon';
 import {
   DefaultSuccess,
@@ -11,8 +11,7 @@ import {
   Required,
   ValidateMixin,
   Validator,
-} from '../index.js';
-import { AlwaysInvalid } from '../test-helpers/index.js';
+} from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('../types').FeedbackMessageData} FeedbackMessageData
diff --git a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js b/packages/ui/src/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
similarity index 98%
rename from packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
rename to packages/ui/src/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
index 621665a03..1405cc29c 100644
--- a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
@@ -1,11 +1,16 @@
-import { LitElement } from '@lion/core';
-import '@lion/fieldset/define';
-import { FormGroupMixin, Required } from '@lion/form-core';
-import { LionInput } from '@lion/input';
+import { LitElement } from 'lit';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-checkbox.js';
+import {
+  FormGroupMixin,
+  Required,
+  ChoiceGroupMixin,
+  ChoiceInputMixin,
+} from '@lion/ui/form-core.js';
+import { LionInput } from '@lion/ui/input.js';
 import { expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { ChoiceGroupMixin } from '../../src/choice-group/ChoiceGroupMixin.js';
-import { ChoiceInputMixin } from '../../src/choice-group/ChoiceInputMixin.js';
 
 class ChoiceInputFoo extends ChoiceInputMixin(LionInput) {}
 customElements.define('choice-input-foo', ChoiceInputFoo);
diff --git a/packages/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js b/packages/ui/src/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js
similarity index 98%
rename from packages/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js
rename to packages/ui/src/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js
index 223251124..b74614587 100644
--- a/packages/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/choice-group/ChoiceInputMixin.suite.js
@@ -1,10 +1,9 @@
-import { Required } from '@lion/form-core';
-import { LionInput } from '@lion/input';
+import { Required, ChoiceInputMixin } from '@lion/ui/form-core.js';
+import { LionInput } from '@lion/ui/input.js';
 import { expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 import sinon from 'sinon';
-import { ChoiceInputMixin } from '../../src/choice-group/ChoiceInputMixin.js';
 
 class ChoiceInput extends ChoiceInputMixin(LionInput) {
   constructor() {
diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js b/packages/ui/src/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
similarity index 97%
rename from packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
rename to packages/ui/src/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
index 0e50d3d8f..363d6f804 100644
--- a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
+++ b/packages/ui/src/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
@@ -1,10 +1,11 @@
-import { LitElement } from '@lion/core';
-import '@lion/form-core/define';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
-import { LionInput } from '@lion/input';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { LitElement } from 'lit';
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+import { LionInput } from '@lion/ui/input.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
-import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js';
+import { FormGroupMixin } from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('@lion/form-core').LionField} LionField
diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js b/packages/ui/src/form-core/test-suites/form-group/FormGroupMixin.suite.js
similarity index 99%
rename from packages/form-core/test-suites/form-group/FormGroupMixin.suite.js
rename to packages/ui/src/form-core/test-suites/form-group/FormGroupMixin.suite.js
index 70061675f..4130ac8e8 100644
--- a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js
+++ b/packages/ui/src/form-core/test-suites/form-group/FormGroupMixin.suite.js
@@ -1,7 +1,9 @@
-import { LitElement } from '@lion/core';
-import { IsNumber, LionField, Validator } from '@lion/form-core';
-import '@lion/form-core/define';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { LitElement } from 'lit';
+import { IsNumber, LionField, Validator, FormGroupMixin } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
+
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import {
   aTimeout,
   defineCE,
@@ -12,8 +14,7 @@ import {
   unsafeStatic,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js';
-import { getFormControlMembers } from '../../test-helpers/getFormControlMembers.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @param {{ tagString?: string, childTagString?:string }} [cfg]
diff --git a/packages/form-core/test/FocusMixin.test.js b/packages/ui/src/form-core/test/FocusMixin.test.js
similarity index 99%
rename from packages/form-core/test/FocusMixin.test.js
rename to packages/ui/src/form-core/test/FocusMixin.test.js
index 0a1aaf113..c5c5edb01 100644
--- a/packages/form-core/test/FocusMixin.test.js
+++ b/packages/ui/src/form-core/test/FocusMixin.test.js
@@ -1,7 +1,7 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { defineCE, expect, fixture, html, oneEvent, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { FocusMixin } from '../src/FocusMixin.js';
+import { FocusMixin } from '@lion/ui/form-core.js';
 
 const windowWithOptionalPolyfill =
   /** @type {Window & typeof globalThis & {applyFocusVisiblePolyfill?: function}} */ (window);
diff --git a/packages/form-core/test/FormControlMixin.test.js b/packages/ui/src/form-core/test/FormControlMixin.test.js
similarity index 98%
rename from packages/form-core/test/FormControlMixin.test.js
rename to packages/ui/src/form-core/test/FormControlMixin.test.js
index df18d36b8..74f041868 100644
--- a/packages/form-core/test/FormControlMixin.test.js
+++ b/packages/ui/src/form-core/test/FormControlMixin.test.js
@@ -1,11 +1,13 @@
-import { LitElement } from '@lion/core';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { LitElement } from 'lit';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { FocusMixin } from '../src/FocusMixin.js';
-import { FormGroupMixin } from '../src/form-group/FormGroupMixin.js';
-import { FormControlMixin } from '../src/FormControlMixin.js';
-import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js';
+import {
+  FocusMixin,
+  FormGroupMixin,
+  FormControlMixin,
+  FormRegistrarMixin,
+} from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('../types/FormControlMixinTypes').FormControlHost} FormControlHost
diff --git a/packages/form-core/test/FormRegistrationMixins.test.js b/packages/ui/src/form-core/test/FormRegistrationMixins.test.js
similarity index 90%
rename from packages/form-core/test/FormRegistrationMixins.test.js
rename to packages/ui/src/form-core/test/FormRegistrationMixins.test.js
index b133b305f..605fc41a4 100644
--- a/packages/form-core/test/FormRegistrationMixins.test.js
+++ b/packages/ui/src/form-core/test/FormRegistrationMixins.test.js
@@ -1,4 +1,4 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { html } from 'lit/static-html.js';
 import { runRegistrationSuite } from '../test-suites/FormRegistrationMixins.suite.js';
 
diff --git a/packages/form-core/test/FormatMixin.test.js b/packages/ui/src/form-core/test/FormatMixin.test.js
similarity index 100%
rename from packages/form-core/test/FormatMixin.test.js
rename to packages/ui/src/form-core/test/FormatMixin.test.js
diff --git a/packages/form-core/test/InteractionStateMixin.test.js b/packages/ui/src/form-core/test/InteractionStateMixin.test.js
similarity index 100%
rename from packages/form-core/test/InteractionStateMixin.test.js
rename to packages/ui/src/form-core/test/InteractionStateMixin.test.js
diff --git a/packages/form-core/test/NativeTextFieldMixin.test.js b/packages/ui/src/form-core/test/NativeTextFieldMixin.test.js
similarity index 100%
rename from packages/form-core/test/NativeTextFieldMixin.test.js
rename to packages/ui/src/form-core/test/NativeTextFieldMixin.test.js
diff --git a/packages/ui/src/form-core/test/choice-group/ChoiceGroupMixin.test.js b/packages/ui/src/form-core/test/choice-group/ChoiceGroupMixin.test.js
new file mode 100644
index 000000000..c19cecd08
--- /dev/null
+++ b/packages/ui/src/form-core/test/choice-group/ChoiceGroupMixin.test.js
@@ -0,0 +1,3 @@
+import { runChoiceGroupMixinSuite } from '@lion/ui/form-core-test-suites.js';
+
+runChoiceGroupMixinSuite();
diff --git a/packages/form-core/test/choice-group/ChoiceInputMixin.test.js b/packages/ui/src/form-core/test/choice-group/ChoiceInputMixin.test.js
similarity index 100%
rename from packages/form-core/test/choice-group/ChoiceInputMixin.test.js
rename to packages/ui/src/form-core/test/choice-group/ChoiceInputMixin.test.js
diff --git a/packages/form-core/test/form-group/FormGroupMixin.test.js b/packages/ui/src/form-core/test/form-group/FormGroupMixin.test.js
similarity index 100%
rename from packages/form-core/test/form-group/FormGroupMixin.test.js
rename to packages/ui/src/form-core/test/form-group/FormGroupMixin.test.js
diff --git a/packages/form-core/test/lion-field.test.js b/packages/ui/src/form-core/test/lion-field.test.js
similarity index 96%
rename from packages/form-core/test/lion-field.test.js
rename to packages/ui/src/form-core/test/lion-field.test.js
index 7a5bcba72..a191c25ea 100644
--- a/packages/form-core/test/lion-field.test.js
+++ b/packages/ui/src/form-core/test/lion-field.test.js
@@ -1,9 +1,9 @@
-import { unsafeHTML } from '@lion/core';
-import { Required, Validator } from '@lion/form-core';
-import '@lion/form-core/define-field';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
+import { Required, Validator } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-field.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 import {
   expect,
   fixture,
@@ -15,7 +15,7 @@ import {
 import sinon from 'sinon';
 
 /**
- * @typedef {import('../src/LionField.js').LionField} LionField
+ * @typedef {import('../src/LionField.js.js').LionField} LionField
  * @typedef {import('../types/FormControlMixinTypes').FormControlHost} FormControlHost
  * @typedef {FormControlHost & HTMLElement & {_parentFormGroup?:HTMLElement, checked?:boolean}} FormControl
  */
@@ -28,7 +28,7 @@ const inputSlotString = '<input slot="input" />';
 const inputSlot = unsafeHTML(inputSlotString);
 
 /**
- * @param {import("../index.js").LionField} formControl
+ * @param {import("../index.js.js").LionField} formControl
  * @param {string} newViewValue
  */
 function mimicUserInput(formControl, newViewValue) {
@@ -252,7 +252,7 @@ describe('<lion-field>', () => {
       );
 
       /**
-       * @param {import("../index.js").LionField} _sceneEl
+       * @param {import("../index.js.js").LionField} _sceneEl
        * @param {{ index?: number; el: any; wantedShowsFeedbackFor: any; }} scenario
        */
       const executeScenario = async (_sceneEl, scenario) => {
diff --git a/packages/form-core/test/utils/SyncUpdatableMixin.test.js b/packages/ui/src/form-core/test/utils/SyncUpdatableMixin.test.js
similarity index 98%
rename from packages/form-core/test/utils/SyncUpdatableMixin.test.js
rename to packages/ui/src/form-core/test/utils/SyncUpdatableMixin.test.js
index d04b58530..d8aca78a1 100644
--- a/packages/form-core/test/utils/SyncUpdatableMixin.test.js
+++ b/packages/ui/src/form-core/test/utils/SyncUpdatableMixin.test.js
@@ -1,7 +1,7 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { defineCE, expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { SyncUpdatableMixin } from '../../src/utils/SyncUpdatableMixin.js';
+import { SyncUpdatableMixin } from '../../utils/SyncUpdatableMixin.js';
 
 describe('SyncUpdatableMixin', () => {
   describe('Until firstUpdated', () => {
diff --git a/packages/form-core/test/utils/getAriaElementsInRightDomOrder.test.js b/packages/ui/src/form-core/test/utils/getAriaElementsInRightDomOrder.test.js
similarity index 93%
rename from packages/form-core/test/utils/getAriaElementsInRightDomOrder.test.js
rename to packages/ui/src/form-core/test/utils/getAriaElementsInRightDomOrder.test.js
index 0adbdaf51..58d58eb29 100644
--- a/packages/form-core/test/utils/getAriaElementsInRightDomOrder.test.js
+++ b/packages/ui/src/form-core/test/utils/getAriaElementsInRightDomOrder.test.js
@@ -1,8 +1,8 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import { browserDetection } from '@lion/core';
-import { getAriaElementsInRightDomOrder } from '../../src/utils/getAriaElementsInRightDomOrder.js';
+import { browserDetection } from '@lion/ui/core.js';
+import { getAriaElementsInRightDomOrder } from '../../utils/getAriaElementsInRightDomOrder.js';
 
 describe('getAriaElementsInRightDomOrder', () => {
   it('orders by putting preceding siblings and local parents first', async () => {
diff --git a/packages/form-core/test/validate/DateValidators.test.js b/packages/ui/src/form-core/test/validate/DateValidators.test.js
similarity index 94%
rename from packages/form-core/test/validate/DateValidators.test.js
rename to packages/ui/src/form-core/test/validate/DateValidators.test.js
index 3d6e90098..c5dead565 100644
--- a/packages/form-core/test/validate/DateValidators.test.js
+++ b/packages/ui/src/form-core/test/validate/DateValidators.test.js
@@ -1,13 +1,7 @@
 import { expect } from '@open-wc/testing';
 
-import { normalizeDateTime } from '@lion/localize';
-import {
-  IsDate,
-  MinDate,
-  MaxDate,
-  MinMaxDate,
-  IsDateDisabled,
-} from '../../src/validate/validators/DateValidators.js';
+import { normalizeDateTime } from '@lion/ui/localize.js';
+import { IsDate, MinDate, MaxDate, MinMaxDate, IsDateDisabled } from '@lion/ui/form-core.js';
 
 describe('Date Validation', () => {
   it('provides new isDate() to allow only dates', () => {
diff --git a/packages/form-core/test/validate/NumberValidators.test.js b/packages/ui/src/form-core/test/validate/NumberValidators.test.js
similarity index 93%
rename from packages/form-core/test/validate/NumberValidators.test.js
rename to packages/ui/src/form-core/test/validate/NumberValidators.test.js
index ca74c10fa..7b2b38d69 100644
--- a/packages/form-core/test/validate/NumberValidators.test.js
+++ b/packages/ui/src/form-core/test/validate/NumberValidators.test.js
@@ -1,11 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import {
-  IsNumber,
-  MinNumber,
-  MaxNumber,
-  MinMaxNumber,
-} from '../../src/validate/validators/NumberValidators.js';
+import { IsNumber, MinNumber, MaxNumber, MinMaxNumber } from '@lion/ui/form-core.js';
 
 describe('Number Validation', () => {
   it('provides new IsNumber() to allow only numbers', () => {
diff --git a/packages/form-core/test/validate/Required.test.js b/packages/ui/src/form-core/test/validate/Required.test.js
similarity index 93%
rename from packages/form-core/test/validate/Required.test.js
rename to packages/ui/src/form-core/test/validate/Required.test.js
index 097f6abd8..7799c26f7 100644
--- a/packages/form-core/test/validate/Required.test.js
+++ b/packages/ui/src/form-core/test/validate/Required.test.js
@@ -1,7 +1,6 @@
-import { LionField } from '@lion/form-core';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { LionField, Required } from '@lion/ui/form-core.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
-import { Required } from '../../src/validate/validators/Required.js';
 
 /**
  * @typedef {import('../../types/FormControlMixinTypes.js').FormControlHost} FormControlHost
diff --git a/packages/form-core/test/validate/ResultValidator.test.js b/packages/ui/src/form-core/test/validate/ResultValidator.test.js
similarity index 83%
rename from packages/form-core/test/validate/ResultValidator.test.js
rename to packages/ui/src/form-core/test/validate/ResultValidator.test.js
index a933eac27..fa998ec89 100644
--- a/packages/form-core/test/validate/ResultValidator.test.js
+++ b/packages/ui/src/form-core/test/validate/ResultValidator.test.js
@@ -1,8 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { ResultValidator } from '../../src/validate/ResultValidator.js';
-import { DefaultSuccess } from '../../src/validate/resultValidators/DefaultSuccess.js';
-import { Required } from '../../src/validate/validators/Required.js';
-import { MinLength } from '../../src/validate/validators/StringValidators.js';
+import { MinLength, Required, DefaultSuccess, ResultValidator } from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('../../src/validate/Validator').Validator} Validator
diff --git a/packages/form-core/test/validate/StringValidators.test.js b/packages/ui/src/form-core/test/validate/StringValidators.test.js
similarity index 98%
rename from packages/form-core/test/validate/StringValidators.test.js
rename to packages/ui/src/form-core/test/validate/StringValidators.test.js
index e6834f321..8039052aa 100644
--- a/packages/form-core/test/validate/StringValidators.test.js
+++ b/packages/ui/src/form-core/test/validate/StringValidators.test.js
@@ -8,7 +8,7 @@ import {
   MinMaxLength,
   IsEmail,
   Pattern,
-} from '../../src/validate/validators/StringValidators.js';
+} from '@lion/ui/form-core.js';
 
 describe('String Validation', () => {
   it('provides new IsString() to allow only strings', () => {
diff --git a/packages/ui/src/form-core/test/validate/ValidateMixin.test.js b/packages/ui/src/form-core/test/validate/ValidateMixin.test.js
new file mode 100644
index 000000000..ce3ef1383
--- /dev/null
+++ b/packages/ui/src/form-core/test/validate/ValidateMixin.test.js
@@ -0,0 +1,3 @@
+import { runValidateMixinSuite } from '@lion/ui/form-core-test-suites.js';
+
+runValidateMixinSuite();
diff --git a/packages/ui/src/form-core/test/validate/ValidateMixinFeedbackPart.test.js b/packages/ui/src/form-core/test/validate/ValidateMixinFeedbackPart.test.js
new file mode 100644
index 000000000..4a722d0b9
--- /dev/null
+++ b/packages/ui/src/form-core/test/validate/ValidateMixinFeedbackPart.test.js
@@ -0,0 +1,3 @@
+import { runValidateMixinFeedbackPart } from '@lion/ui/form-core-test-suites.js';
+
+runValidateMixinFeedbackPart();
diff --git a/packages/form-core/test/validate/Validator.test.js b/packages/ui/src/form-core/test/validate/Validator.test.js
similarity index 97%
rename from packages/form-core/test/validate/Validator.test.js
rename to packages/ui/src/form-core/test/validate/Validator.test.js
index 48019065b..5af64d7f6 100644
--- a/packages/form-core/test/validate/Validator.test.js
+++ b/packages/ui/src/form-core/test/validate/Validator.test.js
@@ -1,8 +1,7 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { ValidateMixin } from '../../src/validate/ValidateMixin.js';
-import { Validator } from '../../src/validate/Validator.js';
+import { ValidateMixin, Validator } from '@lion/ui/form-core.js';
 
 /**
  * @param {function} method
diff --git a/packages/form-core/test/validate/lion-validation-feedback.test.js b/packages/ui/src/form-core/test/validate/lion-validation-feedback.test.js
similarity index 95%
rename from packages/form-core/test/validate/lion-validation-feedback.test.js
rename to packages/ui/src/form-core/test/validate/lion-validation-feedback.test.js
index 814ae020e..2782881be 100644
--- a/packages/form-core/test/validate/lion-validation-feedback.test.js
+++ b/packages/ui/src/form-core/test/validate/lion-validation-feedback.test.js
@@ -2,8 +2,8 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import '@lion/form-core/define-validation-feedback';
-import { AlwaysInvalid, AlwaysValid } from '../../test-helpers/index.js';
+import '@lion/ui/define/lion-validation-feedback.js';
+import { AlwaysInvalid, AlwaysValid } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @typedef {import('../../src/validate/LionValidationFeedback').LionValidationFeedback} LionValidationFeedback
diff --git a/packages/form-core/types/FocusMixinTypes.d.ts b/packages/ui/src/form-core/types/FocusMixinTypes.d.ts
similarity index 96%
rename from packages/form-core/types/FocusMixinTypes.d.ts
rename to packages/ui/src/form-core/types/FocusMixinTypes.d.ts
index 668cf4a45..3f3445c9e 100644
--- a/packages/form-core/types/FocusMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/FocusMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 
 export declare class FocusHost {
   /**
diff --git a/packages/form-core/types/FormControlMixinTypes.d.ts b/packages/ui/src/form-core/types/FormControlMixinTypes.d.ts
similarity index 97%
rename from packages/form-core/types/FormControlMixinTypes.d.ts
rename to packages/ui/src/form-core/types/FormControlMixinTypes.d.ts
index 3249c3930..d09a629b5 100644
--- a/packages/form-core/types/FormControlMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/FormControlMixinTypes.d.ts
@@ -1,11 +1,11 @@
-import { LitElement, nothing, TemplateResult, CSSResultArray } from '@lion/core';
-import { SlotHost } from '@lion/core/types/SlotMixinTypes';
+import { LitElement, nothing, TemplateResult, CSSResultArray } from '@lion/ui/core.js';
+import { SlotHost } from '@lion/ui/core/types/SlotMixinTypes.js';
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { DisabledHost } from '@lion/core/types/DisabledMixinTypes';
+import { DisabledHost } from '@lion/ui/core/types/DisabledMixinTypes.js';
 import { FormRegisteringHost } from './registration/FormRegisteringMixinTypes';
 
 import { LionValidationFeedback } from '../src/validate/LionValidationFeedback';
-import { Unparseable } from '../src/validate/Unparseable.js';
+import { Unparseable } from '../src/validate/Unparseable.js.js';
 
 export type ModelValueEventDetails = {
   /**
diff --git a/packages/form-core/types/FormatMixinTypes.d.ts b/packages/ui/src/form-core/types/FormatMixinTypes.d.ts
similarity index 98%
rename from packages/form-core/types/FormatMixinTypes.d.ts
rename to packages/ui/src/form-core/types/FormatMixinTypes.d.ts
index f678648f7..9b9dbd98b 100644
--- a/packages/form-core/types/FormatMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/FormatMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
-import { FormatNumberOptions } from '@lion/localize/types/LocalizeMixinTypes';
+import { LitElement } from 'lit';
+import { FormatNumberOptions } from '@lion/ui/localize/types/LocalizeMixinTypes.js';
 import { ValidateHost } from './validate/ValidateMixinTypes';
 import { FormControlHost } from './FormControlMixinTypes';
 
diff --git a/packages/form-core/types/InteractionStateMixinTypes.d.ts b/packages/ui/src/form-core/types/InteractionStateMixinTypes.d.ts
similarity index 98%
rename from packages/form-core/types/InteractionStateMixinTypes.d.ts
rename to packages/ui/src/form-core/types/InteractionStateMixinTypes.d.ts
index 76504027d..1fc95e562 100644
--- a/packages/form-core/types/InteractionStateMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/InteractionStateMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { FormControlHost } from './FormControlMixinTypes';
 
 /**
diff --git a/packages/form-core/types/NativeTextFieldMixinTypes.d.ts b/packages/ui/src/form-core/types/NativeTextFieldMixinTypes.d.ts
similarity index 80%
rename from packages/form-core/types/NativeTextFieldMixinTypes.d.ts
rename to packages/ui/src/form-core/types/NativeTextFieldMixinTypes.d.ts
index 9040fafff..524450d72 100644
--- a/packages/form-core/types/NativeTextFieldMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/NativeTextFieldMixinTypes.d.ts
@@ -1,8 +1,8 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
-import { FocusHost } from '@lion/form-core/types/FocusMixinTypes';
-import { FormControlHost } from '@lion/form-core/types/FormControlMixinTypes';
-import { FormatHost } from '@lion/form-core/types/FormatMixinTypes';
+import { LitElement } from 'lit';
+import { FocusHost } from '@lion/ui/form-core/types/FocusMixinTypes.js';
+import { FormControlHost } from '@lion/ui/form-core/types/FormControlMixinTypes.js';
+import { FormatHost } from '@lion/ui/form-core/types/FormatMixinTypes.js';
 
 export declare class NativeTextFieldHost {
   /**
diff --git a/packages/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts b/packages/ui/src/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts
similarity index 97%
rename from packages/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts
rename to packages/ui/src/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts
index ae47f7fac..098624cd8 100644
--- a/packages/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/choice-group/ChoiceGroupMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { FormControlHost } from '../FormControlMixinTypes';
 import { FormControl } from '../form-group/FormGroupMixinTypes';
 import { FormRegistrarHost } from '../registration/FormRegistrarMixinTypes';
diff --git a/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts b/packages/ui/src/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
similarity index 94%
rename from packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
rename to packages/ui/src/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
index ef8033d19..54975b214 100644
--- a/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement, TemplateResult } from '@lion/core';
-import { CSSResultArray } from '@lion/core';
+import { LitElement, TemplateResult } from '@lion/ui/core.js';
+import { CSSResultArray } from '@lion/ui/core.js';
 import { FormatHost } from '../FormatMixinTypes';
 
 export interface ChoiceInputModelValue {
diff --git a/packages/form-core/types/choice-group/index.d.ts b/packages/ui/src/form-core/types/choice-group/index.d.ts
similarity index 100%
rename from packages/form-core/types/choice-group/index.d.ts
rename to packages/ui/src/form-core/types/choice-group/index.d.ts
diff --git a/packages/form-core/types/form-group/FormGroupMixinTypes.d.ts b/packages/ui/src/form-core/types/form-group/FormGroupMixinTypes.d.ts
similarity index 96%
rename from packages/form-core/types/form-group/FormGroupMixinTypes.d.ts
rename to packages/ui/src/form-core/types/form-group/FormGroupMixinTypes.d.ts
index 8e4b004b0..562474048 100644
--- a/packages/form-core/types/form-group/FormGroupMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/form-group/FormGroupMixinTypes.d.ts
@@ -1,7 +1,7 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
-import { DisabledHost } from '@lion/core/types/DisabledMixinTypes';
-import { SlotHost } from '@lion/core/types/SlotMixinTypes';
+import { LitElement } from 'lit';
+import { DisabledHost } from '@lion/ui/core/types/DisabledMixinTypes.js';
+import { SlotHost } from '@lion/ui/core/types/SlotMixinTypes.js';
 import { FormControlHost } from '../FormControlMixinTypes';
 import { FormRegistrarHost } from '../registration/FormRegistrarMixinTypes';
 import { ValidateHost } from '../validate/ValidateMixinTypes';
diff --git a/packages/form-core/types/form-group/index.d.ts b/packages/ui/src/form-core/types/form-group/index.d.ts
similarity index 100%
rename from packages/form-core/types/form-group/index.d.ts
rename to packages/ui/src/form-core/types/form-group/index.d.ts
diff --git a/packages/form-core/types/index.d.ts b/packages/ui/src/form-core/types/index.d.ts
similarity index 100%
rename from packages/form-core/types/index.d.ts
rename to packages/ui/src/form-core/types/index.d.ts
diff --git a/packages/form-core/types/registration/FormRegisteringMixinTypes.d.ts b/packages/ui/src/form-core/types/registration/FormRegisteringMixinTypes.d.ts
similarity index 95%
rename from packages/form-core/types/registration/FormRegisteringMixinTypes.d.ts
rename to packages/ui/src/form-core/types/registration/FormRegisteringMixinTypes.d.ts
index f369c1a4f..3ec3bd917 100644
--- a/packages/form-core/types/registration/FormRegisteringMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/registration/FormRegisteringMixinTypes.d.ts
@@ -1,7 +1,7 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { FormRegistrarHost } from './FormRegistrarMixinTypes';
 
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 
 export declare class FormRegisteringHost {
   /**
diff --git a/packages/form-core/types/registration/FormRegistrarMixinTypes.d.ts b/packages/ui/src/form-core/types/registration/FormRegistrarMixinTypes.d.ts
similarity index 93%
rename from packages/form-core/types/registration/FormRegistrarMixinTypes.d.ts
rename to packages/ui/src/form-core/types/registration/FormRegistrarMixinTypes.d.ts
index 657305848..4730bae89 100644
--- a/packages/form-core/types/registration/FormRegistrarMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/registration/FormRegistrarMixinTypes.d.ts
@@ -1,8 +1,8 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { FormControlsCollection } from '../../src/registration/FormControlsCollection';
-import { FormRegisteringHost } from '../../types/registration/FormRegisteringMixinTypes';
-import { FormControlHost } from '../../types/FormControlMixinTypes';
-import { LitElement } from '@lion/core';
+import { FormRegisteringHost } from './FormRegisteringMixinTypes';
+import { FormControlHost } from '../FormControlMixinTypes';
+import { LitElement } from 'lit';
 
 export declare class ElementWithParentFormGroup {
   _parentFormGroup: FormRegistrarHost;
diff --git a/packages/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts b/packages/ui/src/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts
similarity index 94%
rename from packages/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts
rename to packages/ui/src/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts
index 9cc0e98e9..ee24f7ecc 100644
--- a/packages/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/registration/FormRegistrarPortalMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 
 export declare class FormRegistrarPortalHost {
   /**
diff --git a/packages/form-core/types/registration/index.d.ts b/packages/ui/src/form-core/types/registration/index.d.ts
similarity index 100%
rename from packages/form-core/types/registration/index.d.ts
rename to packages/ui/src/form-core/types/registration/index.d.ts
diff --git a/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts b/packages/ui/src/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
similarity index 97%
rename from packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
rename to packages/ui/src/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
index 092b9580e..7658b2ca0 100644
--- a/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
@@ -1,4 +1,4 @@
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { Constructor } from '@open-wc/dedupe-mixin';
 
 export declare interface SyncUpdatableNamespace {
diff --git a/packages/form-core/types/utils/index.d.ts b/packages/ui/src/form-core/types/utils/index.d.ts
similarity index 100%
rename from packages/form-core/types/utils/index.d.ts
rename to packages/ui/src/form-core/types/utils/index.d.ts
diff --git a/packages/form-core/types/validate/ValidateMixinTypes.d.ts b/packages/ui/src/form-core/types/validate/ValidateMixinTypes.d.ts
similarity index 98%
rename from packages/form-core/types/validate/ValidateMixinTypes.d.ts
rename to packages/ui/src/form-core/types/validate/ValidateMixinTypes.d.ts
index 667855124..f68e17a2b 100644
--- a/packages/form-core/types/validate/ValidateMixinTypes.d.ts
+++ b/packages/ui/src/form-core/types/validate/ValidateMixinTypes.d.ts
@@ -1,6 +1,6 @@
-import { LitElement } from '@lion/core';
-import { DisabledHost } from '@lion/core/types/DisabledMixinTypes';
-import { SlotHost } from '@lion/core/types/SlotMixinTypes';
+import { LitElement } from 'lit';
+import { DisabledHost } from '@lion/ui/core/types/DisabledMixinTypes.js';
+import { SlotHost } from '@lion/ui/core/types/SlotMixinTypes.js';
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { ScopedElementsHost } from '@open-wc/scoped-elements/src/types';
 import { FormControlHost } from '../FormControlMixinTypes';
diff --git a/packages/form-core/types/validate/index.d.ts b/packages/ui/src/form-core/types/validate/index.d.ts
similarity index 100%
rename from packages/form-core/types/validate/index.d.ts
rename to packages/ui/src/form-core/types/validate/index.d.ts
diff --git a/packages/form-core/types/validate/validate.d.ts b/packages/ui/src/form-core/types/validate/validate.d.ts
similarity index 100%
rename from packages/form-core/types/validate/validate.d.ts
rename to packages/ui/src/form-core/types/validate/validate.d.ts
diff --git a/packages/form-core/src/utils/AsyncQueue.js b/packages/ui/src/form-core/utils/AsyncQueue.js
similarity index 100%
rename from packages/form-core/src/utils/AsyncQueue.js
rename to packages/ui/src/form-core/utils/AsyncQueue.js
diff --git a/packages/form-core/src/utils/SyncUpdatableMixin.js b/packages/ui/src/form-core/utils/SyncUpdatableMixin.js
similarity index 99%
rename from packages/form-core/src/utils/SyncUpdatableMixin.js
rename to packages/ui/src/form-core/utils/SyncUpdatableMixin.js
index 28c8b3c39..f01b67bac 100644
--- a/packages/form-core/src/utils/SyncUpdatableMixin.js
+++ b/packages/ui/src/form-core/utils/SyncUpdatableMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 // TODO: will be moved to @Lion/core later?
 
diff --git a/packages/form-core/src/utils/getAriaElementsInRightDomOrder.js b/packages/ui/src/form-core/utils/getAriaElementsInRightDomOrder.js
similarity index 96%
rename from packages/form-core/src/utils/getAriaElementsInRightDomOrder.js
rename to packages/ui/src/form-core/utils/getAriaElementsInRightDomOrder.js
index 0524b3a00..5c0f99ed1 100644
--- a/packages/form-core/src/utils/getAriaElementsInRightDomOrder.js
+++ b/packages/ui/src/form-core/utils/getAriaElementsInRightDomOrder.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-bitwise */
-import { browserDetection } from '@lion/core';
+import { browserDetection } from '@lion/ui/core.js';
 
 const moveDownConditions = [
   Node.DOCUMENT_POSITION_PRECEDING,
diff --git a/packages/form-core/src/utils/pascalCase.js b/packages/ui/src/form-core/utils/pascalCase.js
similarity index 100%
rename from packages/form-core/src/utils/pascalCase.js
rename to packages/ui/src/form-core/utils/pascalCase.js
diff --git a/packages/form-core/src/validate/LionValidationFeedback.js b/packages/ui/src/form-core/validate/LionValidationFeedback.js
similarity index 94%
rename from packages/form-core/src/validate/LionValidationFeedback.js
rename to packages/ui/src/form-core/validate/LionValidationFeedback.js
index 64f4b5e9e..a5642d4d6 100644
--- a/packages/form-core/src/validate/LionValidationFeedback.js
+++ b/packages/ui/src/form-core/validate/LionValidationFeedback.js
@@ -1,7 +1,7 @@
-import { html, LitElement } from '@lion/core';
+import { html, LitElement } from 'lit';
 
 /**
- * @typedef {import('../validate/Validator').Validator} Validator
+ * @typedef {import('./Validator').Validator} Validator
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
  * @typedef {Object} messageMap
  * @property {string | Node} message
diff --git a/packages/form-core/src/validate/ResultValidator.js b/packages/ui/src/form-core/validate/ResultValidator.js
similarity index 100%
rename from packages/form-core/src/validate/ResultValidator.js
rename to packages/ui/src/form-core/validate/ResultValidator.js
diff --git a/packages/form-core/src/validate/Unparseable.js b/packages/ui/src/form-core/validate/Unparseable.js
similarity index 100%
rename from packages/form-core/src/validate/Unparseable.js
rename to packages/ui/src/form-core/validate/Unparseable.js
diff --git a/packages/form-core/src/validate/ValidateMixin.js b/packages/ui/src/form-core/validate/ValidateMixin.js
similarity index 99%
rename from packages/form-core/src/validate/ValidateMixin.js
rename to packages/ui/src/form-core/validate/ValidateMixin.js
index 1a314d8d1..d80151ed0 100644
--- a/packages/form-core/src/validate/ValidateMixin.js
+++ b/packages/ui/src/form-core/validate/ValidateMixin.js
@@ -1,7 +1,9 @@
 /* eslint-disable class-methods-use-this, camelcase, no-param-reassign, max-classes-per-file */
-import { dedupeMixin, ScopedElementsMixin, SlotMixin, DisabledMixin } from '@lion/core';
+import { SlotMixin, DisabledMixin } from '@lion/ui/core.js';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 // TODO: make form-core independent from localize
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 import { AsyncQueue } from '../utils/AsyncQueue.js';
 import { pascalCase } from '../utils/pascalCase.js';
 import { SyncUpdatableMixin } from '../utils/SyncUpdatableMixin.js';
diff --git a/packages/form-core/src/validate/Validator.js b/packages/ui/src/form-core/validate/Validator.js
similarity index 100%
rename from packages/form-core/src/validate/Validator.js
rename to packages/ui/src/form-core/validate/Validator.js
diff --git a/packages/form-core/src/validate/resultValidators/DefaultSuccess.js b/packages/ui/src/form-core/validate/resultValidators/DefaultSuccess.js
similarity index 100%
rename from packages/form-core/src/validate/resultValidators/DefaultSuccess.js
rename to packages/ui/src/form-core/validate/resultValidators/DefaultSuccess.js
diff --git a/packages/form-core/src/validate/validators/DateValidators.js b/packages/ui/src/form-core/validate/validators/DateValidators.js
similarity index 97%
rename from packages/form-core/src/validate/validators/DateValidators.js
rename to packages/ui/src/form-core/validate/validators/DateValidators.js
index 1dfb35fe9..25a4b34b0 100644
--- a/packages/form-core/src/validate/validators/DateValidators.js
+++ b/packages/ui/src/form-core/validate/validators/DateValidators.js
@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 // TODO: move to input-datepicker?
-import { normalizeDateTime } from '@lion/localize';
+import { normalizeDateTime } from '@lion/ui/localize.js';
 import { Validator } from '../Validator.js';
 
 /**
diff --git a/packages/form-core/src/validate/validators/NumberValidators.js b/packages/ui/src/form-core/validate/validators/NumberValidators.js
similarity index 100%
rename from packages/form-core/src/validate/validators/NumberValidators.js
rename to packages/ui/src/form-core/validate/validators/NumberValidators.js
diff --git a/packages/form-core/src/validate/validators/Required.js b/packages/ui/src/form-core/validate/validators/Required.js
similarity index 95%
rename from packages/form-core/src/validate/validators/Required.js
rename to packages/ui/src/form-core/validate/validators/Required.js
index 2bbe142bf..33d19fc2b 100644
--- a/packages/form-core/src/validate/validators/Required.js
+++ b/packages/ui/src/form-core/validate/validators/Required.js
@@ -1,7 +1,7 @@
 import { Validator } from '../Validator.js';
 
 /**
- * @typedef {import('../../../types/FormControlMixinTypes.js').FormControlHost} FormControlHost
+ * @typedef {import('../../../types/FormControlMixinTypes.js.js').FormControlHost} FormControlHost
  */
 
 export class Required extends Validator {
diff --git a/packages/form-core/src/validate/validators/StringValidators.js b/packages/ui/src/form-core/validate/validators/StringValidators.js
similarity index 100%
rename from packages/form-core/src/validate/validators/StringValidators.js
rename to packages/ui/src/form-core/validate/validators/StringValidators.js
diff --git a/packages/form-integrations/test/dialog-integrations.test.js b/packages/ui/src/form-integrations/test/dialog-integrations.test.js
similarity index 91%
rename from packages/form-integrations/test/dialog-integrations.test.js
rename to packages/ui/src/form-integrations/test/dialog-integrations.test.js
index 8f4c763c8..267ee6c00 100644
--- a/packages/form-integrations/test/dialog-integrations.test.js
+++ b/packages/ui/src/form-integrations/test/dialog-integrations.test.js
@@ -1,8 +1,11 @@
 import { expect, fixture } from '@open-wc/testing';
-import { html } from 'lit/static-html.js';
+import { html } from 'lit';
 import { getAllTagNames } from './helpers/helpers.js';
 import './helpers/umbrella-form.js';
-import '@lion/dialog/define';
+import '@lion/ui/define/lion-dialog.js';
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-radio.js';
 
 /**
  * @typedef {import('./helpers/umbrella-form.js').UmbrellaForm} UmbrellaForm
diff --git a/packages/form-integrations/test/form-group-methods.test.js b/packages/ui/src/form-integrations/test/form-group-methods.test.js
similarity index 79%
rename from packages/form-integrations/test/form-group-methods.test.js
rename to packages/ui/src/form-integrations/test/form-group-methods.test.js
index ba2fb6a92..a81e361af 100644
--- a/packages/form-integrations/test/form-group-methods.test.js
+++ b/packages/ui/src/form-integrations/test/form-group-methods.test.js
@@ -1,8 +1,43 @@
 import { elementUpdated, expect, fixture } from '@open-wc/testing';
-import { html } from 'lit/static-html.js';
+import { html } from 'lit';
 import './helpers/umbrella-form.js';
 import { getAllFieldsAndFormGroups } from './helpers/helpers.js';
 
+import '@lion/ui/define/lion-button.js';
+import '@lion/ui/define/lion-button-submit.js';
+import '@lion/ui/define/lion-button-reset.js';
+
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-combobox.js';
+
+import '@lion/ui/define/lion-dialog.js';
+
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-select.js';
+
+import '@lion/ui/define/lion-input-stepper.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+
+import '@lion/ui/define/lion-textarea.js';
+
+import '@lion/ui/define/lion-radio.js';
+import '@lion/ui/define/lion-radio-group.js';
+
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-options.js';
+
+import '@lion/ui/define/lion-validation-feedback.js';
 /**
  * @typedef {import('@lion/form-core').LionField} LionField
  * @typedef {import('@lion/button').LionButton} LionButton
diff --git a/packages/form-integrations/test/form-integrations.test.js b/packages/ui/src/form-integrations/test/form-integrations.test.js
similarity index 95%
rename from packages/form-integrations/test/form-integrations.test.js
rename to packages/ui/src/form-integrations/test/form-integrations.test.js
index 99c94716d..7f468fe51 100644
--- a/packages/form-integrations/test/form-integrations.test.js
+++ b/packages/ui/src/form-integrations/test/form-integrations.test.js
@@ -1,10 +1,15 @@
 import sinon from 'sinon';
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { PhoneUtilManager } from '@lion/input-tel';
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
 import { getAllTagNames } from './helpers/helpers.js';
 import './helpers/umbrella-form.js';
 
+// import '@lion/ui/define/lion-input-tel-dropdown.js';
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-radio.js';
+
 /**
  * @typedef {import('./helpers/umbrella-form.js').UmbrellaForm} UmbrellaForm
  * @typedef {import('@lion/input-tel-dropdown').LionInputTelDropdown} LionInputTelDropdown
diff --git a/packages/form-integrations/test/form-validation-integrations.test.js b/packages/ui/src/form-integrations/test/form-validation-integrations.test.js
similarity index 94%
rename from packages/form-integrations/test/form-validation-integrations.test.js
rename to packages/ui/src/form-integrations/test/form-validation-integrations.test.js
index b9d2d6c27..1b98d9f0e 100644
--- a/packages/form-integrations/test/form-validation-integrations.test.js
+++ b/packages/ui/src/form-integrations/test/form-validation-integrations.test.js
@@ -1,8 +1,8 @@
-import { DefaultSuccess, Required, Validator } from '@lion/form-core';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
-import { LionInput } from '@lion/input';
-import { localize } from '@lion/localize';
-import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
+import { DefaultSuccess, Required, Validator } from '@lion/ui/form-core.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+import { LionInput } from '@lion/ui/input.js';
+import { localize } from '@lion/ui/localize.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 
diff --git a/packages/form-integrations/test/helpers/helpers.js b/packages/ui/src/form-integrations/test/helpers/helpers.js
similarity index 100%
rename from packages/form-integrations/test/helpers/helpers.js
rename to packages/ui/src/form-integrations/test/helpers/helpers.js
diff --git a/packages/form-integrations/test/helpers/umbrella-form.js b/packages/ui/src/form-integrations/test/helpers/umbrella-form.js
similarity index 85%
rename from packages/form-integrations/test/helpers/umbrella-form.js
rename to packages/ui/src/form-integrations/test/helpers/umbrella-form.js
index 76db5eca5..5109125d0 100644
--- a/packages/form-integrations/test/helpers/umbrella-form.js
+++ b/packages/ui/src/form-integrations/test/helpers/umbrella-form.js
@@ -1,26 +1,26 @@
-import { LitElement, html } from '@lion/core';
-import { Required, MinLength } from '@lion/form-core';
-import '@lion/form/define';
-import '@lion/fieldset/define';
-import '@lion/input/define';
-import '@lion/input-date/define';
-import '@lion/input-datepicker/define';
-import '@lion/input-amount/define';
-import '@lion/input-iban/define';
-import '@lion/input-email/define';
-import '@lion/input-tel/define';
-import '@lion/input-tel-dropdown/define';
-import '@lion/checkbox-group/define';
-import '@lion/radio-group/define';
-import '@lion/select/define';
-import '@lion/select-rich/define';
-import '@lion/listbox/define';
-import '@lion/combobox/define';
-import '@lion/input-range/define';
-import '@lion/textarea/define';
-import '@lion/button/define';
-import '@lion/switch/define';
-import '@lion/input-stepper/define';
+import { LitElement, html } from 'lit';
+import { Required, MinLength } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-input-tel.js';
+import '@lion/ui/define/lion-input-tel-dropdown.js';
+import '@lion/ui/define/lion-checkbox-group.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-select.js';
+import '@lion/ui/define/lion-select-rich.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-textarea.js';
+import '@lion/ui/define/lion-button.js';
+import '@lion/ui/define/lion-switch.js';
+import '@lion/ui/define/lion-input-stepper.js';
 
 export class UmbrellaForm extends LitElement {
   get _lionFormNode() {
diff --git a/packages/form-integrations/test/model-value-consistency.test.js b/packages/ui/src/form-integrations/test/model-value-consistency.test.js
similarity index 94%
rename from packages/form-integrations/test/model-value-consistency.test.js
rename to packages/ui/src/form-integrations/test/model-value-consistency.test.js
index 1ae2a5a7d..55ef21791 100644
--- a/packages/form-integrations/test/model-value-consistency.test.js
+++ b/packages/ui/src/form-integrations/test/model-value-consistency.test.js
@@ -3,33 +3,37 @@ import { expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import sinon from 'sinon';
 
-import '@lion/input/define';
-import '@lion/input-amount/define';
-import '@lion/input-date/define';
-import '@lion/input-datepicker/define';
-import '@lion/input-email/define';
-import '@lion/input-iban/define';
-import '@lion/input-range/define';
-import '@lion/input-stepper/define';
+import '@lion/ui/define/lion-input.js';
+import '@lion/ui/define/lion-input-amount.js';
+import '@lion/ui/define/lion-input-date.js';
+import '@lion/ui/define/lion-input-datepicker.js';
+import '@lion/ui/define/lion-input-email.js';
+import '@lion/ui/define/lion-input-iban.js';
+import '@lion/ui/define/lion-input-range.js';
+import '@lion/ui/define/lion-input-stepper.js';
 
-import '@lion/textarea/define';
+import '@lion/ui/define/lion-textarea.js';
 
-import '@lion/checkbox-group/define';
+import '@lion/ui/define/lion-checkbox.js';
+import '@lion/ui/define/lion-checkbox-group.js';
 
-import '@lion/radio-group/define';
-import '@lion/switch/define';
+import '@lion/ui/define/lion-radio.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-switch.js';
 
-import '@lion/select/define';
+import '@lion/ui/define/lion-select.js';
+import '@lion/ui/define/lion-option.js';
 
-import '@lion/combobox/define';
-import '@lion/listbox/define';
-import '@lion/select-rich/define';
+import '@lion/ui/define/lion-combobox.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-select-rich.js';
 
-import '@lion/fieldset/define';
-import '@lion/form/define';
-import '@lion/form-core/define';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-form.js';
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
 
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @typedef {import('@lion/core').LitElement} LitElement
@@ -294,7 +298,6 @@ describe('lion-select', () => {
             <lion-option .choiceValue="${'option3'}">Option 3</lion-option>
           </${tag}>
         `);
-
         el.addEventListener('model-value-changed', spy);
         const option2 = /** @type {LionOption} */ (el.querySelector('lion-option:nth-child(2)'));
         option2.checked = true;
diff --git a/packages/form-integrations/test/model-value-event.test.js b/packages/ui/src/form-integrations/test/model-value-event.test.js
similarity index 98%
rename from packages/form-integrations/test/model-value-event.test.js
rename to packages/ui/src/form-integrations/test/model-value-event.test.js
index 8d7c5c3cd..619119f2a 100644
--- a/packages/form-integrations/test/model-value-event.test.js
+++ b/packages/ui/src/form-integrations/test/model-value-event.test.js
@@ -1,5 +1,5 @@
-import '@lion/fieldset/define';
-import '@lion/input/define';
+import '@lion/ui/define/lion-fieldset.js';
+import '@lion/ui/define/lion-input.js';
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
diff --git a/packages/form/src/LionForm.js b/packages/ui/src/form/LionForm.js
similarity index 97%
rename from packages/form/src/LionForm.js
rename to packages/ui/src/form/LionForm.js
index 5f92e1cf6..f3e5f145e 100644
--- a/packages/form/src/LionForm.js
+++ b/packages/ui/src/form/LionForm.js
@@ -1,4 +1,4 @@
-import { LionFieldset } from '@lion/fieldset';
+import { LionFieldset } from '@lion/ui/fieldset.js';
 
 const throwFormNodeError = () => {
   throw new Error(
diff --git a/packages/form/test/lion-form.test.js b/packages/ui/src/form/test/lion-form.test.js
similarity index 95%
rename from packages/form/test/lion-form.test.js
rename to packages/ui/src/form/test/lion-form.test.js
index 9fa3e39a9..b40855c13 100644
--- a/packages/form/test/lion-form.test.js
+++ b/packages/ui/src/form/test/lion-form.test.js
@@ -1,8 +1,10 @@
-import { LionFieldset } from '@lion/fieldset';
-import '@lion/fieldset/define';
-import { LionField } from '@lion/form-core';
-import '@lion/form-core/define';
-import '@lion/form/define';
+import { LionFieldset } from '@lion/ui/fieldset.js';
+import '@lion/ui/define/lion-fieldset.js';
+import { LionField } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-field.js';
+import '@lion/ui/define/lion-validation-feedback.js';
+
+import '@lion/ui/define/lion-form.js';
 import {
   aTimeout,
   defineCE,
diff --git a/packages/helpers/sb-action-logger/src/SbActionLogger.js b/packages/ui/src/helpers/SbActionLogger.js
similarity index 99%
rename from packages/helpers/sb-action-logger/src/SbActionLogger.js
rename to packages/ui/src/helpers/SbActionLogger.js
index ed5499fb8..1327dae2a 100644
--- a/packages/helpers/sb-action-logger/src/SbActionLogger.js
+++ b/packages/ui/src/helpers/SbActionLogger.js
@@ -1,4 +1,4 @@
-import { css, html, LitElement, render } from '@lion/core';
+import { css, html, LitElement, render } from 'lit';
 
 /** @typedef {import('@lion/core').TemplateResult} TemplateResult */
 
diff --git a/packages/helpers/sb-locale-switcher/src/SbLocaleSwitcher.js b/packages/ui/src/helpers/SbLocaleSwitcher.js
similarity index 93%
rename from packages/helpers/sb-locale-switcher/src/SbLocaleSwitcher.js
rename to packages/ui/src/helpers/SbLocaleSwitcher.js
index 8c30fe195..d5851aa99 100644
--- a/packages/helpers/sb-locale-switcher/src/SbLocaleSwitcher.js
+++ b/packages/ui/src/helpers/SbLocaleSwitcher.js
@@ -1,4 +1,4 @@
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 
 export class SbLocaleSwitcher extends LitElement {
   static get properties() {
diff --git a/packages/helpers/renderLitAsNode/src/renderLitAsNode.js b/packages/ui/src/helpers/renderLitAsNode.js
similarity index 93%
rename from packages/helpers/renderLitAsNode/src/renderLitAsNode.js
rename to packages/ui/src/helpers/renderLitAsNode.js
index ca8a1b204..5c846a39e 100644
--- a/packages/helpers/renderLitAsNode/src/renderLitAsNode.js
+++ b/packages/ui/src/helpers/renderLitAsNode.js
@@ -1,4 +1,4 @@
-import { render } from '@lion/core';
+import { render } from 'lit';
 
 /**
  * Helper to render a lit TemplateResult as an offline-created DOM node
diff --git a/packages/helpers/sortEachDepth/src/sortEachDepth.js b/packages/ui/src/helpers/sortEachDepth.js
similarity index 100%
rename from packages/helpers/sortEachDepth/src/sortEachDepth.js
rename to packages/ui/src/helpers/sortEachDepth.js
diff --git a/packages/helpers/renderLitAsNode/test/renderLitAsNode.test.js b/packages/ui/src/helpers/test/renderLitAsNode.test.js
similarity index 90%
rename from packages/helpers/renderLitAsNode/test/renderLitAsNode.test.js
rename to packages/ui/src/helpers/test/renderLitAsNode.test.js
index 6cce34a80..1ad7d7e04 100644
--- a/packages/helpers/renderLitAsNode/test/renderLitAsNode.test.js
+++ b/packages/ui/src/helpers/test/renderLitAsNode.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { html } from '@lion/core';
-import { renderLitAsNode } from '../src/renderLitAsNode.js';
+import { html } from 'lit';
+import { renderLitAsNode } from '../renderLitAsNode.js';
 
 describe('renderLitAsNode', () => {
   it('should return a matching HTMLElement (Node)', () => {
diff --git a/packages/helpers/sb-action-logger/test/sb-action-logger.test.js b/packages/ui/src/helpers/test/sb-action-logger.test.js
similarity index 97%
rename from packages/helpers/sb-action-logger/test/sb-action-logger.test.js
rename to packages/ui/src/helpers/test/sb-action-logger.test.js
index cf61a707a..9a71e2617 100644
--- a/packages/helpers/sb-action-logger/test/sb-action-logger.test.js
+++ b/packages/ui/src/helpers/test/sb-action-logger.test.js
@@ -1,9 +1,9 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/helpers/define-sb-action-logger';
+import '@lion/ui/define-helpers/sb-action-logger.js';
 
 /**
- * @typedef {import('../src/SbActionLogger').SbActionLogger} SbActionLogger
+ * @typedef {import('../SbActionLogger').SbActionLogger} SbActionLogger
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<SbActionLogger>} */ (_fixture);
diff --git a/packages/icon/src/IconManager.js b/packages/ui/src/icon/IconManager.js
similarity index 100%
rename from packages/icon/src/IconManager.js
rename to packages/ui/src/icon/IconManager.js
diff --git a/packages/icon/src/LionIcon.js b/packages/ui/src/icon/LionIcon.js
similarity index 97%
rename from packages/icon/src/LionIcon.js
rename to packages/ui/src/icon/LionIcon.js
index 97539e5be..5af9a397d 100644
--- a/packages/icon/src/LionIcon.js
+++ b/packages/ui/src/icon/LionIcon.js
@@ -1,4 +1,5 @@
-import { css, html, LitElement, nothing, render, isTemplateResult } from '@lion/core';
+import { css, html, LitElement, nothing, render } from 'lit';
+import { isTemplateResult } from 'lit/directive-helpers.js';
 import { icons } from './icons.js';
 
 /**
diff --git a/packages/icon/src/icons.js b/packages/ui/src/icon/icons.js
similarity index 100%
rename from packages/icon/src/icons.js
rename to packages/ui/src/icon/icons.js
diff --git a/packages/icon/test/IconManager.test.js b/packages/ui/src/icon/test/IconManager.test.js
similarity index 97%
rename from packages/icon/test/IconManager.test.js
rename to packages/ui/src/icon/test/IconManager.test.js
index 564e9b1a1..c0471c4df 100644
--- a/packages/icon/test/IconManager.test.js
+++ b/packages/ui/src/icon/test/IconManager.test.js
@@ -1,7 +1,7 @@
-import { nothing, html } from '@lion/core';
+import { nothing, html } from 'lit';
 import { expect } from '@open-wc/testing';
 import { stub } from 'sinon';
-import { IconManager } from '../src/IconManager.js';
+import { IconManager } from '@lion/ui/icon.js';
 
 /**
  * @typedef {import("lit-html").TemplateResult} TemplateResult
diff --git a/packages/icon/test/hammer.svg.js b/packages/ui/src/icon/test/hammer.svg.js
similarity index 100%
rename from packages/icon/test/hammer.svg.js
rename to packages/ui/src/icon/test/hammer.svg.js
diff --git a/packages/icon/test/heart.svg.js b/packages/ui/src/icon/test/heart.svg.js
similarity index 100%
rename from packages/icon/test/heart.svg.js
rename to packages/ui/src/icon/test/heart.svg.js
diff --git a/packages/icon/test/lion-icon.test.js b/packages/ui/src/icon/test/lion-icon.test.js
similarity index 98%
rename from packages/icon/test/lion-icon.test.js
rename to packages/ui/src/icon/test/lion-icon.test.js
index 8cb1cdc67..f19b67ca6 100644
--- a/packages/icon/test/lion-icon.test.js
+++ b/packages/ui/src/icon/test/lion-icon.test.js
@@ -1,7 +1,8 @@
-import { nothing, until, html } from '@lion/core';
+import { nothing, html } from 'lit';
+import { until } from 'lit/directives/until.js';
 import { aTimeout, expect, fixture as _fixture, fixtureSync } from '@open-wc/testing';
-import '@lion/icon/define';
-import { icons } from '../src/icons.js';
+import '@lion/ui/define/lion-icon.js';
+import { icons } from '@lion/ui/icon.js';
 import hammerSvg from './hammer.svg.js';
 import heartSvg from './heart.svg.js';
 
diff --git a/packages/input-amount/src/LionInputAmount.js b/packages/ui/src/input-amount/LionInputAmount.js
similarity index 97%
rename from packages/input-amount/src/LionInputAmount.js
rename to packages/ui/src/input-amount/LionInputAmount.js
index f7ae3274f..d3e247688 100644
--- a/packages/input-amount/src/LionInputAmount.js
+++ b/packages/ui/src/input-amount/LionInputAmount.js
@@ -1,7 +1,7 @@
-import { css } from '@lion/core';
-import { LionInput } from '@lion/input';
-import { getCurrencyName, localize, LocalizeMixin } from '@lion/localize';
-import { IsNumber } from '@lion/form-core';
+import { css } from 'lit';
+import { LionInput } from '@lion/ui/input.js';
+import { getCurrencyName, localize, LocalizeMixin } from '@lion/ui/localize.js';
+import { IsNumber } from '@lion/ui/form-core.js';
 import { formatAmount, formatCurrencyLabel } from './formatters.js';
 import { parseAmount } from './parsers.js';
 
diff --git a/packages/input-amount/src/formatters.js b/packages/ui/src/input-amount/formatters.js
similarity index 97%
rename from packages/input-amount/src/formatters.js
rename to packages/ui/src/input-amount/formatters.js
index 8e8da0880..785c26a51 100644
--- a/packages/input-amount/src/formatters.js
+++ b/packages/ui/src/input-amount/formatters.js
@@ -1,4 +1,4 @@
-import { formatNumber, getFractionDigits, normalizeCurrencyLabel } from '@lion/localize';
+import { formatNumber, getFractionDigits, normalizeCurrencyLabel } from '@lion/ui/localize.js';
 
 /**
  * @typedef {import('@lion/localize/types/LocalizeMixinTypes').FormatNumberOptions} FormatOptions
diff --git a/packages/input-amount/src/parsers.js b/packages/ui/src/input-amount/parsers.js
similarity index 95%
rename from packages/input-amount/src/parsers.js
rename to packages/ui/src/input-amount/parsers.js
index acd219490..a9e4203ae 100644
--- a/packages/input-amount/src/parsers.js
+++ b/packages/ui/src/input-amount/parsers.js
@@ -1,4 +1,4 @@
-import { parseNumber, getFractionDigits } from '@lion/localize';
+import { parseNumber, getFractionDigits } from '@lion/ui/localize.js';
 
 /**
  * @typedef {import('@lion/localize/types/LocalizeMixinTypes').FormatNumberOptions} FormatOptions
diff --git a/packages/input-amount/src/preprocessors.js b/packages/ui/src/input-amount/preprocessors.js
similarity index 100%
rename from packages/input-amount/src/preprocessors.js
rename to packages/ui/src/input-amount/preprocessors.js
diff --git a/packages/input-amount/test/formatters.test.js b/packages/ui/src/input-amount/test/formatters.test.js
similarity index 91%
rename from packages/input-amount/test/formatters.test.js
rename to packages/ui/src/input-amount/test/formatters.test.js
index 5db41b481..b46b4afab 100644
--- a/packages/input-amount/test/formatters.test.js
+++ b/packages/ui/src/input-amount/test/formatters.test.js
@@ -1,8 +1,8 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
-import { formatAmount } from '../src/formatters.js';
+import { formatAmount } from '@lion/ui/input-amount.js';
 
 describe('formatAmount()', () => {
   afterEach(() => {
diff --git a/packages/input-amount/test/lion-input-amount-integrations.test.js b/packages/ui/src/input-amount/test/lion-input-amount-integrations.test.js
similarity index 63%
rename from packages/input-amount/test/lion-input-amount-integrations.test.js
rename to packages/ui/src/input-amount/test/lion-input-amount-integrations.test.js
index 8f0cec83e..f983a288e 100644
--- a/packages/input-amount/test/lion-input-amount-integrations.test.js
+++ b/packages/ui/src/input-amount/test/lion-input-amount-integrations.test.js
@@ -1,6 +1,9 @@
-import { runInteractionStateMixinSuite, runFormatMixinSuite } from '@lion/form-core/test-suites';
+import {
+  runInteractionStateMixinSuite,
+  runFormatMixinSuite,
+} from '@lion/ui/form-core-test-suites.js';
 
-import '@lion/input-amount/define';
+import '@lion/ui/define/lion-input-amount.js';
 
 const tagString = 'lion-input-amount';
 
diff --git a/packages/input-amount/test/lion-input-amount.test.js b/packages/ui/src/input-amount/test/lion-input-amount.test.js
similarity index 97%
rename from packages/input-amount/test/lion-input-amount.test.js
rename to packages/ui/src/input-amount/test/lion-input-amount.test.js
index 75a89a73a..dc4c7188c 100644
--- a/packages/input-amount/test/lion-input-amount.test.js
+++ b/packages/ui/src/input-amount/test/lion-input-amount.test.js
@@ -1,11 +1,11 @@
-import { html } from '@lion/core';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
 import { aTimeout, expect, fixture } from '@open-wc/testing';
-import { getInputMembers } from '@lion/input/test-helpers';
-import '@lion/input-amount/define';
-import { formatAmount } from '../src/formatters.js';
-import { parseAmount } from '../src/parsers.js';
+import { html } from 'lit';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
+import { getInputMembers } from '@lion/ui/input-test-helpers.js';
+import { formatAmount, parseAmount } from '@lion/ui/input-amount.js';
+
+import '@lion/ui/define/lion-input-amount.js';
 
 /**
  * @typedef {import('@lion/input/src/LionInput').LionInput} LionInput
diff --git a/packages/input-amount/test/parsers.test.js b/packages/ui/src/input-amount/test/parsers.test.js
similarity index 87%
rename from packages/input-amount/test/parsers.test.js
rename to packages/ui/src/input-amount/test/parsers.test.js
index 2f3c338f2..2af83baab 100644
--- a/packages/input-amount/test/parsers.test.js
+++ b/packages/ui/src/input-amount/test/parsers.test.js
@@ -1,7 +1,7 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 
-import { parseAmount } from '../src/parsers.js';
+import { parseAmount } from '@lion/ui/input-amount.js';
 
 describe('parseAmount()', async () => {
   it('with currency set to correct amount of decimals', async () => {
diff --git a/packages/input-amount/test/preprocessors.test.js b/packages/ui/src/input-amount/test/preprocessors.test.js
similarity index 87%
rename from packages/input-amount/test/preprocessors.test.js
rename to packages/ui/src/input-amount/test/preprocessors.test.js
index 48f081d1e..442aa7516 100644
--- a/packages/input-amount/test/preprocessors.test.js
+++ b/packages/ui/src/input-amount/test/preprocessors.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { preprocessAmount } from '../src/preprocessors.js';
+import { preprocessAmount } from '@lion/ui/input-amount.js';
 
 describe('preprocessAmount()', () => {
   it('preprocesses numbers to filter out non-digits', async () => {
diff --git a/packages/input-date/src/LionInputDate.js b/packages/ui/src/input-date/LionInputDate.js
similarity index 91%
rename from packages/input-date/src/LionInputDate.js
rename to packages/ui/src/input-date/LionInputDate.js
index a803538a5..1a6dad71e 100644
--- a/packages/input-date/src/LionInputDate.js
+++ b/packages/ui/src/input-date/LionInputDate.js
@@ -1,6 +1,6 @@
-import { IsDate } from '@lion/form-core';
-import { LionInput } from '@lion/input';
-import { formatDate, LocalizeMixin, parseDate } from '@lion/localize';
+import { IsDate } from '@lion/ui/form-core.js';
+import { LionInput } from '@lion/ui/input.js';
+import { formatDate, LocalizeMixin, parseDate } from '@lion/ui/localize.js';
 
 /**
  * @param {Date|number} date
diff --git a/packages/input-date/test/lion-input-date-integrations.test.js b/packages/ui/src/input-date/test/lion-input-date-integrations.test.js
similarity index 62%
rename from packages/input-date/test/lion-input-date-integrations.test.js
rename to packages/ui/src/input-date/test/lion-input-date-integrations.test.js
index 04d0afdf5..1f2a88239 100644
--- a/packages/input-date/test/lion-input-date-integrations.test.js
+++ b/packages/ui/src/input-date/test/lion-input-date-integrations.test.js
@@ -1,6 +1,9 @@
-import { runInteractionStateMixinSuite, runFormatMixinSuite } from '@lion/form-core/test-suites';
+import {
+  runInteractionStateMixinSuite,
+  runFormatMixinSuite,
+} from '@lion/ui/form-core-test-suites.js';
 
-import '@lion/input-date/define';
+import '@lion/ui/define/lion-input-date.js';
 
 const tagString = 'lion-input-date';
 describe('<lion-input-date> integrations', () => {
diff --git a/packages/input-date/test/lion-input-date.test.js b/packages/ui/src/input-date/test/lion-input-date.test.js
similarity index 94%
rename from packages/input-date/test/lion-input-date.test.js
rename to packages/ui/src/input-date/test/lion-input-date.test.js
index 06ef96759..2412606b8 100644
--- a/packages/input-date/test/lion-input-date.test.js
+++ b/packages/ui/src/input-date/test/lion-input-date.test.js
@@ -1,10 +1,10 @@
-import { html } from '@lion/core';
-import { localize } from '@lion/localize';
-import { localizeTearDown } from '@lion/localize/test-helpers';
-import { MaxDate } from '@lion/form-core';
+import { html } from 'lit';
+import { localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
+import { MaxDate } from '@lion/ui/form-core.js';
 import { expect, fixture as _fixture } from '@open-wc/testing';
-import { getInputMembers } from '@lion/input/test-helpers';
-import '@lion/input-date/define';
+import { getInputMembers } from '@lion/ui/input-test-helpers.js';
+import '@lion/ui/define/lion-input-date.js';
 
 /**
  * @typedef {import('../src/LionInputDate').LionInputDate} LionInputDate
diff --git a/packages/input-datepicker/src/LionCalendarOverlayFrame.js b/packages/ui/src/input-datepicker/LionCalendarOverlayFrame.js
similarity index 60%
rename from packages/input-datepicker/src/LionCalendarOverlayFrame.js
rename to packages/ui/src/input-datepicker/LionCalendarOverlayFrame.js
index a0aaf3964..8a8335c4a 100644
--- a/packages/input-datepicker/src/LionCalendarOverlayFrame.js
+++ b/packages/ui/src/input-datepicker/LionCalendarOverlayFrame.js
@@ -1,5 +1,5 @@
-import { css, html, LitElement } from '@lion/core';
-import { LocalizeMixin } from '@lion/localize';
+import { css, html, LitElement } from 'lit';
+import { LocalizeMixin } from '@lion/ui/localize.js';
 
 export class LionCalendarOverlayFrame extends LocalizeMixin(LitElement) {
   static get styles() {
@@ -45,47 +45,47 @@ export class LionCalendarOverlayFrame extends LocalizeMixin(LitElement) {
         'lion-calendar-overlay-frame': /** @param {string} locale */ locale => {
           switch (locale) {
             case 'bg-BG':
-              return import('@lion/overlays/translations/bg-BG.js');
+              return import('@lion/ui/overlays-translations/bg-BG.js');
             case 'cs-CZ':
-              return import('@lion/overlays/translations/cs-CZ.js');
+              return import('@lion/ui/overlays-translations/cs-CZ.js');
             case 'de-DE':
-              return import('@lion/overlays/translations/de-DE.js');
+              return import('@lion/ui/overlays-translations/de-DE.js');
             case 'en-AU':
-              return import('@lion/overlays/translations/en-AU.js');
+              return import('@lion/ui/overlays-translations/en-AU.js');
             case 'en-GB':
-              return import('@lion/overlays/translations/en-GB.js');
+              return import('@lion/ui/overlays-translations/en-GB.js');
             case 'en-US':
-              return import('@lion/overlays/translations/en-US.js');
+              return import('@lion/ui/overlays-translations/en-US.js');
             case 'en-PH':
-              return import('@lion/overlays/translations/en.js');
+              return import('@lion/ui/overlays-translations/en.js');
             case 'es-ES':
-              return import('@lion/overlays/translations/es-ES.js');
+              return import('@lion/ui/overlays-translations/es-ES.js');
             case 'fr-FR':
-              return import('@lion/overlays/translations/fr-FR.js');
+              return import('@lion/ui/overlays-translations/fr-FR.js');
             case 'fr-BE':
-              return import('@lion/overlays/translations/fr-BE.js');
+              return import('@lion/ui/overlays-translations/fr-BE.js');
             case 'hu-HU':
-              return import('@lion/overlays/translations/hu-HU.js');
+              return import('@lion/ui/overlays-translations/hu-HU.js');
             case 'it-IT':
-              return import('@lion/overlays/translations/it-IT.js');
+              return import('@lion/ui/overlays-translations/it-IT.js');
             case 'nl-BE':
-              return import('@lion/overlays/translations/nl-BE.js');
+              return import('@lion/ui/overlays-translations/nl-BE.js');
             case 'nl-NL':
-              return import('@lion/overlays/translations/nl-NL.js');
+              return import('@lion/ui/overlays-translations/nl-NL.js');
             case 'pl-PL':
-              return import('@lion/overlays/translations/pl-PL.js');
+              return import('@lion/ui/overlays-translations/pl-PL.js');
             case 'ro-RO':
-              return import('@lion/overlays/translations/ro-RO.js');
+              return import('@lion/ui/overlays-translations/ro-RO.js');
             case 'ru-RU':
-              return import('@lion/overlays/translations/ru-RU.js');
+              return import('@lion/ui/overlays-translations/ru-RU.js');
             case 'sk-SK':
-              return import('@lion/overlays/translations/sk-SK.js');
+              return import('@lion/ui/overlays-translations/sk-SK.js');
             case 'uk-UA':
-              return import('@lion/overlays/translations/uk-UA.js');
+              return import('@lion/ui/overlays-translations/uk-UA.js');
             case 'zh-CN':
-              return import('@lion/overlays/translations/zh.js');
+              return import('@lion/ui/overlays-translations/zh.js');
             default:
-              return import('@lion/overlays/translations/en.js');
+              return import('@lion/ui/overlays-translations/en.js');
           }
         },
       },
diff --git a/packages/input-datepicker/src/LionInputDatepicker.js b/packages/ui/src/input-datepicker/LionInputDatepicker.js
similarity index 80%
rename from packages/input-datepicker/src/LionInputDatepicker.js
rename to packages/ui/src/input-datepicker/LionInputDatepicker.js
index f92dd1f73..be07ba498 100644
--- a/packages/input-datepicker/src/LionInputDatepicker.js
+++ b/packages/ui/src/input-datepicker/LionInputDatepicker.js
@@ -1,13 +1,15 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { LionCalendar } from '@lion/calendar';
-import { html, ScopedElementsMixin, ifDefined, render } from '@lion/core';
-import { LionInputDate } from '@lion/input-date';
+import { LionCalendar } from '@lion/ui/calendar.js';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { html, render } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
+import { LionInputDate } from '@lion/ui/input-date.js';
 import {
   OverlayMixin,
   withBottomSheetConfig,
   withModalDialogConfig,
   ArrowMixin,
-} from '@lion/overlays';
+} from '@lion/ui/overlays.js';
 import { LionCalendarOverlayFrame } from './LionCalendarOverlayFrame.js';
 
 /**
@@ -87,75 +89,75 @@ export class LionInputDatepicker extends ScopedElementsMixin(
         'lion-input-datepicker': /** @param {string} locale */ locale => {
           switch (locale) {
             case 'bg-BG':
-              return import('@lion/input-datepicker/translations/bg-BG.js');
+              return import('@lion/ui/input-datepicker-translations/bg-BG.js');
             case 'bg':
-              return import('@lion/input-datepicker/translations/bg.js');
+              return import('@lion/ui/input-datepicker-translations/bg.js');
             case 'cs-CZ':
-              return import('@lion/input-datepicker/translations/cs-CZ.js');
+              return import('@lion/ui/input-datepicker-translations/cs-CZ.js');
             case 'cs':
-              return import('@lion/input-datepicker/translations/cs.js');
+              return import('@lion/ui/input-datepicker-translations/cs.js');
             case 'de-DE':
-              return import('@lion/input-datepicker/translations/de-DE.js');
+              return import('@lion/ui/input-datepicker-translations/de-DE.js');
             case 'de':
-              return import('@lion/input-datepicker/translations/de.js');
+              return import('@lion/ui/input-datepicker-translations/de.js');
             case 'en-AU':
-              return import('@lion/input-datepicker/translations/en-AU.js');
+              return import('@lion/ui/input-datepicker-translations/en-AU.js');
             case 'en-GB':
-              return import('@lion/input-datepicker/translations/en-GB.js');
+              return import('@lion/ui/input-datepicker-translations/en-GB.js');
             case 'en-US':
-              return import('@lion/input-datepicker/translations/en-US.js');
+              return import('@lion/ui/input-datepicker-translations/en-US.js');
             case 'en-PH':
             case 'en':
-              return import('@lion/input-datepicker/translations/en.js');
+              return import('@lion/ui/input-datepicker-translations/en.js');
             case 'es-ES':
-              return import('@lion/input-datepicker/translations/es-ES.js');
+              return import('@lion/ui/input-datepicker-translations/es-ES.js');
             case 'es':
-              return import('@lion/input-datepicker/translations/es.js');
+              return import('@lion/ui/input-datepicker-translations/es.js');
             case 'fr-FR':
-              return import('@lion/input-datepicker/translations/fr-FR.js');
+              return import('@lion/ui/input-datepicker-translations/fr-FR.js');
             case 'fr-BE':
-              return import('@lion/input-datepicker/translations/fr-BE.js');
+              return import('@lion/ui/input-datepicker-translations/fr-BE.js');
             case 'fr':
-              return import('@lion/input-datepicker/translations/fr.js');
+              return import('@lion/ui/input-datepicker-translations/fr.js');
             case 'hu-HU':
-              return import('@lion/input-datepicker/translations/hu-HU.js');
+              return import('@lion/ui/input-datepicker-translations/hu-HU.js');
             case 'hu':
-              return import('@lion/input-datepicker/translations/hu.js');
+              return import('@lion/ui/input-datepicker-translations/hu.js');
             case 'it-IT':
-              return import('@lion/input-datepicker/translations/it-IT.js');
+              return import('@lion/ui/input-datepicker-translations/it-IT.js');
             case 'it':
-              return import('@lion/input-datepicker/translations/it.js');
+              return import('@lion/ui/input-datepicker-translations/it.js');
             case 'nl-BE':
-              return import('@lion/input-datepicker/translations/nl-BE.js');
+              return import('@lion/ui/input-datepicker-translations/nl-BE.js');
             case 'nl-NL':
-              return import('@lion/input-datepicker/translations/nl-NL.js');
+              return import('@lion/ui/input-datepicker-translations/nl-NL.js');
             case 'nl':
-              return import('@lion/input-datepicker/translations/nl.js');
+              return import('@lion/ui/input-datepicker-translations/nl.js');
             case 'pl-PL':
-              return import('@lion/input-datepicker/translations/pl-PL.js');
+              return import('@lion/ui/input-datepicker-translations/pl-PL.js');
             case 'pl':
-              return import('@lion/input-datepicker/translations/pl.js');
+              return import('@lion/ui/input-datepicker-translations/pl.js');
             case 'ro-RO':
-              return import('@lion/input-datepicker/translations/ro-RO.js');
+              return import('@lion/ui/input-datepicker-translations/ro-RO.js');
             case 'ro':
-              return import('@lion/input-datepicker/translations/ro.js');
+              return import('@lion/ui/input-datepicker-translations/ro.js');
             case 'ru-RU':
-              return import('@lion/input-datepicker/translations/ru-RU.js');
+              return import('@lion/ui/input-datepicker-translations/ru-RU.js');
             case 'ru':
-              return import('@lion/input-datepicker/translations/ru.js');
+              return import('@lion/ui/input-datepicker-translations/ru.js');
             case 'sk-SK':
-              return import('@lion/input-datepicker/translations/sk-SK.js');
+              return import('@lion/ui/input-datepicker-translations/sk-SK.js');
             case 'sk':
-              return import('@lion/input-datepicker/translations/sk.js');
+              return import('@lion/ui/input-datepicker-translations/sk.js');
             case 'uk-UA':
-              return import('@lion/input-datepicker/translations/uk-UA.js');
+              return import('@lion/ui/input-datepicker-translations/uk-UA.js');
             case 'uk':
-              return import('@lion/input-datepicker/translations/uk.js');
+              return import('@lion/ui/input-datepicker-translations/uk.js');
             case 'zh-CN':
             case 'zh':
-              return import('@lion/input-datepicker/translations/zh.js');
+              return import('@lion/ui/input-datepicker-translations/zh.js');
             default:
-              return import('@lion/input-datepicker/translations/en.js');
+              return import('@lion/ui/input-datepicker-translations/en.js');
           }
         },
       },
diff --git a/packages/input-datepicker/test-helpers/DatepickerInputObject.js b/packages/ui/src/input-datepicker/test-helpers/DatepickerInputObject.js
similarity index 97%
rename from packages/input-datepicker/test-helpers/DatepickerInputObject.js
rename to packages/ui/src/input-datepicker/test-helpers/DatepickerInputObject.js
index 0d2823ee9..6f1f96ff1 100644
--- a/packages/input-datepicker/test-helpers/DatepickerInputObject.js
+++ b/packages/ui/src/input-datepicker/test-helpers/DatepickerInputObject.js
@@ -1,4 +1,4 @@
-import { CalendarObject } from '@lion/calendar/test-helpers';
+import { CalendarObject } from '@lion/ui/calendar-test-helpers.js';
 
 export class DatepickerInputObject {
   /** @param {import('../src/LionInputDatepicker').LionInputDatepicker} el */
diff --git a/packages/input-datepicker/test/lion-input-datepicker-integrations.test.js b/packages/ui/src/input-datepicker/test/lion-input-datepicker-integrations.test.js
similarity index 62%
rename from packages/input-datepicker/test/lion-input-datepicker-integrations.test.js
rename to packages/ui/src/input-datepicker/test/lion-input-datepicker-integrations.test.js
index 5f6edca0a..8a731a45c 100644
--- a/packages/input-datepicker/test/lion-input-datepicker-integrations.test.js
+++ b/packages/ui/src/input-datepicker/test/lion-input-datepicker-integrations.test.js
@@ -1,6 +1,9 @@
-import { runInteractionStateMixinSuite, runFormatMixinSuite } from '@lion/form-core/test-suites';
+import {
+  runInteractionStateMixinSuite,
+  runFormatMixinSuite,
+} from '@lion/ui/form-core-test-suites.js';
 
-import '@lion/input-datepicker/define';
+import '@lion/ui/define/lion-input-datepicker.js';
 
 const tagString = 'lion-input-datepicker';
 describe('<lion-input-datepicker> integrations', () => {
diff --git a/packages/input-datepicker/test/lion-input-datepicker.test.js b/packages/ui/src/input-datepicker/test/lion-input-datepicker.test.js
similarity index 98%
rename from packages/input-datepicker/test/lion-input-datepicker.test.js
rename to packages/ui/src/input-datepicker/test/lion-input-datepicker.test.js
index 241c7bf6c..d0815877c 100644
--- a/packages/input-datepicker/test/lion-input-datepicker.test.js
+++ b/packages/ui/src/input-datepicker/test/lion-input-datepicker.test.js
@@ -1,13 +1,14 @@
-import { LionCalendar, isSameDate } from '@lion/calendar';
-import { html, LitElement } from '@lion/core';
-import { IsDateDisabled, MaxDate, MinDate, MinMaxDate } from '@lion/form-core';
+import { LionCalendar, isSameDate } from '@lion/ui/calendar.js';
+import { html, LitElement } from 'lit';
+import { IsDateDisabled, MaxDate, MinDate, MinMaxDate } from '@lion/ui/form-core.js';
 import { aTimeout, defineCE, expect, fixture as _fixture, nextFrame } from '@open-wc/testing';
-import { mimicClick } from '@lion/overlays/test-helpers';
+import { mimicClick } from '@lion/ui/overlays-test-helpers.js';
 import sinon from 'sinon';
 import { setViewport } from '@web/test-runner-commands';
-import '@lion/input-datepicker/define';
-import { DatepickerInputObject } from '@lion/input-datepicker/test-helpers';
-import { LionInputDatepicker } from '../src/LionInputDatepicker.js';
+import { DatepickerInputObject } from '@lion/ui/input-datepicker-test-helpers.js';
+import { LionInputDatepicker } from '@lion/ui/input-datepicker.js';
+
+import '@lion/ui/define/lion-input-datepicker.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
diff --git a/packages/input-datepicker/translations/bg-BG.js b/packages/ui/src/input-datepicker/translations/bg-BG.js
similarity index 100%
rename from packages/input-datepicker/translations/bg-BG.js
rename to packages/ui/src/input-datepicker/translations/bg-BG.js
diff --git a/packages/input-datepicker/translations/bg.js b/packages/ui/src/input-datepicker/translations/bg.js
similarity index 100%
rename from packages/input-datepicker/translations/bg.js
rename to packages/ui/src/input-datepicker/translations/bg.js
diff --git a/packages/input-datepicker/translations/cs-CZ.js b/packages/ui/src/input-datepicker/translations/cs-CZ.js
similarity index 100%
rename from packages/input-datepicker/translations/cs-CZ.js
rename to packages/ui/src/input-datepicker/translations/cs-CZ.js
diff --git a/packages/input-datepicker/translations/cs.js b/packages/ui/src/input-datepicker/translations/cs.js
similarity index 100%
rename from packages/input-datepicker/translations/cs.js
rename to packages/ui/src/input-datepicker/translations/cs.js
diff --git a/packages/input-datepicker/translations/de-DE.js b/packages/ui/src/input-datepicker/translations/de-DE.js
similarity index 100%
rename from packages/input-datepicker/translations/de-DE.js
rename to packages/ui/src/input-datepicker/translations/de-DE.js
diff --git a/packages/input-datepicker/translations/de.js b/packages/ui/src/input-datepicker/translations/de.js
similarity index 100%
rename from packages/input-datepicker/translations/de.js
rename to packages/ui/src/input-datepicker/translations/de.js
diff --git a/packages/input-datepicker/translations/en-AU.js b/packages/ui/src/input-datepicker/translations/en-AU.js
similarity index 100%
rename from packages/input-datepicker/translations/en-AU.js
rename to packages/ui/src/input-datepicker/translations/en-AU.js
diff --git a/packages/input-datepicker/translations/en-GB.js b/packages/ui/src/input-datepicker/translations/en-GB.js
similarity index 100%
rename from packages/input-datepicker/translations/en-GB.js
rename to packages/ui/src/input-datepicker/translations/en-GB.js
diff --git a/packages/input-datepicker/translations/en-US.js b/packages/ui/src/input-datepicker/translations/en-US.js
similarity index 100%
rename from packages/input-datepicker/translations/en-US.js
rename to packages/ui/src/input-datepicker/translations/en-US.js
diff --git a/packages/input-datepicker/translations/en.js b/packages/ui/src/input-datepicker/translations/en.js
similarity index 100%
rename from packages/input-datepicker/translations/en.js
rename to packages/ui/src/input-datepicker/translations/en.js
diff --git a/packages/input-datepicker/translations/es-ES.js b/packages/ui/src/input-datepicker/translations/es-ES.js
similarity index 100%
rename from packages/input-datepicker/translations/es-ES.js
rename to packages/ui/src/input-datepicker/translations/es-ES.js
diff --git a/packages/input-datepicker/translations/es.js b/packages/ui/src/input-datepicker/translations/es.js
similarity index 100%
rename from packages/input-datepicker/translations/es.js
rename to packages/ui/src/input-datepicker/translations/es.js
diff --git a/packages/input-datepicker/translations/fr-BE.js b/packages/ui/src/input-datepicker/translations/fr-BE.js
similarity index 100%
rename from packages/input-datepicker/translations/fr-BE.js
rename to packages/ui/src/input-datepicker/translations/fr-BE.js
diff --git a/packages/input-datepicker/translations/fr-FR.js b/packages/ui/src/input-datepicker/translations/fr-FR.js
similarity index 100%
rename from packages/input-datepicker/translations/fr-FR.js
rename to packages/ui/src/input-datepicker/translations/fr-FR.js
diff --git a/packages/input-datepicker/translations/fr.js b/packages/ui/src/input-datepicker/translations/fr.js
similarity index 100%
rename from packages/input-datepicker/translations/fr.js
rename to packages/ui/src/input-datepicker/translations/fr.js
diff --git a/packages/input-datepicker/translations/hu-HU.js b/packages/ui/src/input-datepicker/translations/hu-HU.js
similarity index 100%
rename from packages/input-datepicker/translations/hu-HU.js
rename to packages/ui/src/input-datepicker/translations/hu-HU.js
diff --git a/packages/input-datepicker/translations/hu.js b/packages/ui/src/input-datepicker/translations/hu.js
similarity index 100%
rename from packages/input-datepicker/translations/hu.js
rename to packages/ui/src/input-datepicker/translations/hu.js
diff --git a/packages/input-datepicker/translations/it-IT.js b/packages/ui/src/input-datepicker/translations/it-IT.js
similarity index 100%
rename from packages/input-datepicker/translations/it-IT.js
rename to packages/ui/src/input-datepicker/translations/it-IT.js
diff --git a/packages/input-datepicker/translations/it.js b/packages/ui/src/input-datepicker/translations/it.js
similarity index 100%
rename from packages/input-datepicker/translations/it.js
rename to packages/ui/src/input-datepicker/translations/it.js
diff --git a/packages/input-datepicker/translations/nl-BE.js b/packages/ui/src/input-datepicker/translations/nl-BE.js
similarity index 100%
rename from packages/input-datepicker/translations/nl-BE.js
rename to packages/ui/src/input-datepicker/translations/nl-BE.js
diff --git a/packages/input-datepicker/translations/nl-NL.js b/packages/ui/src/input-datepicker/translations/nl-NL.js
similarity index 100%
rename from packages/input-datepicker/translations/nl-NL.js
rename to packages/ui/src/input-datepicker/translations/nl-NL.js
diff --git a/packages/input-datepicker/translations/nl.js b/packages/ui/src/input-datepicker/translations/nl.js
similarity index 100%
rename from packages/input-datepicker/translations/nl.js
rename to packages/ui/src/input-datepicker/translations/nl.js
diff --git a/packages/input-datepicker/translations/pl-PL.js b/packages/ui/src/input-datepicker/translations/pl-PL.js
similarity index 100%
rename from packages/input-datepicker/translations/pl-PL.js
rename to packages/ui/src/input-datepicker/translations/pl-PL.js
diff --git a/packages/input-datepicker/translations/pl.js b/packages/ui/src/input-datepicker/translations/pl.js
similarity index 100%
rename from packages/input-datepicker/translations/pl.js
rename to packages/ui/src/input-datepicker/translations/pl.js
diff --git a/packages/input-datepicker/translations/ro-RO.js b/packages/ui/src/input-datepicker/translations/ro-RO.js
similarity index 100%
rename from packages/input-datepicker/translations/ro-RO.js
rename to packages/ui/src/input-datepicker/translations/ro-RO.js
diff --git a/packages/input-datepicker/translations/ro.js b/packages/ui/src/input-datepicker/translations/ro.js
similarity index 100%
rename from packages/input-datepicker/translations/ro.js
rename to packages/ui/src/input-datepicker/translations/ro.js
diff --git a/packages/input-datepicker/translations/ru-RU.js b/packages/ui/src/input-datepicker/translations/ru-RU.js
similarity index 100%
rename from packages/input-datepicker/translations/ru-RU.js
rename to packages/ui/src/input-datepicker/translations/ru-RU.js
diff --git a/packages/input-datepicker/translations/ru.js b/packages/ui/src/input-datepicker/translations/ru.js
similarity index 100%
rename from packages/input-datepicker/translations/ru.js
rename to packages/ui/src/input-datepicker/translations/ru.js
diff --git a/packages/input-datepicker/translations/sk-SK.js b/packages/ui/src/input-datepicker/translations/sk-SK.js
similarity index 100%
rename from packages/input-datepicker/translations/sk-SK.js
rename to packages/ui/src/input-datepicker/translations/sk-SK.js
diff --git a/packages/input-datepicker/translations/sk.js b/packages/ui/src/input-datepicker/translations/sk.js
similarity index 100%
rename from packages/input-datepicker/translations/sk.js
rename to packages/ui/src/input-datepicker/translations/sk.js
diff --git a/packages/input-datepicker/translations/uk-UA.js b/packages/ui/src/input-datepicker/translations/uk-UA.js
similarity index 100%
rename from packages/input-datepicker/translations/uk-UA.js
rename to packages/ui/src/input-datepicker/translations/uk-UA.js
diff --git a/packages/input-datepicker/translations/uk.js b/packages/ui/src/input-datepicker/translations/uk.js
similarity index 100%
rename from packages/input-datepicker/translations/uk.js
rename to packages/ui/src/input-datepicker/translations/uk.js
diff --git a/packages/input-datepicker/translations/zh.js b/packages/ui/src/input-datepicker/translations/zh.js
similarity index 100%
rename from packages/input-datepicker/translations/zh.js
rename to packages/ui/src/input-datepicker/translations/zh.js
diff --git a/packages/input-email/src/LionInputEmail.js b/packages/ui/src/input-email/LionInputEmail.js
similarity index 80%
rename from packages/input-email/src/LionInputEmail.js
rename to packages/ui/src/input-email/LionInputEmail.js
index 9ae5bfd23..089c1402c 100644
--- a/packages/input-email/src/LionInputEmail.js
+++ b/packages/ui/src/input-email/LionInputEmail.js
@@ -1,6 +1,6 @@
-import { IsEmail } from '@lion/form-core';
-import { LionInput } from '@lion/input';
-import { LocalizeMixin } from '@lion/localize';
+import { IsEmail } from '@lion/ui/form-core.js';
+import { LionInput } from '@lion/ui/input.js';
+import { LocalizeMixin } from '@lion/ui/localize.js';
 
 /**
  * LionInputEmail: extension of lion-input
diff --git a/packages/input-email/test/lion-input-email-integrations.test.js b/packages/ui/src/input-email/test/lion-input-email-integrations.test.js
similarity index 58%
rename from packages/input-email/test/lion-input-email-integrations.test.js
rename to packages/ui/src/input-email/test/lion-input-email-integrations.test.js
index 1b08f9677..8da715b78 100644
--- a/packages/input-email/test/lion-input-email-integrations.test.js
+++ b/packages/ui/src/input-email/test/lion-input-email-integrations.test.js
@@ -1,5 +1,5 @@
-import { runFormatMixinSuite } from '@lion/form-core/test-suites';
-import '@lion/input-email/define';
+import { runFormatMixinSuite } from '@lion/ui/form-core-test-suites.js';
+import '@lion/ui/define/lion-input-email.js';
 
 const tagString = 'lion-input-email';
 
diff --git a/packages/input-email/test/lion-input-email.test.js b/packages/ui/src/input-email/test/lion-input-email.test.js
similarity index 93%
rename from packages/input-email/test/lion-input-email.test.js
rename to packages/ui/src/input-email/test/lion-input-email.test.js
index 870bae6f3..061cf2b64 100644
--- a/packages/input-email/test/lion-input-email.test.js
+++ b/packages/ui/src/input-email/test/lion-input-email.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
-import { getInputMembers } from '@lion/input/test-helpers';
-import '@lion/input-email/define';
+import { getInputMembers } from '@lion/ui/input-test-helpers.js';
+import '@lion/ui/define/lion-input-email.js';
 
 /**
  * @typedef {import('../src/LionInputEmail').LionInputEmail} LionInputEmail
diff --git a/packages/input-iban/src/LionInputIban.js b/packages/ui/src/input-iban/LionInputIban.js
similarity index 82%
rename from packages/input-iban/src/LionInputIban.js
rename to packages/ui/src/input-iban/LionInputIban.js
index 9e88adf98..9a98bd4e3 100644
--- a/packages/input-iban/src/LionInputIban.js
+++ b/packages/ui/src/input-iban/LionInputIban.js
@@ -1,5 +1,5 @@
-import { LocalizeMixin } from '@lion/localize';
-import { LionInput } from '@lion/input';
+import { LocalizeMixin } from '@lion/ui/localize.js';
+import { LionInput } from '@lion/ui/input.js';
 import { formatIBAN } from './formatters.js';
 import { parseIBAN } from './parsers.js';
 import { IsIBAN } from './validators.js';
diff --git a/packages/input-iban/src/formatters.js b/packages/ui/src/input-iban/formatters.js
similarity index 100%
rename from packages/input-iban/src/formatters.js
rename to packages/ui/src/input-iban/formatters.js
diff --git a/packages/input-iban/src/parsers.js b/packages/ui/src/input-iban/parsers.js
similarity index 100%
rename from packages/input-iban/src/parsers.js
rename to packages/ui/src/input-iban/parsers.js
diff --git a/packages/input-iban/test/formatters.test.js b/packages/ui/src/input-iban/test/formatters.test.js
similarity index 84%
rename from packages/input-iban/test/formatters.test.js
rename to packages/ui/src/input-iban/test/formatters.test.js
index fef6d6dee..51fcdb72b 100644
--- a/packages/input-iban/test/formatters.test.js
+++ b/packages/ui/src/input-iban/test/formatters.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { formatIBAN } from '../src/formatters.js';
+import { formatIBAN } from '@lion/ui/input-iban.js';
 
 describe('formatIBAN', () => {
   it('formats the IBAN', () => {
diff --git a/packages/input-iban/test/lion-input-iban-integrations.test.js b/packages/ui/src/input-iban/test/lion-input-iban-integrations.test.js
similarity index 58%
rename from packages/input-iban/test/lion-input-iban-integrations.test.js
rename to packages/ui/src/input-iban/test/lion-input-iban-integrations.test.js
index f7c9ea230..e0341cca7 100644
--- a/packages/input-iban/test/lion-input-iban-integrations.test.js
+++ b/packages/ui/src/input-iban/test/lion-input-iban-integrations.test.js
@@ -1,5 +1,5 @@
-import { runFormatMixinSuite } from '@lion/form-core/test-suites';
-import '@lion/input-iban/define';
+import { runFormatMixinSuite } from '@lion/ui/form-core-test-suites.js';
+import '@lion/ui/define/lion-input-iban.js';
 
 const tagString = 'lion-input-iban';
 
diff --git a/packages/input-iban/test/lion-input-iban.test.js b/packages/ui/src/input-iban/test/lion-input-iban.test.js
similarity index 91%
rename from packages/input-iban/test/lion-input-iban.test.js
rename to packages/ui/src/input-iban/test/lion-input-iban.test.js
index 443f5ce87..68da7755f 100644
--- a/packages/input-iban/test/lion-input-iban.test.js
+++ b/packages/ui/src/input-iban/test/lion-input-iban.test.js
@@ -1,10 +1,8 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
-import { html } from '@lion/core';
-import { getInputMembers } from '@lion/input/test-helpers';
-import { IsCountryIBAN } from '../src/validators.js';
-import { formatIBAN } from '../src/formatters.js';
-import { parseIBAN } from '../src/parsers.js';
-import '@lion/input-iban/define';
+import { html } from 'lit';
+import { getInputMembers } from '@lion/ui/input-test-helpers.js';
+import { IsCountryIBAN, formatIBAN, parseIBAN } from '@lion/ui/input-iban.js';
+import '@lion/ui/define/lion-input-iban.js';
 
 /**
  * @typedef {import('../src/LionInputIban').LionInputIban} LionInputIban
diff --git a/packages/input-iban/test/parsers.test.js b/packages/ui/src/input-iban/test/parsers.test.js
similarity index 82%
rename from packages/input-iban/test/parsers.test.js
rename to packages/ui/src/input-iban/test/parsers.test.js
index 87926527f..f84f5c801 100644
--- a/packages/input-iban/test/parsers.test.js
+++ b/packages/ui/src/input-iban/test/parsers.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { parseIBAN } from '../src/parsers.js';
+import { parseIBAN } from '@lion/ui/input-iban.js';
 
 describe('parseIBAN', () => {
   it('parses formatted value by trimming spaces and making uppercase', () => {
diff --git a/packages/input-iban/test/validators.test.js b/packages/ui/src/input-iban/test/validators.test.js
similarity index 96%
rename from packages/input-iban/test/validators.test.js
rename to packages/ui/src/input-iban/test/validators.test.js
index 350986554..5fa278955 100644
--- a/packages/input-iban/test/validators.test.js
+++ b/packages/ui/src/input-iban/test/validators.test.js
@@ -1,8 +1,8 @@
 import { expect } from '@open-wc/testing';
 
-import { IsIBAN, IsCountryIBAN, IsNotCountryIBAN } from '../src/validators.js';
+import { IsIBAN, IsCountryIBAN, IsNotCountryIBAN } from '@lion/ui/input-iban.js';
 
-import '@lion/input-iban/define';
+import '@lion/ui/define/lion-input-iban.js';
 
 describe('IBAN validation', () => {
   it('provides IsIBAN to check for valid IBAN', () => {
diff --git a/packages/input-iban/translations/bg-BG.js b/packages/ui/src/input-iban/translations/bg-BG.js
similarity index 100%
rename from packages/input-iban/translations/bg-BG.js
rename to packages/ui/src/input-iban/translations/bg-BG.js
diff --git a/packages/input-iban/translations/bg.js b/packages/ui/src/input-iban/translations/bg.js
similarity index 100%
rename from packages/input-iban/translations/bg.js
rename to packages/ui/src/input-iban/translations/bg.js
diff --git a/packages/input-iban/translations/cs-CZ.js b/packages/ui/src/input-iban/translations/cs-CZ.js
similarity index 100%
rename from packages/input-iban/translations/cs-CZ.js
rename to packages/ui/src/input-iban/translations/cs-CZ.js
diff --git a/packages/input-iban/translations/cs.js b/packages/ui/src/input-iban/translations/cs.js
similarity index 100%
rename from packages/input-iban/translations/cs.js
rename to packages/ui/src/input-iban/translations/cs.js
diff --git a/packages/input-iban/translations/de-DE.js b/packages/ui/src/input-iban/translations/de-DE.js
similarity index 100%
rename from packages/input-iban/translations/de-DE.js
rename to packages/ui/src/input-iban/translations/de-DE.js
diff --git a/packages/input-iban/translations/de.js b/packages/ui/src/input-iban/translations/de.js
similarity index 100%
rename from packages/input-iban/translations/de.js
rename to packages/ui/src/input-iban/translations/de.js
diff --git a/packages/input-iban/translations/en-AU.js b/packages/ui/src/input-iban/translations/en-AU.js
similarity index 100%
rename from packages/input-iban/translations/en-AU.js
rename to packages/ui/src/input-iban/translations/en-AU.js
diff --git a/packages/input-iban/translations/en-GB.js b/packages/ui/src/input-iban/translations/en-GB.js
similarity index 100%
rename from packages/input-iban/translations/en-GB.js
rename to packages/ui/src/input-iban/translations/en-GB.js
diff --git a/packages/input-iban/translations/en-US.js b/packages/ui/src/input-iban/translations/en-US.js
similarity index 100%
rename from packages/input-iban/translations/en-US.js
rename to packages/ui/src/input-iban/translations/en-US.js
diff --git a/packages/input-iban/translations/en.js b/packages/ui/src/input-iban/translations/en.js
similarity index 100%
rename from packages/input-iban/translations/en.js
rename to packages/ui/src/input-iban/translations/en.js
diff --git a/packages/input-iban/translations/es-ES.js b/packages/ui/src/input-iban/translations/es-ES.js
similarity index 100%
rename from packages/input-iban/translations/es-ES.js
rename to packages/ui/src/input-iban/translations/es-ES.js
diff --git a/packages/input-iban/translations/es.js b/packages/ui/src/input-iban/translations/es.js
similarity index 100%
rename from packages/input-iban/translations/es.js
rename to packages/ui/src/input-iban/translations/es.js
diff --git a/packages/input-iban/translations/fr-BE.js b/packages/ui/src/input-iban/translations/fr-BE.js
similarity index 100%
rename from packages/input-iban/translations/fr-BE.js
rename to packages/ui/src/input-iban/translations/fr-BE.js
diff --git a/packages/input-iban/translations/fr-FR.js b/packages/ui/src/input-iban/translations/fr-FR.js
similarity index 100%
rename from packages/input-iban/translations/fr-FR.js
rename to packages/ui/src/input-iban/translations/fr-FR.js
diff --git a/packages/input-iban/translations/fr.js b/packages/ui/src/input-iban/translations/fr.js
similarity index 100%
rename from packages/input-iban/translations/fr.js
rename to packages/ui/src/input-iban/translations/fr.js
diff --git a/packages/input-iban/translations/hu-HU.js b/packages/ui/src/input-iban/translations/hu-HU.js
similarity index 100%
rename from packages/input-iban/translations/hu-HU.js
rename to packages/ui/src/input-iban/translations/hu-HU.js
diff --git a/packages/input-iban/translations/hu.js b/packages/ui/src/input-iban/translations/hu.js
similarity index 100%
rename from packages/input-iban/translations/hu.js
rename to packages/ui/src/input-iban/translations/hu.js
diff --git a/packages/input-iban/translations/it-IT.js b/packages/ui/src/input-iban/translations/it-IT.js
similarity index 100%
rename from packages/input-iban/translations/it-IT.js
rename to packages/ui/src/input-iban/translations/it-IT.js
diff --git a/packages/input-iban/translations/it.js b/packages/ui/src/input-iban/translations/it.js
similarity index 100%
rename from packages/input-iban/translations/it.js
rename to packages/ui/src/input-iban/translations/it.js
diff --git a/packages/input-iban/translations/nl-BE.js b/packages/ui/src/input-iban/translations/nl-BE.js
similarity index 100%
rename from packages/input-iban/translations/nl-BE.js
rename to packages/ui/src/input-iban/translations/nl-BE.js
diff --git a/packages/input-iban/translations/nl-NL.js b/packages/ui/src/input-iban/translations/nl-NL.js
similarity index 100%
rename from packages/input-iban/translations/nl-NL.js
rename to packages/ui/src/input-iban/translations/nl-NL.js
diff --git a/packages/input-iban/translations/nl.js b/packages/ui/src/input-iban/translations/nl.js
similarity index 100%
rename from packages/input-iban/translations/nl.js
rename to packages/ui/src/input-iban/translations/nl.js
diff --git a/packages/input-iban/translations/pl-PL.js b/packages/ui/src/input-iban/translations/pl-PL.js
similarity index 100%
rename from packages/input-iban/translations/pl-PL.js
rename to packages/ui/src/input-iban/translations/pl-PL.js
diff --git a/packages/input-iban/translations/pl.js b/packages/ui/src/input-iban/translations/pl.js
similarity index 100%
rename from packages/input-iban/translations/pl.js
rename to packages/ui/src/input-iban/translations/pl.js
diff --git a/packages/input-iban/translations/ro-RO.js b/packages/ui/src/input-iban/translations/ro-RO.js
similarity index 100%
rename from packages/input-iban/translations/ro-RO.js
rename to packages/ui/src/input-iban/translations/ro-RO.js
diff --git a/packages/input-iban/translations/ro.js b/packages/ui/src/input-iban/translations/ro.js
similarity index 100%
rename from packages/input-iban/translations/ro.js
rename to packages/ui/src/input-iban/translations/ro.js
diff --git a/packages/input-iban/translations/ru-RU.js b/packages/ui/src/input-iban/translations/ru-RU.js
similarity index 100%
rename from packages/input-iban/translations/ru-RU.js
rename to packages/ui/src/input-iban/translations/ru-RU.js
diff --git a/packages/input-iban/translations/ru.js b/packages/ui/src/input-iban/translations/ru.js
similarity index 100%
rename from packages/input-iban/translations/ru.js
rename to packages/ui/src/input-iban/translations/ru.js
diff --git a/packages/input-iban/translations/sk-SK.js b/packages/ui/src/input-iban/translations/sk-SK.js
similarity index 100%
rename from packages/input-iban/translations/sk-SK.js
rename to packages/ui/src/input-iban/translations/sk-SK.js
diff --git a/packages/input-iban/translations/sk.js b/packages/ui/src/input-iban/translations/sk.js
similarity index 100%
rename from packages/input-iban/translations/sk.js
rename to packages/ui/src/input-iban/translations/sk.js
diff --git a/packages/input-iban/translations/uk-UA.js b/packages/ui/src/input-iban/translations/uk-UA.js
similarity index 100%
rename from packages/input-iban/translations/uk-UA.js
rename to packages/ui/src/input-iban/translations/uk-UA.js
diff --git a/packages/input-iban/translations/uk.js b/packages/ui/src/input-iban/translations/uk.js
similarity index 100%
rename from packages/input-iban/translations/uk.js
rename to packages/ui/src/input-iban/translations/uk.js
diff --git a/packages/input-iban/translations/zh.js b/packages/ui/src/input-iban/translations/zh.js
similarity index 100%
rename from packages/input-iban/translations/zh.js
rename to packages/ui/src/input-iban/translations/zh.js
diff --git a/packages/input-iban/src/validators.js b/packages/ui/src/input-iban/validators.js
similarity index 66%
rename from packages/input-iban/src/validators.js
rename to packages/ui/src/input-iban/validators.js
index 5f45617d6..ed9f3a7aa 100644
--- a/packages/input-iban/src/validators.js
+++ b/packages/ui/src/input-iban/validators.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file, import/no-extraneous-dependencies */
 
-import { localize } from '@lion/localize';
-import { Unparseable, Validator } from '@lion/form-core';
+import { localize } from '@lion/ui/localize.js';
+import { Unparseable, Validator } from '@lion/ui/form-core.js';
 import { isValidIBAN } from 'ibantools';
 
 let loaded = false;
@@ -14,75 +14,75 @@ const loadTranslations = async () => {
       'lion-validate+iban': /** @param {string} locale */ locale => {
         switch (locale) {
           case 'bg-BG':
-            return import('@lion/input-iban/translations/bg-BG.js');
+            return import('@lion/ui/input-iban-translations/bg-BG.js');
           case 'bg':
-            return import('@lion/input-iban/translations/bg.js');
+            return import('@lion/ui/input-iban-translations/bg.js');
           case 'cs-CZ':
-            return import('@lion/input-iban/translations/cs-CZ.js');
+            return import('@lion/ui/input-iban-translations/cs-CZ.js');
           case 'cs':
-            return import('@lion/input-iban/translations/cs.js');
+            return import('@lion/ui/input-iban-translations/cs.js');
           case 'de-DE':
-            return import('@lion/input-iban/translations/de-DE.js');
+            return import('@lion/ui/input-iban-translations/de-DE.js');
           case 'de':
-            return import('@lion/input-iban/translations/de.js');
+            return import('@lion/ui/input-iban-translations/de.js');
           case 'en-AU':
-            return import('@lion/input-iban/translations/en-AU.js');
+            return import('@lion/ui/input-iban-translations/en-AU.js');
           case 'en-GB':
-            return import('@lion/input-iban/translations/en-GB.js');
+            return import('@lion/ui/input-iban-translations/en-GB.js');
           case 'en-US':
-            return import('@lion/input-iban/translations/en-US.js');
+            return import('@lion/ui/input-iban-translations/en-US.js');
           case 'en-PH':
           case 'en':
-            return import('@lion/input-iban/translations/en.js');
+            return import('@lion/ui/input-iban-translations/en.js');
           case 'es-ES':
-            return import('@lion/input-iban/translations/es-ES.js');
+            return import('@lion/ui/input-iban-translations/es-ES.js');
           case 'es':
-            return import('@lion/input-iban/translations/es.js');
+            return import('@lion/ui/input-iban-translations/es.js');
           case 'fr-FR':
-            return import('@lion/input-iban/translations/fr-FR.js');
+            return import('@lion/ui/input-iban-translations/fr-FR.js');
           case 'fr-BE':
-            return import('@lion/input-iban/translations/fr-BE.js');
+            return import('@lion/ui/input-iban-translations/fr-BE.js');
           case 'fr':
-            return import('@lion/input-iban/translations/fr.js');
+            return import('@lion/ui/input-iban-translations/fr.js');
           case 'hu-HU':
-            return import('@lion/input-iban/translations/hu-HU.js');
+            return import('@lion/ui/input-iban-translations/hu-HU.js');
           case 'hu':
-            return import('@lion/input-iban/translations/hu.js');
+            return import('@lion/ui/input-iban-translations/hu.js');
           case 'it-IT':
-            return import('@lion/input-iban/translations/it-IT.js');
+            return import('@lion/ui/input-iban-translations/it-IT.js');
           case 'it':
-            return import('@lion/input-iban/translations/it.js');
+            return import('@lion/ui/input-iban-translations/it.js');
           case 'nl-BE':
-            return import('@lion/input-iban/translations/nl-BE.js');
+            return import('@lion/ui/input-iban-translations/nl-BE.js');
           case 'nl-NL':
-            return import('@lion/input-iban/translations/nl-NL.js');
+            return import('@lion/ui/input-iban-translations/nl-NL.js');
           case 'nl':
-            return import('@lion/input-iban/translations/nl.js');
+            return import('@lion/ui/input-iban-translations/nl.js');
           case 'pl-PL':
-            return import('@lion/input-iban/translations/pl-PL.js');
+            return import('@lion/ui/input-iban-translations/pl-PL.js');
           case 'pl':
-            return import('@lion/input-iban/translations/pl.js');
+            return import('@lion/ui/input-iban-translations/pl.js');
           case 'ro-RO':
-            return import('@lion/input-iban/translations/ro-RO.js');
+            return import('@lion/ui/input-iban-translations/ro-RO.js');
           case 'ro':
-            return import('@lion/input-iban/translations/ro.js');
+            return import('@lion/ui/input-iban-translations/ro.js');
           case 'ru-RU':
-            return import('@lion/input-iban/translations/ru-RU.js');
+            return import('@lion/ui/input-iban-translations/ru-RU.js');
           case 'ru':
-            return import('@lion/input-iban/translations/ru.js');
+            return import('@lion/ui/input-iban-translations/ru.js');
           case 'sk-SK':
-            return import('@lion/input-iban/translations/sk-SK.js');
+            return import('@lion/ui/input-iban-translations/sk-SK.js');
           case 'sk':
-            return import('@lion/input-iban/translations/sk.js');
+            return import('@lion/ui/input-iban-translations/sk.js');
           case 'uk-UA':
-            return import('@lion/input-iban/translations/uk-UA.js');
+            return import('@lion/ui/input-iban-translations/uk-UA.js');
           case 'uk':
-            return import('@lion/input-iban/translations/uk.js');
+            return import('@lion/ui/input-iban-translations/uk.js');
           case 'zh-CN':
           case 'zh':
-            return import('@lion/input-iban/translations/zh.js');
+            return import('@lion/ui/input-iban-translations/zh.js');
           default:
-            return import('@lion/input-iban/translations/en.js');
+            return import('@lion/ui/input-iban-translations/en.js');
         }
       },
     },
diff --git a/packages/input-range/src/LionInputRange.js b/packages/ui/src/input-range/LionInputRange.js
similarity index 94%
rename from packages/input-range/src/LionInputRange.js
rename to packages/ui/src/input-range/LionInputRange.js
index 4d848a460..76a6f1a00 100644
--- a/packages/input-range/src/LionInputRange.js
+++ b/packages/ui/src/input-range/LionInputRange.js
@@ -1,7 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { css, html, ScopedStylesController } from '@lion/core';
-import { LionInput } from '@lion/input';
-import { formatNumber } from '@lion/localize';
+import { css, html } from 'lit';
+import { ScopedStylesController } from '@lion/ui/core.js';
+import { LionInput } from '@lion/ui/input.js';
+import { formatNumber } from '@lion/ui/localize.js';
 
 /**
  * @typedef {import('@lion/core').CSSResult} CSSResult
diff --git a/packages/input-range/test/lion-input-range.test.js b/packages/ui/src/input-range/test/lion-input-range.test.js
similarity index 98%
rename from packages/input-range/test/lion-input-range.test.js
rename to packages/ui/src/input-range/test/lion-input-range.test.js
index d40473406..b4b026cd4 100644
--- a/packages/input-range/test/lion-input-range.test.js
+++ b/packages/ui/src/input-range/test/lion-input-range.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture as _fixture, nextFrame, html } from '@open-wc/testing';
 
-import '@lion/input-range/define';
+import '@lion/ui/define/lion-input-range.js';
 
 /**
  * @typedef {import('../src/LionInputRange').LionInputRange} LionInputRange
diff --git a/packages/input-stepper/src/LionInputStepper.js b/packages/ui/src/input-stepper/LionInputStepper.js
similarity index 98%
rename from packages/input-stepper/src/LionInputStepper.js
rename to packages/ui/src/input-stepper/LionInputStepper.js
index 8eed0cbaf..3b82dd119 100644
--- a/packages/input-stepper/src/LionInputStepper.js
+++ b/packages/ui/src/input-stepper/LionInputStepper.js
@@ -1,6 +1,6 @@
-import { html, css, render } from '@lion/core';
-import { LionInput } from '@lion/input';
-import { IsNumber, MinNumber, MaxNumber } from '@lion/form-core';
+import { html, css, render } from 'lit';
+import { LionInput } from '@lion/ui/input.js';
+import { IsNumber, MinNumber, MaxNumber } from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('@lion/core').RenderOptions} RenderOptions
diff --git a/packages/input-stepper/test/lion-input-stepper.test.js b/packages/ui/src/input-stepper/test/lion-input-stepper.test.js
similarity index 99%
rename from packages/input-stepper/test/lion-input-stepper.test.js
rename to packages/ui/src/input-stepper/test/lion-input-stepper.test.js
index 5c2285d49..1c16665af 100644
--- a/packages/input-stepper/test/lion-input-stepper.test.js
+++ b/packages/ui/src/input-stepper/test/lion-input-stepper.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture as _fixture, nextFrame } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import '@lion/input-stepper/define';
+import '@lion/ui/define/lion-input-stepper.js';
 
 /**
  * @typedef {import('../src/LionInputStepper').LionInputStepper} LionInputStepper
diff --git a/packages/input-tel-dropdown/src/LionInputTelDropdown.js b/packages/ui/src/input-tel-dropdown/LionInputTelDropdown.js
similarity index 98%
rename from packages/input-tel-dropdown/src/LionInputTelDropdown.js
rename to packages/ui/src/input-tel-dropdown/LionInputTelDropdown.js
index cb1ee6910..b4ec42801 100644
--- a/packages/input-tel-dropdown/src/LionInputTelDropdown.js
+++ b/packages/ui/src/input-tel-dropdown/LionInputTelDropdown.js
@@ -1,7 +1,8 @@
-// @ts-expect-error ref, createRef are exported (?)
-import { render, html, css, ref, createRef } from '@lion/core';
-import { LionInputTel } from '@lion/input-tel';
-import { localize } from '@lion/localize';
+import { html, render, css } from 'lit';
+import { ref, createRef } from 'lit/directives/ref.js';
+
+import { LionInputTel } from '@lion/ui/input-tel.js';
+import { localize } from '@lion/ui/localize.js';
 import { getFlagSymbol } from './getFlagSymbol.js';
 
 /**
diff --git a/packages/input-tel-dropdown/src/getFlagSymbol.js b/packages/ui/src/input-tel-dropdown/getFlagSymbol.js
similarity index 100%
rename from packages/input-tel-dropdown/src/getFlagSymbol.js
rename to packages/ui/src/input-tel-dropdown/getFlagSymbol.js
diff --git a/packages/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js b/packages/ui/src/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js
similarity index 98%
rename from packages/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js
rename to packages/ui/src/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js
index 68d4959a9..531b93a5b 100644
--- a/packages/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js
+++ b/packages/ui/src/input-tel-dropdown/test-suites/LionInputTelDropdown.suite.js
@@ -1,7 +1,7 @@
 // @ts-ignore
-import { PhoneUtilManager } from '@lion/input-tel';
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
 // @ts-ignore
-import { mockPhoneUtilManager, restorePhoneUtilManager } from '@lion/input-tel/test-helpers';
+import { mockPhoneUtilManager, restorePhoneUtilManager } from '@lion/ui/input-tel-test-helpers.js';
 import {
   aTimeout,
   defineCE,
@@ -12,7 +12,7 @@ import {
   unsafeStatic,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { LionInputTelDropdown } from '../src/LionInputTelDropdown.js';
+import { LionInputTelDropdown } from '@lion/ui/input-tel-dropdown.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
diff --git a/packages/input-tel-dropdown/test/LionInputTelDropdown.test.js b/packages/ui/src/input-tel-dropdown/test/LionInputTelDropdown.test.js
similarity index 79%
rename from packages/input-tel-dropdown/test/LionInputTelDropdown.test.js
rename to packages/ui/src/input-tel-dropdown/test/LionInputTelDropdown.test.js
index 1e518fecd..7aa168f06 100644
--- a/packages/input-tel-dropdown/test/LionInputTelDropdown.test.js
+++ b/packages/ui/src/input-tel-dropdown/test/LionInputTelDropdown.test.js
@@ -1,9 +1,13 @@
-import { runInputTelSuite } from '@lion/input-tel/test-suites';
-// @ts-ignore
-import { ref, repeat, html } from '@lion/core';
-import '@lion/select-rich/define';
-import { LionInputTelDropdown } from '../src/LionInputTelDropdown.js';
-import { runInputTelDropdownSuite } from '../test-suites/LionInputTelDropdown.suite.js';
+import { runInputTelSuite } from '@lion/ui/input-tel-test-suites.js';
+import { html } from 'lit';
+import { repeat } from 'lit/directives/repeat.js';
+import { ref } from 'lit/directives/ref.js';
+
+import { LionInputTelDropdown } from '@lion/ui/input-tel-dropdown.js';
+import { runInputTelDropdownSuite } from '@lion/ui/input-tel-dropdown-test-suites.js';
+
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-select-rich.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
diff --git a/packages/input-tel-dropdown/types/index.d.ts b/packages/ui/src/input-tel-dropdown/types/index.d.ts
similarity index 86%
rename from packages/input-tel-dropdown/types/index.d.ts
rename to packages/ui/src/input-tel-dropdown/types/index.d.ts
index 63366d82e..e9596362e 100644
--- a/packages/input-tel-dropdown/types/index.d.ts
+++ b/packages/ui/src/input-tel-dropdown/types/index.d.ts
@@ -1,6 +1,6 @@
-import { RegionCode } from '@lion/input-tel/types';
-import { LionSelectRich } from '@lion/select-rich';
-import { LionCombobox } from '@lion/combobox';
+import { RegionCode } from '@lion/ui/input-tel/types.js';
+import { LionSelectRich } from '@lion/ui/select-rich.js';
+import { LionCombobox } from '@lion/ui/combobox.js';
 
 type RefTemplateData = {
   ref?: { value?: HTMLElement };
diff --git a/packages/input-tel/src/LionInputTel.js b/packages/ui/src/input-tel/LionInputTel.js
similarity index 98%
rename from packages/input-tel/src/LionInputTel.js
rename to packages/ui/src/input-tel/LionInputTel.js
index 516ccd55c..2ccbf975b 100644
--- a/packages/input-tel/src/LionInputTel.js
+++ b/packages/ui/src/input-tel/LionInputTel.js
@@ -1,6 +1,7 @@
-import { Unparseable } from '@lion/form-core';
-import { LocalizeMixin, localize } from '@lion/localize';
-import { LionInput } from '@lion/input';
+import { Unparseable } from '@lion/ui/form-core.js';
+import { LocalizeMixin, localize } from '@lion/ui/localize.js';
+import { LionInput } from '@lion/ui/input.js';
+
 import { PhoneUtilManager } from './PhoneUtilManager.js';
 import { liveFormatPhoneNumber } from './preprocessors.js';
 import { formatPhoneNumber } from './formatters.js';
diff --git a/packages/input-tel/src/PhoneUtilManager.js b/packages/ui/src/input-tel/PhoneUtilManager.js
similarity index 100%
rename from packages/input-tel/src/PhoneUtilManager.js
rename to packages/ui/src/input-tel/PhoneUtilManager.js
diff --git a/packages/input-tel/src/formatters.js b/packages/ui/src/input-tel/formatters.js
similarity index 100%
rename from packages/input-tel/src/formatters.js
rename to packages/ui/src/input-tel/formatters.js
diff --git a/packages/ui/src/input-tel/localizeNamespaceLoader.js b/packages/ui/src/input-tel/localizeNamespaceLoader.js
new file mode 100644
index 000000000..e646261bb
--- /dev/null
+++ b/packages/ui/src/input-tel/localizeNamespaceLoader.js
@@ -0,0 +1,75 @@
+/* eslint-disable import/no-extraneous-dependencies */
+export const localizeNamespaceLoader = /** @param {string} locale */ locale => {
+  switch (locale) {
+    case 'bg-BG':
+      return import('@lion/ui/input-tel-translations/bg-BG.js');
+    case 'bg':
+      return import('@lion/ui/input-tel-translations/bg.js');
+    case 'cs-CZ':
+      return import('@lion/ui/input-tel-translations/cs-CZ.js');
+    case 'cs':
+      return import('@lion/ui/input-tel-translations/cs.js');
+    case 'de-DE':
+      return import('@lion/ui/input-tel-translations/de-DE.js');
+    case 'de':
+      return import('@lion/ui/input-tel-translations/de.js');
+    case 'en-AU':
+      return import('@lion/ui/input-tel-translations/en-AU.js');
+    case 'en-GB':
+      return import('@lion/ui/input-tel-translations/en-GB.js');
+    case 'en-US':
+      return import('@lion/ui/input-tel-translations/en-US.js');
+    case 'en-PH':
+    case 'en':
+      return import('@lion/ui/input-tel-translations/en.js');
+    case 'es-ES':
+      return import('@lion/ui/input-tel-translations/es-ES.js');
+    case 'es':
+      return import('@lion/ui/input-tel-translations/es.js');
+    case 'fr-FR':
+      return import('@lion/ui/input-tel-translations/fr-FR.js');
+    case 'fr-BE':
+      return import('@lion/ui/input-tel-translations/fr-BE.js');
+    case 'fr':
+      return import('@lion/ui/input-tel-translations/fr.js');
+    case 'hu-HU':
+      return import('@lion/ui/input-tel-translations/hu-HU.js');
+    case 'hu':
+      return import('@lion/ui/input-tel-translations/hu.js');
+    case 'it-IT':
+      return import('@lion/ui/input-tel-translations/it-IT.js');
+    case 'it':
+      return import('@lion/ui/input-tel-translations/it.js');
+    case 'nl-BE':
+      return import('@lion/ui/input-tel-translations/nl-BE.js');
+    case 'nl-NL':
+      return import('@lion/ui/input-tel-translations/nl-NL.js');
+    case 'nl':
+      return import('@lion/ui/input-tel-translations/nl.js');
+    case 'pl-PL':
+      return import('@lion/ui/input-tel-translations/pl-PL.js');
+    case 'pl':
+      return import('@lion/ui/input-tel-translations/pl.js');
+    case 'ro-RO':
+      return import('@lion/ui/input-tel-translations/ro-RO.js');
+    case 'ro':
+      return import('@lion/ui/input-tel-translations/ro.js');
+    case 'ru-RU':
+      return import('@lion/ui/input-tel-translations/ru-RU.js');
+    case 'ru':
+      return import('@lion/ui/input-tel-translations/ru.js');
+    case 'sk-SK':
+      return import('@lion/ui/input-tel-translations/sk-SK.js');
+    case 'sk':
+      return import('@lion/ui/input-tel-translations/sk.js');
+    case 'uk-UA':
+      return import('@lion/ui/input-tel-translations/uk-UA.js');
+    case 'uk':
+      return import('@lion/ui/input-tel-translations/uk.js');
+    case 'zh-CN':
+    case 'zh':
+      return import('@lion/ui/input-tel-translations/zh.js');
+    default:
+      return import('@lion/ui/input-tel-translations/en.js');
+  }
+};
diff --git a/packages/input-tel/src/parsers.js b/packages/ui/src/input-tel/parsers.js
similarity index 100%
rename from packages/input-tel/src/parsers.js
rename to packages/ui/src/input-tel/parsers.js
diff --git a/packages/input-tel/src/preprocessors.js b/packages/ui/src/input-tel/preprocessors.js
similarity index 100%
rename from packages/input-tel/src/preprocessors.js
rename to packages/ui/src/input-tel/preprocessors.js
diff --git a/packages/input-tel/test-helpers/mockPhoneUtilManager.js b/packages/ui/src/input-tel/test-helpers/mockPhoneUtilManager.js
similarity index 91%
rename from packages/input-tel/test-helpers/mockPhoneUtilManager.js
rename to packages/ui/src/input-tel/test-helpers/mockPhoneUtilManager.js
index 1c84414dc..e4fa2a38f 100644
--- a/packages/input-tel/test-helpers/mockPhoneUtilManager.js
+++ b/packages/ui/src/input-tel/test-helpers/mockPhoneUtilManager.js
@@ -1,4 +1,4 @@
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
+import { PhoneUtilManager } from '../PhoneUtilManager.js';
 
 const originalLoadComplete = PhoneUtilManager.loadComplete;
 const originalIsLoaded = PhoneUtilManager.isLoaded;
diff --git a/packages/input-tel/test-suites/LionInputTel.suite.js b/packages/ui/src/input-tel/test-suites/LionInputTel.suite.js
similarity index 97%
rename from packages/input-tel/test-suites/LionInputTel.suite.js
rename to packages/ui/src/input-tel/test-suites/LionInputTel.suite.js
index 2da5047d3..00cedbdfc 100644
--- a/packages/input-tel/test-suites/LionInputTel.suite.js
+++ b/packages/ui/src/input-tel/test-suites/LionInputTel.suite.js
@@ -8,16 +8,11 @@ import {
   aTimeout,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { mimicUserInput } from '@lion/form-core/test-helpers';
-import { localize } from '@lion/localize';
-import { Unparseable } from '@lion/form-core';
-import { LionInputTel } from '../src/LionInputTel.js';
-import { PhoneNumber } from '../src/validators.js';
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
-import {
-  mockPhoneUtilManager,
-  restorePhoneUtilManager,
-} from '../test-helpers/mockPhoneUtilManager.js';
+import { mimicUserInput } from '@lion/ui/form-core-test-helpers.js';
+import { localize } from '@lion/ui/localize.js';
+import { Unparseable } from '@lion/ui/form-core.js';
+import { LionInputTel, PhoneNumber, PhoneUtilManager } from '@lion/ui/input-tel.js';
+import { mockPhoneUtilManager, restorePhoneUtilManager } from '@lion/ui/input-tel-test-helpers.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
diff --git a/packages/ui/src/input-tel/test/LionInputTel.test.js b/packages/ui/src/input-tel/test/LionInputTel.test.js
new file mode 100644
index 000000000..e8f90919a
--- /dev/null
+++ b/packages/ui/src/input-tel/test/LionInputTel.test.js
@@ -0,0 +1,3 @@
+import { runInputTelSuite } from '@lion/ui/input-tel-test-suites.js';
+
+runInputTelSuite();
diff --git a/packages/input-tel/test/formatters.test.js b/packages/ui/src/input-tel/test/formatters.test.js
similarity index 94%
rename from packages/input-tel/test/formatters.test.js
rename to packages/ui/src/input-tel/test/formatters.test.js
index 3a1e3b9ab..2c2c5e2c7 100644
--- a/packages/input-tel/test/formatters.test.js
+++ b/packages/ui/src/input-tel/test/formatters.test.js
@@ -1,6 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { formatPhoneNumber } from '../src/formatters.js';
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
+import { formatPhoneNumber, PhoneUtilManager } from '@lion/ui/input-tel.js';
 
 describe('formatPhoneNumber', () => {
   beforeEach(async () => {
diff --git a/packages/input-tel/test/parsers.test.js b/packages/ui/src/input-tel/test/parsers.test.js
similarity index 90%
rename from packages/input-tel/test/parsers.test.js
rename to packages/ui/src/input-tel/test/parsers.test.js
index 69d1ed96a..09199f50c 100644
--- a/packages/input-tel/test/parsers.test.js
+++ b/packages/ui/src/input-tel/test/parsers.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { parsePhoneNumber } from '../src/parsers.js';
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
+import { PhoneUtilManager } from '@lion/ui/input-tel.js';
+import { parsePhoneNumber } from '../parsers.js';
 
 describe('parsePhoneNumber', () => {
   beforeEach(async () => {
diff --git a/packages/input-tel/test/preprocessors.test.js b/packages/ui/src/input-tel/test/preprocessors.test.js
similarity index 95%
rename from packages/input-tel/test/preprocessors.test.js
rename to packages/ui/src/input-tel/test/preprocessors.test.js
index c6b1780c2..bdfce3956 100644
--- a/packages/input-tel/test/preprocessors.test.js
+++ b/packages/ui/src/input-tel/test/preprocessors.test.js
@@ -1,6 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { liveFormatPhoneNumber } from '../src/preprocessors.js';
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
+import { liveFormatPhoneNumber, PhoneUtilManager } from '@lion/ui/input-tel.js';
 
 describe('liveFormatPhoneNumber', () => {
   beforeEach(async () => {
diff --git a/packages/input-tel/test/validators.test.js b/packages/ui/src/input-tel/test/validators.test.js
similarity index 92%
rename from packages/input-tel/test/validators.test.js
rename to packages/ui/src/input-tel/test/validators.test.js
index 0b5389b5f..bc8400c9f 100644
--- a/packages/input-tel/test/validators.test.js
+++ b/packages/ui/src/input-tel/test/validators.test.js
@@ -1,11 +1,7 @@
 import sinon from 'sinon';
 import { expect, aTimeout } from '@open-wc/testing';
-import { PhoneNumber } from '../src/validators.js';
-import { PhoneUtilManager } from '../src/PhoneUtilManager.js';
-import {
-  mockPhoneUtilManager,
-  restorePhoneUtilManager,
-} from '../test-helpers/mockPhoneUtilManager.js';
+import { PhoneNumber, PhoneUtilManager } from '@lion/ui/input-tel.js';
+import { mockPhoneUtilManager, restorePhoneUtilManager } from '@lion/ui/input-tel-test-helpers.js';
 
 /**
  * @typedef {* & import('awesome-phonenumber').default} AwesomePhoneNumber
diff --git a/packages/input-tel/translations/bg-BG.js b/packages/ui/src/input-tel/translations/bg-BG.js
similarity index 100%
rename from packages/input-tel/translations/bg-BG.js
rename to packages/ui/src/input-tel/translations/bg-BG.js
diff --git a/packages/input-tel/translations/bg.js b/packages/ui/src/input-tel/translations/bg.js
similarity index 100%
rename from packages/input-tel/translations/bg.js
rename to packages/ui/src/input-tel/translations/bg.js
diff --git a/packages/input-tel/translations/cs-CZ.js b/packages/ui/src/input-tel/translations/cs-CZ.js
similarity index 100%
rename from packages/input-tel/translations/cs-CZ.js
rename to packages/ui/src/input-tel/translations/cs-CZ.js
diff --git a/packages/input-tel/translations/cs.js b/packages/ui/src/input-tel/translations/cs.js
similarity index 100%
rename from packages/input-tel/translations/cs.js
rename to packages/ui/src/input-tel/translations/cs.js
diff --git a/packages/input-tel/translations/de-DE.js b/packages/ui/src/input-tel/translations/de-DE.js
similarity index 100%
rename from packages/input-tel/translations/de-DE.js
rename to packages/ui/src/input-tel/translations/de-DE.js
diff --git a/packages/input-tel/translations/de.js b/packages/ui/src/input-tel/translations/de.js
similarity index 100%
rename from packages/input-tel/translations/de.js
rename to packages/ui/src/input-tel/translations/de.js
diff --git a/packages/input-tel/translations/en-AU.js b/packages/ui/src/input-tel/translations/en-AU.js
similarity index 100%
rename from packages/input-tel/translations/en-AU.js
rename to packages/ui/src/input-tel/translations/en-AU.js
diff --git a/packages/input-tel/translations/en-GB.js b/packages/ui/src/input-tel/translations/en-GB.js
similarity index 100%
rename from packages/input-tel/translations/en-GB.js
rename to packages/ui/src/input-tel/translations/en-GB.js
diff --git a/packages/input-tel/translations/en-US.js b/packages/ui/src/input-tel/translations/en-US.js
similarity index 100%
rename from packages/input-tel/translations/en-US.js
rename to packages/ui/src/input-tel/translations/en-US.js
diff --git a/packages/input-tel/translations/en.js b/packages/ui/src/input-tel/translations/en.js
similarity index 100%
rename from packages/input-tel/translations/en.js
rename to packages/ui/src/input-tel/translations/en.js
diff --git a/packages/input-tel/translations/es-ES.js b/packages/ui/src/input-tel/translations/es-ES.js
similarity index 100%
rename from packages/input-tel/translations/es-ES.js
rename to packages/ui/src/input-tel/translations/es-ES.js
diff --git a/packages/input-tel/translations/es.js b/packages/ui/src/input-tel/translations/es.js
similarity index 100%
rename from packages/input-tel/translations/es.js
rename to packages/ui/src/input-tel/translations/es.js
diff --git a/packages/input-tel/translations/fr-BE.js b/packages/ui/src/input-tel/translations/fr-BE.js
similarity index 100%
rename from packages/input-tel/translations/fr-BE.js
rename to packages/ui/src/input-tel/translations/fr-BE.js
diff --git a/packages/input-tel/translations/fr-FR.js b/packages/ui/src/input-tel/translations/fr-FR.js
similarity index 100%
rename from packages/input-tel/translations/fr-FR.js
rename to packages/ui/src/input-tel/translations/fr-FR.js
diff --git a/packages/input-tel/translations/fr.js b/packages/ui/src/input-tel/translations/fr.js
similarity index 100%
rename from packages/input-tel/translations/fr.js
rename to packages/ui/src/input-tel/translations/fr.js
diff --git a/packages/input-tel/translations/hu-HU.js b/packages/ui/src/input-tel/translations/hu-HU.js
similarity index 100%
rename from packages/input-tel/translations/hu-HU.js
rename to packages/ui/src/input-tel/translations/hu-HU.js
diff --git a/packages/input-tel/translations/hu.js b/packages/ui/src/input-tel/translations/hu.js
similarity index 100%
rename from packages/input-tel/translations/hu.js
rename to packages/ui/src/input-tel/translations/hu.js
diff --git a/packages/input-tel/translations/it-IT.js b/packages/ui/src/input-tel/translations/it-IT.js
similarity index 100%
rename from packages/input-tel/translations/it-IT.js
rename to packages/ui/src/input-tel/translations/it-IT.js
diff --git a/packages/input-tel/translations/it.js b/packages/ui/src/input-tel/translations/it.js
similarity index 100%
rename from packages/input-tel/translations/it.js
rename to packages/ui/src/input-tel/translations/it.js
diff --git a/packages/input-tel/translations/nl-BE.js b/packages/ui/src/input-tel/translations/nl-BE.js
similarity index 100%
rename from packages/input-tel/translations/nl-BE.js
rename to packages/ui/src/input-tel/translations/nl-BE.js
diff --git a/packages/input-tel/translations/nl-NL.js b/packages/ui/src/input-tel/translations/nl-NL.js
similarity index 100%
rename from packages/input-tel/translations/nl-NL.js
rename to packages/ui/src/input-tel/translations/nl-NL.js
diff --git a/packages/input-tel/translations/nl.js b/packages/ui/src/input-tel/translations/nl.js
similarity index 100%
rename from packages/input-tel/translations/nl.js
rename to packages/ui/src/input-tel/translations/nl.js
diff --git a/packages/input-tel/translations/pl-PL.js b/packages/ui/src/input-tel/translations/pl-PL.js
similarity index 100%
rename from packages/input-tel/translations/pl-PL.js
rename to packages/ui/src/input-tel/translations/pl-PL.js
diff --git a/packages/input-tel/translations/pl.js b/packages/ui/src/input-tel/translations/pl.js
similarity index 100%
rename from packages/input-tel/translations/pl.js
rename to packages/ui/src/input-tel/translations/pl.js
diff --git a/packages/input-tel/translations/ro-RO.js b/packages/ui/src/input-tel/translations/ro-RO.js
similarity index 100%
rename from packages/input-tel/translations/ro-RO.js
rename to packages/ui/src/input-tel/translations/ro-RO.js
diff --git a/packages/input-tel/translations/ro.js b/packages/ui/src/input-tel/translations/ro.js
similarity index 100%
rename from packages/input-tel/translations/ro.js
rename to packages/ui/src/input-tel/translations/ro.js
diff --git a/packages/input-tel/translations/ru-RU.js b/packages/ui/src/input-tel/translations/ru-RU.js
similarity index 100%
rename from packages/input-tel/translations/ru-RU.js
rename to packages/ui/src/input-tel/translations/ru-RU.js
diff --git a/packages/input-tel/translations/ru.js b/packages/ui/src/input-tel/translations/ru.js
similarity index 100%
rename from packages/input-tel/translations/ru.js
rename to packages/ui/src/input-tel/translations/ru.js
diff --git a/packages/input-tel/translations/sk-SK.js b/packages/ui/src/input-tel/translations/sk-SK.js
similarity index 100%
rename from packages/input-tel/translations/sk-SK.js
rename to packages/ui/src/input-tel/translations/sk-SK.js
diff --git a/packages/input-tel/translations/sk.js b/packages/ui/src/input-tel/translations/sk.js
similarity index 100%
rename from packages/input-tel/translations/sk.js
rename to packages/ui/src/input-tel/translations/sk.js
diff --git a/packages/input-tel/translations/uk-UA.js b/packages/ui/src/input-tel/translations/uk-UA.js
similarity index 100%
rename from packages/input-tel/translations/uk-UA.js
rename to packages/ui/src/input-tel/translations/uk-UA.js
diff --git a/packages/input-tel/translations/uk.js b/packages/ui/src/input-tel/translations/uk.js
similarity index 100%
rename from packages/input-tel/translations/uk.js
rename to packages/ui/src/input-tel/translations/uk.js
diff --git a/packages/input-tel/translations/zh.js b/packages/ui/src/input-tel/translations/zh.js
similarity index 100%
rename from packages/input-tel/translations/zh.js
rename to packages/ui/src/input-tel/translations/zh.js
diff --git a/packages/input-tel/types/index.d.ts b/packages/ui/src/input-tel/types/index.d.ts
similarity index 100%
rename from packages/input-tel/types/index.d.ts
rename to packages/ui/src/input-tel/types/index.d.ts
diff --git a/packages/input-tel/src/validators.js b/packages/ui/src/input-tel/validators.js
similarity index 97%
rename from packages/input-tel/src/validators.js
rename to packages/ui/src/input-tel/validators.js
index 08dfa95a6..de4ea1acc 100644
--- a/packages/input-tel/src/validators.js
+++ b/packages/ui/src/input-tel/validators.js
@@ -1,4 +1,4 @@
-import { Validator } from '@lion/form-core';
+import { Validator } from '@lion/ui/form-core.js';
 import { PhoneUtilManager } from './PhoneUtilManager.js';
 
 /**
diff --git a/packages/input/src/LionInput.js b/packages/ui/src/input/LionInput.js
similarity index 97%
rename from packages/input/src/LionInput.js
rename to packages/ui/src/input/LionInput.js
index 0b3feba89..b67284fe6 100644
--- a/packages/input/src/LionInput.js
+++ b/packages/ui/src/input/LionInput.js
@@ -1,4 +1,4 @@
-import { LionField, NativeTextFieldMixin } from '@lion/form-core';
+import { LionField, NativeTextFieldMixin } from '@lion/ui/form-core.js';
 
 /**
  * LionInput: extension of lion-field with native input element in place and user friendly API.
diff --git a/packages/input/test-helpers/getInputMembers.js b/packages/ui/src/input/test-helpers/getInputMembers.js
similarity index 84%
rename from packages/input/test-helpers/getInputMembers.js
rename to packages/ui/src/input/test-helpers/getInputMembers.js
index 77a21505e..4b4de1db1 100644
--- a/packages/input/test-helpers/getInputMembers.js
+++ b/packages/ui/src/input/test-helpers/getInputMembers.js
@@ -1,4 +1,4 @@
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @typedef {import('../src/LionInput').LionInput} LionInput
diff --git a/packages/input/test/input-integrations.test.js b/packages/ui/src/input/test/input-integrations.test.js
similarity index 88%
rename from packages/input/test/input-integrations.test.js
rename to packages/ui/src/input/test/input-integrations.test.js
index 20d8b7086..fad0651a0 100644
--- a/packages/input/test/input-integrations.test.js
+++ b/packages/ui/src/input/test/input-integrations.test.js
@@ -3,9 +3,9 @@ import {
   runInteractionStateMixinSuite,
   runFormatMixinSuite,
   runNativeTextFieldMixinSuite,
-} from '@lion/form-core/test-suites';
+} from '@lion/ui/form-core-test-suites.js';
 
-import { LionInput } from '../src/LionInput.js';
+import { LionInput } from '@lion/ui/input.js';
 
 const fieldTagString = defineCE(
   class extends LionInput {
diff --git a/packages/input/test/lion-input-integrations.test.js b/packages/ui/src/input/test/lion-input-integrations.test.js
similarity index 55%
rename from packages/input/test/lion-input-integrations.test.js
rename to packages/ui/src/input/test/lion-input-integrations.test.js
index ab5860608..cbe8ad166 100644
--- a/packages/input/test/lion-input-integrations.test.js
+++ b/packages/ui/src/input/test/lion-input-integrations.test.js
@@ -1,6 +1,9 @@
-import { runInteractionStateMixinSuite, runFormatMixinSuite } from '@lion/form-core/test-suites';
+import {
+  runInteractionStateMixinSuite,
+  runFormatMixinSuite,
+} from '@lion/ui/form-core-test-suites.js';
 
-import '@lion/input/define';
+import '@lion/ui/define/lion-input.js';
 
 const tagString = 'lion-input';
 
diff --git a/packages/input/test/lion-input.test.js b/packages/ui/src/input/test/lion-input.test.js
similarity index 97%
rename from packages/input/test/lion-input.test.js
rename to packages/ui/src/input/test/lion-input.test.js
index 8a58e77a1..18b8b81db 100644
--- a/packages/input/test/lion-input.test.js
+++ b/packages/ui/src/input/test/lion-input.test.js
@@ -1,7 +1,7 @@
-import { Validator } from '@lion/form-core';
-import '@lion/input/define';
+import { Validator } from '@lion/ui/form-core.js';
+import '@lion/ui/define/lion-input.js';
 import { aTimeout, expect, fixture, html, triggerFocusFor, unsafeStatic } from '@open-wc/testing';
-import { getInputMembers } from '../test-helpers/index.js';
+import { getInputMembers } from '../../../exports/input-test-helpers.js';
 
 /**
  * @typedef {import('../src/LionInput').LionInput} LionInput
diff --git a/packages/listbox/src/LionListbox.js b/packages/ui/src/listbox/LionListbox.js
similarity index 91%
rename from packages/listbox/src/LionListbox.js
rename to packages/ui/src/listbox/LionListbox.js
index 7baef9353..85b619144 100644
--- a/packages/listbox/src/LionListbox.js
+++ b/packages/ui/src/listbox/LionListbox.js
@@ -1,5 +1,5 @@
-import { LitElement } from '@lion/core';
-import { ValidateMixin, InteractionStateMixin, FocusMixin } from '@lion/form-core';
+import { LitElement } from 'lit';
+import { ValidateMixin, InteractionStateMixin, FocusMixin } from '@lion/ui/form-core.js';
 import { ListboxMixin } from './ListboxMixin.js';
 
 // TODO: could we extend from LionField?
diff --git a/packages/listbox/src/LionOption.js b/packages/ui/src/listbox/LionOption.js
similarity index 94%
rename from packages/listbox/src/LionOption.js
rename to packages/ui/src/listbox/LionOption.js
index 344cbbc15..29cbd0188 100644
--- a/packages/listbox/src/LionOption.js
+++ b/packages/ui/src/listbox/LionOption.js
@@ -1,5 +1,6 @@
-import { ChoiceInputMixin, FormRegisteringMixin } from '@lion/form-core';
-import { css, DisabledMixin, html, LitElement, SlotMixin } from '@lion/core';
+import { css, html, LitElement } from 'lit';
+import { ChoiceInputMixin, FormRegisteringMixin } from '@lion/ui/form-core.js';
+import { DisabledMixin, SlotMixin } from '@lion/ui/core.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult } TemplateResult
diff --git a/packages/listbox/src/LionOptions.js b/packages/ui/src/listbox/LionOptions.js
similarity index 81%
rename from packages/listbox/src/LionOptions.js
rename to packages/ui/src/listbox/LionOptions.js
index 7ee1f3157..b31982e46 100644
--- a/packages/listbox/src/LionOptions.js
+++ b/packages/ui/src/listbox/LionOptions.js
@@ -1,5 +1,5 @@
-import { LitElement } from '@lion/core';
-import { FormRegistrarPortalMixin } from '@lion/form-core';
+import { LitElement } from 'lit';
+import { FormRegistrarPortalMixin } from '@lion/ui/form-core.js';
 
 /**
  * LionOptions
diff --git a/packages/listbox/src/ListboxMixin.js b/packages/ui/src/listbox/ListboxMixin.js
similarity index 99%
rename from packages/listbox/src/ListboxMixin.js
rename to packages/ui/src/listbox/ListboxMixin.js
index 0643c74fb..f7b57645d 100644
--- a/packages/listbox/src/ListboxMixin.js
+++ b/packages/ui/src/listbox/ListboxMixin.js
@@ -1,5 +1,8 @@
-import { css, dedupeMixin, html, ScopedElementsMixin, SlotMixin, uuid } from '@lion/core';
-import { ChoiceGroupMixin, FormControlMixin, FormRegistrarMixin } from '@lion/form-core';
+import { css, html } from 'lit';
+import { SlotMixin, uuid } from '@lion/ui/core.js';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
+import { ChoiceGroupMixin, FormControlMixin, FormRegistrarMixin } from '@lion/ui/form-core.js';
 import { LionOptions } from './LionOptions.js';
 
 // TODO: extract ListNavigationWithActiveDescendantMixin that can be reused in [role="menu"]
diff --git a/packages/listbox/test-helpers/getListboxMembers.js b/packages/ui/src/listbox/test-helpers/getListboxMembers.js
similarity index 90%
rename from packages/listbox/test-helpers/getListboxMembers.js
rename to packages/ui/src/listbox/test-helpers/getListboxMembers.js
index a2e2474c3..47c1ae21b 100644
--- a/packages/listbox/test-helpers/getListboxMembers.js
+++ b/packages/ui/src/listbox/test-helpers/getListboxMembers.js
@@ -1,4 +1,4 @@
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
 
 /**
  * @typedef {import('@lion/listbox/src/LionOptions').LionOptions} LionOptions
diff --git a/packages/listbox/test-suites/ListboxMixin.suite.js b/packages/ui/src/listbox/test-suites/ListboxMixin.suite.js
similarity index 99%
rename from packages/listbox/test-suites/ListboxMixin.suite.js
rename to packages/ui/src/listbox/test-suites/ListboxMixin.suite.js
index 9de8a33ab..c1a6e1069 100644
--- a/packages/listbox/test-suites/ListboxMixin.suite.js
+++ b/packages/ui/src/listbox/test-suites/ListboxMixin.suite.js
@@ -1,7 +1,9 @@
-import { LitElement, repeat } from '@lion/core';
-import { Required } from '@lion/form-core';
-import { LionOptions } from '@lion/listbox';
-import '@lion/listbox/define';
+import { LitElement } from 'lit';
+import { repeat } from 'lit/directives/repeat.js';
+import { Required } from '@lion/ui/form-core.js';
+import { LionOptions } from '@lion/ui/listbox.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-option.js';
 import {
   aTimeout,
   defineCE,
@@ -12,7 +14,7 @@ import {
   unsafeStatic,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { getListboxMembers } from '../test-helpers/index.js';
+import { getListboxMembers } from '../../../exports/listbox-test-helpers.js';
 
 /**
  * @typedef {import('../src/LionListbox').LionListbox} LionListbox
diff --git a/packages/ui/src/listbox/test/lion-listbox.test.js b/packages/ui/src/listbox/test/lion-listbox.test.js
new file mode 100644
index 000000000..df47a13e5
--- /dev/null
+++ b/packages/ui/src/listbox/test/lion-listbox.test.js
@@ -0,0 +1,3 @@
+import { runListboxMixinSuite } from '@lion/ui/listbox-test-suites.js';
+
+runListboxMixinSuite();
diff --git a/packages/listbox/test/lion-option.test.js b/packages/ui/src/listbox/test/lion-option.test.js
similarity index 98%
rename from packages/listbox/test/lion-option.test.js
rename to packages/ui/src/listbox/test/lion-option.test.js
index 4ac146d01..de0ce6aee 100644
--- a/packages/listbox/test/lion-option.test.js
+++ b/packages/ui/src/listbox/test/lion-option.test.js
@@ -2,8 +2,8 @@ import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
 // eslint-disable-next-line no-unused-vars
-import { LionOption } from '../src/LionOption.js';
-import '@lion/listbox/define-option';
+import { LionOption } from '@lion/ui/listbox.js';
+import '@lion/ui/define/lion-option.js';
 
 describe('lion-option', () => {
   describe('Values', () => {
diff --git a/packages/listbox/test/lion-options.test.js b/packages/ui/src/listbox/test/lion-options.test.js
similarity index 84%
rename from packages/listbox/test/lion-options.test.js
rename to packages/ui/src/listbox/test/lion-options.test.js
index 569f27b40..f2f33279b 100644
--- a/packages/listbox/test/lion-options.test.js
+++ b/packages/ui/src/listbox/test/lion-options.test.js
@@ -1,8 +1,8 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 // eslint-disable-next-line no-unused-vars
-import { LionOptions } from '../src/LionOptions.js';
-import '@lion/listbox/define-options';
+import { LionOptions } from '@lion/ui/listbox.js';
+import '@lion/ui/define/lion-options.js';
 
 describe('lion-options', () => {
   it('should have role="listbox"', async () => {
diff --git a/packages/listbox/types/LionOption.d.ts b/packages/ui/src/listbox/types/LionOption.d.ts
similarity index 54%
rename from packages/listbox/types/LionOption.d.ts
rename to packages/ui/src/listbox/types/LionOption.d.ts
index 22c454d67..9dec5308c 100644
--- a/packages/listbox/types/LionOption.d.ts
+++ b/packages/ui/src/listbox/types/LionOption.d.ts
@@ -1,4 +1,4 @@
-import { ChoiceGroupHost } from '@lion/form-core/types/choice-group/ChoiceGroupMixinTypes';
+import { ChoiceGroupHost } from '@lion/ui/form-core/types/choice-group/ChoiceGroupMixinTypes.js';
 
 export declare class LionOptionHost {
   constructor(...args: any[]);
diff --git a/packages/listbox/types/ListboxMixinTypes.d.ts b/packages/ui/src/listbox/types/ListboxMixinTypes.d.ts
similarity index 88%
rename from packages/listbox/types/ListboxMixinTypes.d.ts
rename to packages/ui/src/listbox/types/ListboxMixinTypes.d.ts
index 71765f69b..2af4cd88d 100644
--- a/packages/listbox/types/ListboxMixinTypes.d.ts
+++ b/packages/ui/src/listbox/types/ListboxMixinTypes.d.ts
@@ -1,10 +1,10 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement, CSSResultArray } from '@lion/core';
-import { SlotHost } from '@lion/core/types/SlotMixinTypes';
+import { LitElement, CSSResultArray } from '@lion/ui/core.js';
+import { SlotHost } from '@lion/ui/core/types/SlotMixinTypes.js';
 
-import { FormControlHost } from '@lion/form-core/types/FormControlMixinTypes';
-import { FormRegistrarHost } from '@lion/form-core/types/registration/FormRegistrarMixinTypes';
-import { ChoiceGroupHost } from '@lion/form-core/types/choice-group/ChoiceGroupMixinTypes';
+import { FormControlHost } from '@lion/ui/form-core/types/FormControlMixinTypes.js';
+import { FormRegistrarHost } from '@lion/ui/form-core/types/registration/FormRegistrarMixinTypes.js';
+import { ChoiceGroupHost } from '@lion/ui/form-core/types/choice-group/ChoiceGroupMixinTypes.js';
 import { LionOptions } from '../src/LionOptions.js';
 import { LionOption } from '../src/LionOption.js';
 
diff --git a/packages/localize/src/LocalizeManager.js b/packages/ui/src/localize/LocalizeManager.js
similarity index 100%
rename from packages/localize/src/LocalizeManager.js
rename to packages/ui/src/localize/LocalizeManager.js
diff --git a/packages/localize/src/LocalizeMixin.js b/packages/ui/src/localize/LocalizeMixin.js
similarity index 96%
rename from packages/localize/src/LocalizeMixin.js
rename to packages/ui/src/localize/LocalizeMixin.js
index 3c637fe56..fd051fda3 100644
--- a/packages/localize/src/LocalizeMixin.js
+++ b/packages/ui/src/localize/LocalizeMixin.js
@@ -1,5 +1,7 @@
-import { dedupeMixin, until, nothing } from '@lion/core';
-import { localize } from './localize.js';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
+import { nothing } from 'lit';
+import { until } from 'lit/directives/until.js';
+import { localize } from './singleton.js';
 
 /**
  * @typedef {import('@lion/core').DirectiveResult} DirectiveResult
diff --git a/packages/localize/src/date/formatDate.js b/packages/ui/src/localize/date/formatDate.js
similarity index 97%
rename from packages/localize/src/date/formatDate.js
rename to packages/ui/src/localize/date/formatDate.js
index 2bde7f856..ffe1e0da4 100644
--- a/packages/localize/src/date/formatDate.js
+++ b/packages/ui/src/localize/date/formatDate.js
@@ -1,5 +1,5 @@
-import { localize } from '../localize.js';
 import { getLocale } from '../utils/getLocale.js';
+import { localize } from '../singleton.js';
 import { normalizeIntlDate } from './utils/normalizeIntlDate.js';
 
 /** @typedef {import('../../types/LocalizeMixinTypes').DatePostProcessor} DatePostProcessor */
diff --git a/packages/localize/src/date/getDateFormatBasedOnLocale.js b/packages/ui/src/localize/date/getDateFormatBasedOnLocale.js
similarity index 100%
rename from packages/localize/src/date/getDateFormatBasedOnLocale.js
rename to packages/ui/src/localize/date/getDateFormatBasedOnLocale.js
diff --git a/packages/localize/src/date/getMonthNames.js b/packages/ui/src/localize/date/getMonthNames.js
similarity index 100%
rename from packages/localize/src/date/getMonthNames.js
rename to packages/ui/src/localize/date/getMonthNames.js
diff --git a/packages/localize/src/date/getWeekdayNames.js b/packages/ui/src/localize/date/getWeekdayNames.js
similarity index 100%
rename from packages/localize/src/date/getWeekdayNames.js
rename to packages/ui/src/localize/date/getWeekdayNames.js
diff --git a/packages/localize/src/date/normalizeDateTime.js b/packages/ui/src/localize/date/normalizeDateTime.js
similarity index 100%
rename from packages/localize/src/date/normalizeDateTime.js
rename to packages/ui/src/localize/date/normalizeDateTime.js
diff --git a/packages/localize/src/date/parseDate.js b/packages/ui/src/localize/date/parseDate.js
similarity index 97%
rename from packages/localize/src/date/parseDate.js
rename to packages/ui/src/localize/date/parseDate.js
index 228534733..76c084e5e 100644
--- a/packages/localize/src/date/parseDate.js
+++ b/packages/ui/src/localize/date/parseDate.js
@@ -1,5 +1,5 @@
-import { localize } from '../localize.js';
 import { getDateFormatBasedOnLocale } from './getDateFormatBasedOnLocale.js';
+import { localize } from '../singleton.js';
 import { addLeadingZero } from './utils/addLeadingZero.js';
 
 /**
diff --git a/packages/localize/src/date/utils/addLeadingZero.js b/packages/ui/src/localize/date/utils/addLeadingZero.js
similarity index 100%
rename from packages/localize/src/date/utils/addLeadingZero.js
rename to packages/ui/src/localize/date/utils/addLeadingZero.js
diff --git a/packages/localize/src/date/utils/clean.js b/packages/ui/src/localize/date/utils/clean.js
similarity index 100%
rename from packages/localize/src/date/utils/clean.js
rename to packages/ui/src/localize/date/utils/clean.js
diff --git a/packages/localize/src/date/utils/forceShortMonthNamesForEnGb.js b/packages/ui/src/localize/date/utils/forceShortMonthNamesForEnGb.js
similarity index 100%
rename from packages/localize/src/date/utils/forceShortMonthNamesForEnGb.js
rename to packages/ui/src/localize/date/utils/forceShortMonthNamesForEnGb.js
diff --git a/packages/localize/src/date/utils/normalizeIntlDate.js b/packages/ui/src/localize/date/utils/normalizeIntlDate.js
similarity index 100%
rename from packages/localize/src/date/utils/normalizeIntlDate.js
rename to packages/ui/src/localize/date/utils/normalizeIntlDate.js
diff --git a/packages/localize/src/date/utils/pad.js b/packages/ui/src/localize/date/utils/pad.js
similarity index 100%
rename from packages/localize/src/date/utils/pad.js
rename to packages/ui/src/localize/date/utils/pad.js
diff --git a/packages/localize/src/date/utils/sanitizedDateTimeFormat.js b/packages/ui/src/localize/date/utils/sanitizedDateTimeFormat.js
similarity index 100%
rename from packages/localize/src/date/utils/sanitizedDateTimeFormat.js
rename to packages/ui/src/localize/date/utils/sanitizedDateTimeFormat.js
diff --git a/packages/localize/src/date/utils/splitDate.js b/packages/ui/src/localize/date/utils/splitDate.js
similarity index 100%
rename from packages/localize/src/date/utils/splitDate.js
rename to packages/ui/src/localize/date/utils/splitDate.js
diff --git a/packages/localize/src/date/utils/trim.js b/packages/ui/src/localize/date/utils/trim.js
similarity index 100%
rename from packages/localize/src/date/utils/trim.js
rename to packages/ui/src/localize/date/utils/trim.js
diff --git a/packages/localize/src/isLocalizeESModule.js b/packages/ui/src/localize/isLocalizeESModule.js
similarity index 100%
rename from packages/localize/src/isLocalizeESModule.js
rename to packages/ui/src/localize/isLocalizeESModule.js
diff --git a/packages/localize/src/number/formatNumber.js b/packages/ui/src/localize/number/formatNumber.js
similarity index 97%
rename from packages/localize/src/number/formatNumber.js
rename to packages/ui/src/localize/number/formatNumber.js
index a80da0958..967a4cdb3 100644
--- a/packages/localize/src/number/formatNumber.js
+++ b/packages/ui/src/localize/number/formatNumber.js
@@ -1,9 +1,9 @@
-import { localize } from '../localize.js';
+/** @typedef {import('../../types/LocalizeMixinTypes').NumberPostProcessor} NumberPostProcessor */
+
+import { localize } from '../singleton.js';
 import { getLocale } from '../utils/getLocale.js';
 import { formatNumberToParts } from './formatNumberToParts.js';
 
-/** @typedef {import('../../types/LocalizeMixinTypes').NumberPostProcessor} NumberPostProcessor */
-
 /**
  * Formats a number based on locale and options. It uses Intl for the formatting.
  *
diff --git a/packages/localize/src/number/formatNumberToParts.js b/packages/ui/src/localize/number/formatNumberToParts.js
similarity index 100%
rename from packages/localize/src/number/formatNumberToParts.js
rename to packages/ui/src/localize/number/formatNumberToParts.js
diff --git a/packages/localize/src/number/getCurrencyName.js b/packages/ui/src/localize/number/getCurrencyName.js
similarity index 96%
rename from packages/localize/src/number/getCurrencyName.js
rename to packages/ui/src/localize/number/getCurrencyName.js
index fb04bb6b7..3ac18ffd0 100644
--- a/packages/localize/src/number/getCurrencyName.js
+++ b/packages/ui/src/localize/number/getCurrencyName.js
@@ -1,5 +1,5 @@
+import { localize } from '../singleton.js';
 import { formatNumberToParts } from './formatNumberToParts.js';
-import { localize } from '../localize.js';
 import { forceCurrencyNameForPHPEnGB } from './utils/normalize-get-currency-name/forceCurrencyNameForPHPEnGB.js';
 
 /**
diff --git a/packages/localize/src/number/getDecimalSeparator.js b/packages/ui/src/localize/number/getDecimalSeparator.js
similarity index 100%
rename from packages/localize/src/number/getDecimalSeparator.js
rename to packages/ui/src/localize/number/getDecimalSeparator.js
diff --git a/packages/localize/src/number/getFractionDigits.js b/packages/ui/src/localize/number/getFractionDigits.js
similarity index 100%
rename from packages/localize/src/number/getFractionDigits.js
rename to packages/ui/src/localize/number/getFractionDigits.js
diff --git a/packages/localize/src/number/getGroupSeparator.js b/packages/ui/src/localize/number/getGroupSeparator.js
similarity index 100%
rename from packages/localize/src/number/getGroupSeparator.js
rename to packages/ui/src/localize/number/getGroupSeparator.js
diff --git a/packages/localize/src/number/getSeparatorsFromNumber.js b/packages/ui/src/localize/number/getSeparatorsFromNumber.js
similarity index 100%
rename from packages/localize/src/number/getSeparatorsFromNumber.js
rename to packages/ui/src/localize/number/getSeparatorsFromNumber.js
diff --git a/packages/localize/src/number/normalizeCurrencyLabel.js b/packages/ui/src/localize/number/normalizeCurrencyLabel.js
similarity index 100%
rename from packages/localize/src/number/normalizeCurrencyLabel.js
rename to packages/ui/src/localize/number/normalizeCurrencyLabel.js
diff --git a/packages/localize/src/number/parseNumber.js b/packages/ui/src/localize/number/parseNumber.js
similarity index 100%
rename from packages/localize/src/number/parseNumber.js
rename to packages/ui/src/localize/number/parseNumber.js
diff --git a/packages/localize/src/number/utils/emptyStringWhenNumberNan.js b/packages/ui/src/localize/number/utils/emptyStringWhenNumberNan.js
similarity index 85%
rename from packages/localize/src/number/utils/emptyStringWhenNumberNan.js
rename to packages/ui/src/localize/number/utils/emptyStringWhenNumberNan.js
index 1d20fb4a1..598c35a07 100644
--- a/packages/localize/src/number/utils/emptyStringWhenNumberNan.js
+++ b/packages/ui/src/localize/number/utils/emptyStringWhenNumberNan.js
@@ -1,4 +1,4 @@
-import { localize } from '../../localize.js';
+import { localize } from '../../singleton.js';
 
 /**
  * When number is NaN we should return an empty string or returnIfNaN param
diff --git a/packages/localize/src/number/utils/normalSpaces.js b/packages/ui/src/localize/number/utils/normalSpaces.js
similarity index 100%
rename from packages/localize/src/number/utils/normalSpaces.js
rename to packages/ui/src/localize/number/utils/normalSpaces.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceAddGroupSeparators.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceAddGroupSeparators.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceAddGroupSeparators.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceAddGroupSeparators.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceCurrencyToEnd.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceCurrencyToEnd.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceCurrencyToEnd.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceCurrencyToEnd.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceENAUSymbols.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceENAUSymbols.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceENAUSymbols.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceENAUSymbols.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceNormalSpaces.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceNormalSpaces.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceNormalSpaces.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceNormalSpaces.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceSpaceBetweenCurrencyCodeAndNumber.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceSpaceBetweenCurrencyCodeAndNumber.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceSpaceBetweenCurrencyCodeAndNumber.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceSpaceBetweenCurrencyCodeAndNumber.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceSpaceInsteadOfZeroForGroup.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceSpaceInsteadOfZeroForGroup.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceSpaceInsteadOfZeroForGroup.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceSpaceInsteadOfZeroForGroup.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceTryCurrencyCode.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceTryCurrencyCode.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceTryCurrencyCode.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceTryCurrencyCode.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/forceYenSymbol.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceYenSymbol.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/forceYenSymbol.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/forceYenSymbol.js
diff --git a/packages/localize/src/number/utils/normalize-format-number-to-parts/normalizeIntl.js b/packages/ui/src/localize/number/utils/normalize-format-number-to-parts/normalizeIntl.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-format-number-to-parts/normalizeIntl.js
rename to packages/ui/src/localize/number/utils/normalize-format-number-to-parts/normalizeIntl.js
diff --git a/packages/localize/src/number/utils/normalize-get-currency-name/forceCurrencyNameForPHPEnGB.js b/packages/ui/src/localize/number/utils/normalize-get-currency-name/forceCurrencyNameForPHPEnGB.js
similarity index 100%
rename from packages/localize/src/number/utils/normalize-get-currency-name/forceCurrencyNameForPHPEnGB.js
rename to packages/ui/src/localize/number/utils/normalize-get-currency-name/forceCurrencyNameForPHPEnGB.js
diff --git a/packages/localize/src/localize.js b/packages/ui/src/localize/singleton.js
similarity index 94%
rename from packages/localize/src/localize.js
rename to packages/ui/src/localize/singleton.js
index ba8e522a6..e3bacd6df 100644
--- a/packages/localize/src/localize.js
+++ b/packages/ui/src/localize/singleton.js
@@ -17,3 +17,5 @@ export function setLocalize(newLocalize) {
   localize.teardown();
   localize = newLocalize;
 }
+
+export { LocalizeManager };
diff --git a/packages/localize/test-helpers/fake-imports.js b/packages/ui/src/localize/test-helpers/fake-imports.js
similarity index 100%
rename from packages/localize/test-helpers/fake-imports.js
rename to packages/ui/src/localize/test-helpers/fake-imports.js
diff --git a/packages/localize/test-helpers/localizeTearDown.js b/packages/ui/src/localize/test-helpers/localizeTearDown.js
similarity index 86%
rename from packages/localize/test-helpers/localizeTearDown.js
rename to packages/ui/src/localize/test-helpers/localizeTearDown.js
index cf37b1c14..573bffbf8 100644
--- a/packages/localize/test-helpers/localizeTearDown.js
+++ b/packages/ui/src/localize/test-helpers/localizeTearDown.js
@@ -1,4 +1,4 @@
-import { localize } from '../src/localize.js';
+import { localize } from '@lion/ui/localize.js';
 
 export const localizeTearDown = () => {
   // makes sure that between tests the localization is reset to default state
diff --git a/packages/localize/test/LocalizeManager.test.js b/packages/ui/src/localize/test/LocalizeManager.test.js
similarity index 99%
rename from packages/localize/test/LocalizeManager.test.js
rename to packages/ui/src/localize/test/LocalizeManager.test.js
index decd6f54c..57611565b 100644
--- a/packages/localize/test/LocalizeManager.test.js
+++ b/packages/ui/src/localize/test/LocalizeManager.test.js
@@ -2,9 +2,9 @@ import { expect, oneEvent, aTimeout } from '@open-wc/testing';
 import sinon from 'sinon';
 // @ts-expect-error no types for this package
 import { fetchMock } from '@bundled-es-modules/fetch-mock';
-import { setupFakeImport, resetFakeImport, fakeImport } from '../test-helpers/index.js';
+import { setupFakeImport, resetFakeImport, fakeImport } from '@lion/ui/localize-test-helpers.js';
 
-import { LocalizeManager } from '../src/LocalizeManager.js';
+import { LocalizeManager } from '@lion/ui/localize.js';
 
 /**
  * @param {LocalizeManager} localizeManagerEl
diff --git a/packages/localize/test/LocalizeMixin.test.js b/packages/ui/src/localize/test/LocalizeMixin.test.js
similarity index 98%
rename from packages/localize/test/LocalizeMixin.test.js
rename to packages/ui/src/localize/test/LocalizeMixin.test.js
index 7a1753ba0..6caa13c03 100644
--- a/packages/localize/test/LocalizeMixin.test.js
+++ b/packages/ui/src/localize/test/LocalizeMixin.test.js
@@ -1,4 +1,6 @@
-import { isDirectiveResult, LitElement } from '@lion/core';
+import { LitElement } from 'lit';
+import { isDirectiveResult } from 'lit/directive-helpers.js';
+
 import {
   aTimeout,
   defineCE,
@@ -10,15 +12,14 @@ import {
   unsafeStatic,
 } from '@open-wc/testing';
 import sinon from 'sinon';
-import { localize } from '../src/localize.js';
-import { LocalizeMixin } from '../src/LocalizeMixin.js';
+import { localize, LocalizeMixin } from '@lion/ui/localize.js';
 import {
   fakeImport,
   localizeTearDown,
   resetFakeImport,
   setupEmptyFakeImportsFor,
   setupFakeImport,
-} from '../test-helpers/index.js';
+} from '@lion/ui/localize-test-helpers.js';
 
 /**
  * @typedef {import('../types/LocalizeMixinTypes').LocalizeMixin} LocalizeMixinHost
diff --git a/packages/localize/test/date/formatDate.test.js b/packages/ui/src/localize/test/date/formatDate.test.js
similarity index 97%
rename from packages/localize/test/date/formatDate.test.js
rename to packages/ui/src/localize/test/date/formatDate.test.js
index fef92ef11..8d06269ef 100644
--- a/packages/localize/test/date/formatDate.test.js
+++ b/packages/ui/src/localize/test/date/formatDate.test.js
@@ -1,9 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '../../src/localize.js';
-import { localizeTearDown } from '../../test-helpers/index.js';
-
-import { formatDate } from '../../src/date/formatDate.js';
-import { parseDate } from '../../src/date/parseDate.js';
+import { localize, formatDate, parseDate } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 const SUPPORTED_LOCALES = {
   'bg-BG': 'Bulgarian',
diff --git a/packages/localize/test/date/getDateFormatBasedOnLocale.test.js b/packages/ui/src/localize/test/date/getDateFormatBasedOnLocale.test.js
similarity index 67%
rename from packages/localize/test/date/getDateFormatBasedOnLocale.test.js
rename to packages/ui/src/localize/test/date/getDateFormatBasedOnLocale.test.js
index d03d70d6d..579366da3 100644
--- a/packages/localize/test/date/getDateFormatBasedOnLocale.test.js
+++ b/packages/ui/src/localize/test/date/getDateFormatBasedOnLocale.test.js
@@ -1,8 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '../../src/localize.js';
-import { localizeTearDown } from '../../test-helpers/index.js';
-
-import { getDateFormatBasedOnLocale } from '../../src/date/getDateFormatBasedOnLocale.js';
+import { localize, getDateFormatBasedOnLocale } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 describe('getDateFormatBasedOnLocale()', () => {
   beforeEach(() => {
diff --git a/packages/localize/test/date/getMonthNames.test.js b/packages/ui/src/localize/test/date/getMonthNames.test.js
similarity index 95%
rename from packages/localize/test/date/getMonthNames.test.js
rename to packages/ui/src/localize/test/date/getMonthNames.test.js
index 272ff2b40..ffcacd043 100644
--- a/packages/localize/test/date/getMonthNames.test.js
+++ b/packages/ui/src/localize/test/date/getMonthNames.test.js
@@ -1,6 +1,5 @@
 import { expect } from '@open-wc/testing';
-
-import { getMonthNames } from '../../src/date/getMonthNames.js';
+import { getMonthNames } from '@lion/ui/localize.js';
 
 /**
  * @param {TemplateStringsArray} strings
diff --git a/packages/localize/test/date/getWeekdayNames.test.js b/packages/ui/src/localize/test/date/getWeekdayNames.test.js
similarity index 97%
rename from packages/localize/test/date/getWeekdayNames.test.js
rename to packages/ui/src/localize/test/date/getWeekdayNames.test.js
index 3d8ffeecb..22d8c97c9 100644
--- a/packages/localize/test/date/getWeekdayNames.test.js
+++ b/packages/ui/src/localize/test/date/getWeekdayNames.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { getWeekdayNames } from '../../src/date/getWeekdayNames.js';
+import { getWeekdayNames } from '@lion/ui/localize.js';
 
 /**
  * @param {TemplateStringsArray} strings
diff --git a/packages/localize/test/date/normalizeDateTime.test.js b/packages/ui/src/localize/test/date/normalizeDateTime.test.js
similarity index 87%
rename from packages/localize/test/date/normalizeDateTime.test.js
rename to packages/ui/src/localize/test/date/normalizeDateTime.test.js
index 4578334c8..ef8929d31 100644
--- a/packages/localize/test/date/normalizeDateTime.test.js
+++ b/packages/ui/src/localize/test/date/normalizeDateTime.test.js
@@ -1,5 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { normalizeDateTime } from '../../src/date/normalizeDateTime.js';
+import { normalizeDateTime } from '@lion/ui/localize.js';
 
 describe('normalizeDateTime', () => {
   it('returns a date with hours, minutes and seconds set to 0', () => {
diff --git a/packages/localize/test/date/parseDate.test.js b/packages/ui/src/localize/test/date/parseDate.test.js
similarity index 93%
rename from packages/localize/test/date/parseDate.test.js
rename to packages/ui/src/localize/test/date/parseDate.test.js
index bab10866c..05436f802 100644
--- a/packages/localize/test/date/parseDate.test.js
+++ b/packages/ui/src/localize/test/date/parseDate.test.js
@@ -1,7 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { parseDate } from '../../src/date/parseDate.js';
-import { localizeTearDown } from '../../test-helpers/index.js';
-import { localize } from '../../src/localize.js';
+import { parseDate, localize } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 /**
  *
diff --git a/packages/localize/test/isLocalizeESModule.test.js b/packages/ui/src/localize/test/isLocalizeESModule.test.js
similarity index 95%
rename from packages/localize/test/isLocalizeESModule.test.js
rename to packages/ui/src/localize/test/isLocalizeESModule.test.js
index 63990ec11..d87201382 100644
--- a/packages/localize/test/isLocalizeESModule.test.js
+++ b/packages/ui/src/localize/test/isLocalizeESModule.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import isLocalizeESModule from '../src/isLocalizeESModule.js';
+import isLocalizeESModule from '../isLocalizeESModule.js';
 
 describe('isLocalizeESModule', () => {
   it('detects a module by finding the "default" key containing an object', () => {
diff --git a/packages/localize/test/localize.test.js b/packages/ui/src/localize/test/localize.test.js
similarity index 93%
rename from packages/localize/test/localize.test.js
rename to packages/ui/src/localize/test/localize.test.js
index f97dd8f85..bf2b381bb 100644
--- a/packages/localize/test/localize.test.js
+++ b/packages/ui/src/localize/test/localize.test.js
@@ -1,8 +1,7 @@
 import { expect } from '@open-wc/testing';
 import sinon from 'sinon';
-import { LocalizeManager } from '../src/LocalizeManager.js';
 
-import { localize, setLocalize } from '../src/localize.js';
+import { localize, setLocalize, LocalizeManager } from '@lion/ui/localize.js';
 
 /**
  * @param {LocalizeManager} localizeManagerEl
diff --git a/packages/localize/test/number/formatNumber.test.js b/packages/ui/src/localize/test/number/formatNumber.test.js
similarity index 99%
rename from packages/localize/test/number/formatNumber.test.js
rename to packages/ui/src/localize/test/number/formatNumber.test.js
index c68bfab16..f70591183 100644
--- a/packages/localize/test/number/formatNumber.test.js
+++ b/packages/ui/src/localize/test/number/formatNumber.test.js
@@ -1,7 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '../../src/localize.js';
-import { formatNumber } from '../../src/number/formatNumber.js';
-import { localizeTearDown } from '../../test-helpers/index.js';
+import { localize, formatNumber } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 // TODO: This is broken only in Safari 13.1.2 Wait till ci is on 13.1.3 and remove
 const isSafari = (() => {
diff --git a/packages/localize/test/number/formatNumberToParts.test.js b/packages/ui/src/localize/test/number/formatNumberToParts.test.js
similarity index 97%
rename from packages/localize/test/number/formatNumberToParts.test.js
rename to packages/ui/src/localize/test/number/formatNumberToParts.test.js
index 2293704c4..cb90f1562 100644
--- a/packages/localize/test/number/formatNumberToParts.test.js
+++ b/packages/ui/src/localize/test/number/formatNumberToParts.test.js
@@ -1,7 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '../../src/localize.js';
-import { localizeTearDown } from '../../test-helpers/index.js';
-import { formatNumberToParts } from '../../src/number/formatNumberToParts.js';
+import { localize, formatNumberToParts } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 // TODO: This is broken only in Safari 13.1.2 Wait till ci is on 13.1.3 and remove
 const isSafari = (() => {
diff --git a/packages/localize/test/number/getCurrencyName.test.js b/packages/ui/src/localize/test/number/getCurrencyName.test.js
similarity index 78%
rename from packages/localize/test/number/getCurrencyName.test.js
rename to packages/ui/src/localize/test/number/getCurrencyName.test.js
index b43aafbcc..4181fed97 100644
--- a/packages/localize/test/number/getCurrencyName.test.js
+++ b/packages/ui/src/localize/test/number/getCurrencyName.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
-import { localizeTearDown } from '../../test-helpers/localizeTearDown.js';
-import { getCurrencyName } from '../../src/number/getCurrencyName.js';
+import { getCurrencyName } from '@lion/ui/localize.js';
+import { localizeTearDown } from '@lion/ui/localize-test-helpers.js';
 
 describe('getCurrencyName', () => {
   afterEach(localizeTearDown);
diff --git a/packages/localize/test/number/getDecimalSeparator.test.js b/packages/ui/src/localize/test/number/getDecimalSeparator.test.js
similarity index 87%
rename from packages/localize/test/number/getDecimalSeparator.test.js
rename to packages/ui/src/localize/test/number/getDecimalSeparator.test.js
index 025bef2a2..7a789962e 100644
--- a/packages/localize/test/number/getDecimalSeparator.test.js
+++ b/packages/ui/src/localize/test/number/getDecimalSeparator.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { getDecimalSeparator } from '../../src/number/getDecimalSeparator.js';
+import { getDecimalSeparator } from '@lion/ui/localize.js';
 
 describe('getDecimalSeparator', () => {
   it('returns decimal separator for locale', () => {
diff --git a/packages/localize/test/number/getFractionDigits.test.js b/packages/ui/src/localize/test/number/getFractionDigits.test.js
similarity index 80%
rename from packages/localize/test/number/getFractionDigits.test.js
rename to packages/ui/src/localize/test/number/getFractionDigits.test.js
index 87599a5d1..7ab830a25 100644
--- a/packages/localize/test/number/getFractionDigits.test.js
+++ b/packages/ui/src/localize/test/number/getFractionDigits.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { getFractionDigits } from '../../src/number/getFractionDigits.js';
+import { getFractionDigits } from '@lion/ui/localize.js';
 
 describe('getFractionDigits', () => {
   it('returns number of fraction digits for currency', () => {
diff --git a/packages/localize/test/number/getGroupSeparator.test.js b/packages/ui/src/localize/test/number/getGroupSeparator.test.js
similarity index 84%
rename from packages/localize/test/number/getGroupSeparator.test.js
rename to packages/ui/src/localize/test/number/getGroupSeparator.test.js
index d04d142f3..8b1269468 100644
--- a/packages/localize/test/number/getGroupSeparator.test.js
+++ b/packages/ui/src/localize/test/number/getGroupSeparator.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { getGroupSeparator } from '../../src/number/getGroupSeparator.js';
+import { getGroupSeparator } from '@lion/ui/localize.js';
 
 describe('getGroupSeparator', () => {
   it('returns group separator for locale', () => {
diff --git a/packages/localize/test/number/getSeparatorsFromNumber.test.js b/packages/ui/src/localize/test/number/getSeparatorsFromNumber.test.js
similarity index 94%
rename from packages/localize/test/number/getSeparatorsFromNumber.test.js
rename to packages/ui/src/localize/test/number/getSeparatorsFromNumber.test.js
index 3a5eebc55..3e90760f9 100644
--- a/packages/localize/test/number/getSeparatorsFromNumber.test.js
+++ b/packages/ui/src/localize/test/number/getSeparatorsFromNumber.test.js
@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing';
 
-import { getSeparatorsFromNumber } from '../../src/number/getSeparatorsFromNumber.js';
+import { getSeparatorsFromNumber } from '@lion/ui/localize.js';
 
 describe('getSeparatorsFromNumber', () => {
   it('returns group separator for locale', () => {
diff --git a/packages/localize/test/number/parseNumber.test.js b/packages/ui/src/localize/test/number/parseNumber.test.js
similarity index 98%
rename from packages/localize/test/number/parseNumber.test.js
rename to packages/ui/src/localize/test/number/parseNumber.test.js
index 76d850670..29239d022 100644
--- a/packages/localize/test/number/parseNumber.test.js
+++ b/packages/ui/src/localize/test/number/parseNumber.test.js
@@ -1,7 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { localize } from '@lion/localize';
-
-import { parseNumber } from '../../src/number/parseNumber.js';
+import { localize, parseNumber } from '@lion/ui/localize.js';
 
 describe('parseNumber()', () => {
   it('parses integers', () => {
diff --git a/packages/localize/test/test-esmodule-default.js b/packages/ui/src/localize/test/test-esmodule-default.js
similarity index 100%
rename from packages/localize/test/test-esmodule-default.js
rename to packages/ui/src/localize/test/test-esmodule-default.js
diff --git a/packages/localize/types/LocalizeMixinTypes.d.ts b/packages/ui/src/localize/types/LocalizeMixinTypes.d.ts
similarity index 98%
rename from packages/localize/types/LocalizeMixinTypes.d.ts
rename to packages/ui/src/localize/types/LocalizeMixinTypes.d.ts
index adfd58c80..f74a9f75f 100644
--- a/packages/localize/types/LocalizeMixinTypes.d.ts
+++ b/packages/ui/src/localize/types/LocalizeMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 
 export interface FormatNumberPart {
   type: string;
diff --git a/packages/localize/types/index.d.ts b/packages/ui/src/localize/types/index.d.ts
similarity index 100%
rename from packages/localize/types/index.d.ts
rename to packages/ui/src/localize/types/index.d.ts
diff --git a/packages/localize/src/utils/getLocale.js b/packages/ui/src/localize/utils/getLocale.js
similarity index 86%
rename from packages/localize/src/utils/getLocale.js
rename to packages/ui/src/localize/utils/getLocale.js
index 0725d2f8d..737b46e69 100644
--- a/packages/localize/src/utils/getLocale.js
+++ b/packages/ui/src/localize/utils/getLocale.js
@@ -1,4 +1,4 @@
-import { localize } from '../localize.js';
+import { localize } from '../singleton.js';
 
 /**
  * Gets the locale to use
diff --git a/packages/overlays/src/ArrowMixin.js b/packages/ui/src/overlays/ArrowMixin.js
similarity index 98%
rename from packages/overlays/src/ArrowMixin.js
rename to packages/ui/src/overlays/ArrowMixin.js
index 4636ecf34..1839156ff 100644
--- a/packages/overlays/src/ArrowMixin.js
+++ b/packages/ui/src/overlays/ArrowMixin.js
@@ -1,4 +1,5 @@
-import { css, html, dedupeMixin } from '@lion/core';
+import { css, html } from 'lit';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { OverlayMixin } from './OverlayMixin.js';
 
 /**
diff --git a/packages/overlays/src/OverlayController.js b/packages/ui/src/overlays/OverlayController.js
similarity index 99%
rename from packages/overlays/src/OverlayController.js
rename to packages/ui/src/overlays/OverlayController.js
index 837816b5c..fbd36ba0e 100644
--- a/packages/overlays/src/OverlayController.js
+++ b/packages/ui/src/overlays/OverlayController.js
@@ -1,6 +1,5 @@
-import { EventTargetShim } from '@lion/core';
-// eslint-disable-next-line import/no-cycle
-import { overlays } from './overlays.js';
+import { EventTargetShim } from '@lion/ui/core.js';
+import { overlays } from './singleton.js';
 import { containFocus } from './utils/contain-focus.js';
 
 /**
@@ -17,7 +16,7 @@ import { containFocus } from './utils/contain-focus.js';
  * @returns {Promise<PopperModule>}
  */
 async function preloadPopper() {
-  // @ts-ignore [external]: import complains about untyped module, but we typecast it ourselves
+  // eslint-disable-next-line import/no-extraneous-dependencies -- [external]: import complains about untyped module, but we typecast it ourselves
   return /** @type {* & Promise<PopperModule>} */ (import('@popperjs/core/dist/esm/popper.js'));
 }
 
diff --git a/packages/overlays/src/OverlayMixin.js b/packages/ui/src/overlays/OverlayMixin.js
similarity index 99%
rename from packages/overlays/src/OverlayMixin.js
rename to packages/ui/src/overlays/OverlayMixin.js
index 65224fdcb..5718768c0 100644
--- a/packages/overlays/src/OverlayMixin.js
+++ b/packages/ui/src/overlays/OverlayMixin.js
@@ -1,4 +1,4 @@
-import { dedupeMixin } from '@lion/core';
+import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { OverlayController } from './OverlayController.js';
 import { isEqualConfig } from './utils/is-equal-config.js';
 
diff --git a/packages/overlays/src/OverlaysManager.js b/packages/ui/src/overlays/OverlaysManager.js
similarity index 99%
rename from packages/overlays/src/OverlaysManager.js
rename to packages/ui/src/overlays/OverlaysManager.js
index 5409e0281..6e6cba5bb 100644
--- a/packages/overlays/src/OverlaysManager.js
+++ b/packages/ui/src/overlays/OverlaysManager.js
@@ -1,11 +1,11 @@
-import { unsetSiblingsInert, setSiblingsInert } from './utils/inert-siblings.js';
-import { globalOverlaysStyle } from './globalOverlaysStyle.js';
-
 /**
  * @typedef {import('@lion/core').CSSResult} CSSResult
  * @typedef {import('./OverlayController.js').OverlayController} OverlayController
  */
 
+import { globalOverlaysStyle } from './globalOverlaysStyle.js';
+import { setSiblingsInert, unsetSiblingsInert } from './utils/inert-siblings.js';
+
 const isIOS = navigator.userAgent.match(/iPhone|iPad|iPod/i);
 
 /**
diff --git a/packages/overlays/src/configurations/withBottomSheetConfig.js b/packages/ui/src/overlays/configurations/withBottomSheetConfig.js
similarity index 100%
rename from packages/overlays/src/configurations/withBottomSheetConfig.js
rename to packages/ui/src/overlays/configurations/withBottomSheetConfig.js
diff --git a/packages/overlays/src/configurations/withDropdownConfig.js b/packages/ui/src/overlays/configurations/withDropdownConfig.js
similarity index 100%
rename from packages/overlays/src/configurations/withDropdownConfig.js
rename to packages/ui/src/overlays/configurations/withDropdownConfig.js
diff --git a/packages/overlays/src/configurations/withModalDialogConfig.js b/packages/ui/src/overlays/configurations/withModalDialogConfig.js
similarity index 100%
rename from packages/overlays/src/configurations/withModalDialogConfig.js
rename to packages/ui/src/overlays/configurations/withModalDialogConfig.js
diff --git a/packages/overlays/src/globalOverlaysStyle.js b/packages/ui/src/overlays/globalOverlaysStyle.js
similarity index 98%
rename from packages/overlays/src/globalOverlaysStyle.js
rename to packages/ui/src/overlays/globalOverlaysStyle.js
index 8ce5a312c..82145ecf6 100644
--- a/packages/overlays/src/globalOverlaysStyle.js
+++ b/packages/ui/src/overlays/globalOverlaysStyle.js
@@ -1,4 +1,4 @@
-import { css } from '@lion/core';
+import { css } from 'lit';
 
 export const globalOverlaysStyle = css`
   .global-overlays {
diff --git a/packages/overlays/src/overlays.js b/packages/ui/src/overlays/singleton.js
similarity index 100%
rename from packages/overlays/src/overlays.js
rename to packages/ui/src/overlays/singleton.js
diff --git a/packages/overlays/test-helpers/mimicClick.js b/packages/ui/src/overlays/test-helpers/mimicClick.js
similarity index 100%
rename from packages/overlays/test-helpers/mimicClick.js
rename to packages/ui/src/overlays/test-helpers/mimicClick.js
diff --git a/packages/overlays/test-suites/OverlayMixin.suite.js b/packages/ui/src/overlays/test-suites/OverlayMixin.suite.js
similarity index 99%
rename from packages/overlays/test-suites/OverlayMixin.suite.js
rename to packages/ui/src/overlays/test-suites/OverlayMixin.suite.js
index 4ae6508c9..320333936 100644
--- a/packages/overlays/test-suites/OverlayMixin.suite.js
+++ b/packages/ui/src/overlays/test-suites/OverlayMixin.suite.js
@@ -1,8 +1,9 @@
 import { expect, fixture, html, nextFrame, aTimeout } from '@open-wc/testing';
 
 import sinon from 'sinon';
-import { overlays } from '../src/overlays.js';
-import { OverlayController } from '../src/OverlayController.js';
+import { overlays, OverlayController } from '@lion/ui/overlays.js';
+
+import '@lion/ui/define/lion-dialog.js';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/packages/overlays/test-suites/index.js b/packages/ui/src/overlays/test-suites/index.js
similarity index 100%
rename from packages/overlays/test-suites/index.js
rename to packages/ui/src/overlays/test-suites/index.js
diff --git a/packages/overlays/test/ArrowMixin.test.js b/packages/ui/src/overlays/test/ArrowMixin.test.js
similarity index 97%
rename from packages/overlays/test/ArrowMixin.test.js
rename to packages/ui/src/overlays/test/ArrowMixin.test.js
index ee97ba46b..889d77670 100644
--- a/packages/overlays/test/ArrowMixin.test.js
+++ b/packages/ui/src/overlays/test/ArrowMixin.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture } from '@open-wc/testing';
-import { LitElement, html } from '@lion/core';
-import { ArrowMixin, OverlayMixin } from '../index.js';
+import { LitElement, html } from 'lit';
+import { ArrowMixin, OverlayMixin } from '@lion/ui/overlays.js';
 
 describe('ArrowMixin', () => {
   class ArrowTest extends ArrowMixin(OverlayMixin(LitElement)) {
diff --git a/packages/overlays/test/OverlayController.test.js b/packages/ui/src/overlays/test/OverlayController.test.js
similarity index 99%
rename from packages/overlays/test/OverlayController.test.js
rename to packages/ui/src/overlays/test/OverlayController.test.js
index de1f4e41e..ff954ff61 100644
--- a/packages/overlays/test/OverlayController.test.js
+++ b/packages/ui/src/overlays/test/OverlayController.test.js
@@ -2,11 +2,11 @@
 import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { fixtureSync } from '@open-wc/testing-helpers';
 import sinon from 'sinon';
-import { OverlayController } from '../src/OverlayController.js';
-import { overlays } from '../src/overlays.js';
-import { keyCodes } from '../src/utils/key-codes.js';
-import { simulateTab } from '../src/utils/simulate-tab.js';
-import { mimicClick } from '../test-helpers/index.js';
+import { OverlayController, overlays } from '@lion/ui/overlays.js';
+import { mimicClick } from '@lion/ui/overlays-test-helpers.js';
+
+import { keyCodes } from '../utils/key-codes.js';
+import { simulateTab } from '../utils/simulate-tab.js';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/packages/overlays/test/OverlayMixin.test.js b/packages/ui/src/overlays/test/OverlayMixin.test.js
similarity index 85%
rename from packages/overlays/test/OverlayMixin.test.js
rename to packages/ui/src/overlays/test/OverlayMixin.test.js
index 842b90e72..0232fac18 100644
--- a/packages/overlays/test/OverlayMixin.test.js
+++ b/packages/ui/src/overlays/test/OverlayMixin.test.js
@@ -1,7 +1,7 @@
 import { defineCE, unsafeStatic } from '@open-wc/testing';
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
+import { OverlayMixin } from '@lion/ui/overlays.js';
 import { runOverlayMixinSuite } from '../test-suites/OverlayMixin.suite.js';
-import { OverlayMixin } from '../src/OverlayMixin.js';
 
 const tagString = defineCE(
   class extends OverlayMixin(LitElement) {
diff --git a/packages/overlays/test/OverlaysManager.test.js b/packages/ui/src/overlays/test/OverlaysManager.test.js
similarity index 96%
rename from packages/overlays/test/OverlaysManager.test.js
rename to packages/ui/src/overlays/test/OverlaysManager.test.js
index 76a591961..7912568b5 100644
--- a/packages/overlays/test/OverlaysManager.test.js
+++ b/packages/ui/src/overlays/test/OverlaysManager.test.js
@@ -1,7 +1,6 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { OverlayController } from '../src/OverlayController.js';
-import { OverlaysManager } from '../src/OverlaysManager.js';
+import { OverlayController, OverlaysManager } from '@lion/ui/overlays.js';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/packages/overlays/test/global-positioning.test.js b/packages/ui/src/overlays/test/global-positioning.test.js
similarity index 94%
rename from packages/overlays/test/global-positioning.test.js
rename to packages/ui/src/overlays/test/global-positioning.test.js
index eabb547aa..93d6fc15e 100644
--- a/packages/overlays/test/global-positioning.test.js
+++ b/packages/ui/src/overlays/test/global-positioning.test.js
@@ -1,8 +1,7 @@
 import { expect } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import { fixtureSync } from '@open-wc/testing-helpers';
-import { OverlayController } from '../src/OverlayController.js';
-import { overlays } from '../src/overlays.js';
+import { OverlayController, overlays } from '@lion/ui/overlays.js';
 
 /**
  * @typedef {import('../types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/packages/overlays/test/local-positioning.test.js b/packages/ui/src/overlays/test/local-positioning.test.js
similarity index 99%
rename from packages/overlays/test/local-positioning.test.js
rename to packages/ui/src/overlays/test/local-positioning.test.js
index 0c46b8c81..80801608c 100644
--- a/packages/overlays/test/local-positioning.test.js
+++ b/packages/ui/src/overlays/test/local-positioning.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
 import { expect, fixture, fixtureSync } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { OverlayController } from '../src/OverlayController.js';
+import { OverlayController } from '@lion/ui/overlays.js';
 import { normalizeTransformStyle } from './utils-tests/local-positioning-helpers.js';
 
 /**
diff --git a/packages/overlays/test/utils-tests/active-element.test.js b/packages/ui/src/overlays/test/utils-tests/active-element.test.js
similarity index 95%
rename from packages/overlays/test/utils-tests/active-element.test.js
rename to packages/ui/src/overlays/test/utils-tests/active-element.test.js
index 6f341a16d..989fea8d5 100644
--- a/packages/overlays/test/utils-tests/active-element.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/active-element.test.js
@@ -1,7 +1,6 @@
 import { expect, fixture, defineCE } from '@open-wc/testing';
-import { LitElement, html } from '@lion/core';
-
-import { getDeepActiveElement } from '../../src/utils/get-deep-active-element.js';
+import { LitElement, html } from 'lit';
+import { getDeepActiveElement } from '@lion/ui/overlays.js';
 
 describe('getDeepActiveElement()', () => {
   it('handles document level active elements', async () => {
diff --git a/packages/overlays/test/utils-tests/contain-focus.test.js b/packages/ui/src/overlays/test/utils-tests/contain-focus.test.js
similarity index 96%
rename from packages/overlays/test/utils-tests/contain-focus.test.js
rename to packages/ui/src/overlays/test/utils-tests/contain-focus.test.js
index 0b08898ac..b7ab7af2e 100644
--- a/packages/overlays/test/utils-tests/contain-focus.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/contain-focus.test.js
@@ -1,11 +1,11 @@
 /* eslint-disable lit-a11y/no-autofocus */
 import { expect, fixture, nextFrame } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import { renderLitAsNode } from '@lion/helpers';
-import { getDeepActiveElement } from '../../src/utils/get-deep-active-element.js';
-import { getFocusableElements } from '../../src/utils/get-focusable-elements.js';
-import { keyCodes } from '../../src/utils/key-codes.js';
-import { containFocus } from '../../src/utils/contain-focus.js';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+import { getDeepActiveElement, getFocusableElements } from '@lion/ui/overlays.js';
+
+import { keyCodes } from '../../utils/key-codes.js';
+import { containFocus } from '../../utils/contain-focus.js';
 
 function simulateTabWithinContainFocus() {
   const event = new CustomEvent('keydown', { detail: 0, bubbles: true });
diff --git a/packages/overlays/test/utils-tests/deep-contains.test.js b/packages/ui/src/overlays/test/utils-tests/deep-contains.test.js
similarity index 98%
rename from packages/overlays/test/utils-tests/deep-contains.test.js
rename to packages/ui/src/overlays/test/utils-tests/deep-contains.test.js
index d87e1df56..abd349012 100644
--- a/packages/overlays/test/utils-tests/deep-contains.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/deep-contains.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture } from '@open-wc/testing';
-import { html } from '@lion/core';
+import { html } from 'lit';
 
-import { deepContains } from '../../src/utils/deep-contains.js';
+import { deepContains } from '@lion/ui/overlays.js';
 
 describe('deepContains()', () => {
   it('returns true if element contains a target element with a shadow boundary in between', async () => {
diff --git a/packages/overlays/test/utils-tests/get-focusable-elements.test.js b/packages/ui/src/overlays/test/utils-tests/get-focusable-elements.test.js
similarity index 97%
rename from packages/overlays/test/utils-tests/get-focusable-elements.test.js
rename to packages/ui/src/overlays/test/utils-tests/get-focusable-elements.test.js
index a66b0ba24..3791f3635 100644
--- a/packages/overlays/test/utils-tests/get-focusable-elements.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/get-focusable-elements.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture, defineCE } from '@open-wc/testing';
-import { LitElement, html } from '@lion/core';
+import { LitElement, html } from 'lit';
 
-import { getFocusableElements } from '../../src/utils/get-focusable-elements.js';
+import { getFocusableElements } from '@lion/ui/overlays.js';
 
 class ElementB extends LitElement {
   render() {
diff --git a/packages/overlays/test/utils-tests/is-equal-config.test.js b/packages/ui/src/overlays/test/utils-tests/is-equal-config.test.js
similarity index 97%
rename from packages/overlays/test/utils-tests/is-equal-config.test.js
rename to packages/ui/src/overlays/test/utils-tests/is-equal-config.test.js
index 8cca3d814..ac606d9f3 100644
--- a/packages/overlays/test/utils-tests/is-equal-config.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/is-equal-config.test.js
@@ -1,5 +1,5 @@
 import { expect } from '@open-wc/testing';
-import { isEqualConfig } from '../../src/utils/is-equal-config.js';
+import { isEqualConfig } from '../../utils/is-equal-config.js';
 
 function TestConfig() {
   return {
diff --git a/packages/overlays/test/utils-tests/local-positioning-helpers.js b/packages/ui/src/overlays/test/utils-tests/local-positioning-helpers.js
similarity index 100%
rename from packages/overlays/test/utils-tests/local-positioning-helpers.js
rename to packages/ui/src/overlays/test/utils-tests/local-positioning-helpers.js
diff --git a/packages/overlays/test/utils-tests/visibility.test.js b/packages/ui/src/overlays/test/utils-tests/visibility.test.js
similarity index 98%
rename from packages/overlays/test/utils-tests/visibility.test.js
rename to packages/ui/src/overlays/test/utils-tests/visibility.test.js
index 35fc06fb4..d8dfc86b0 100644
--- a/packages/overlays/test/utils-tests/visibility.test.js
+++ b/packages/ui/src/overlays/test/utils-tests/visibility.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture } from '@open-wc/testing';
 
-import { isVisible } from '../../src/utils/is-visible.js';
+import { isVisible } from '../../utils/is-visible.js';
 
 describe('isVisible()', () => {
   it('returns true for static block elements', async () => {
diff --git a/packages/overlays/translations/bg-BG.js b/packages/ui/src/overlays/translations/bg-BG.js
similarity index 100%
rename from packages/overlays/translations/bg-BG.js
rename to packages/ui/src/overlays/translations/bg-BG.js
diff --git a/packages/overlays/translations/bg.js b/packages/ui/src/overlays/translations/bg.js
similarity index 100%
rename from packages/overlays/translations/bg.js
rename to packages/ui/src/overlays/translations/bg.js
diff --git a/packages/overlays/translations/cs-CZ.js b/packages/ui/src/overlays/translations/cs-CZ.js
similarity index 100%
rename from packages/overlays/translations/cs-CZ.js
rename to packages/ui/src/overlays/translations/cs-CZ.js
diff --git a/packages/overlays/translations/cs.js b/packages/ui/src/overlays/translations/cs.js
similarity index 100%
rename from packages/overlays/translations/cs.js
rename to packages/ui/src/overlays/translations/cs.js
diff --git a/packages/overlays/translations/de-DE.js b/packages/ui/src/overlays/translations/de-DE.js
similarity index 100%
rename from packages/overlays/translations/de-DE.js
rename to packages/ui/src/overlays/translations/de-DE.js
diff --git a/packages/overlays/translations/de.js b/packages/ui/src/overlays/translations/de.js
similarity index 100%
rename from packages/overlays/translations/de.js
rename to packages/ui/src/overlays/translations/de.js
diff --git a/packages/overlays/translations/en-AU.js b/packages/ui/src/overlays/translations/en-AU.js
similarity index 100%
rename from packages/overlays/translations/en-AU.js
rename to packages/ui/src/overlays/translations/en-AU.js
diff --git a/packages/overlays/translations/en-GB.js b/packages/ui/src/overlays/translations/en-GB.js
similarity index 100%
rename from packages/overlays/translations/en-GB.js
rename to packages/ui/src/overlays/translations/en-GB.js
diff --git a/packages/overlays/translations/en-US.js b/packages/ui/src/overlays/translations/en-US.js
similarity index 100%
rename from packages/overlays/translations/en-US.js
rename to packages/ui/src/overlays/translations/en-US.js
diff --git a/packages/overlays/translations/en.js b/packages/ui/src/overlays/translations/en.js
similarity index 100%
rename from packages/overlays/translations/en.js
rename to packages/ui/src/overlays/translations/en.js
diff --git a/packages/overlays/translations/es-ES.js b/packages/ui/src/overlays/translations/es-ES.js
similarity index 100%
rename from packages/overlays/translations/es-ES.js
rename to packages/ui/src/overlays/translations/es-ES.js
diff --git a/packages/overlays/translations/es.js b/packages/ui/src/overlays/translations/es.js
similarity index 100%
rename from packages/overlays/translations/es.js
rename to packages/ui/src/overlays/translations/es.js
diff --git a/packages/overlays/translations/fr-BE.js b/packages/ui/src/overlays/translations/fr-BE.js
similarity index 100%
rename from packages/overlays/translations/fr-BE.js
rename to packages/ui/src/overlays/translations/fr-BE.js
diff --git a/packages/overlays/translations/fr-FR.js b/packages/ui/src/overlays/translations/fr-FR.js
similarity index 100%
rename from packages/overlays/translations/fr-FR.js
rename to packages/ui/src/overlays/translations/fr-FR.js
diff --git a/packages/overlays/translations/fr.js b/packages/ui/src/overlays/translations/fr.js
similarity index 100%
rename from packages/overlays/translations/fr.js
rename to packages/ui/src/overlays/translations/fr.js
diff --git a/packages/overlays/translations/hu-HU.js b/packages/ui/src/overlays/translations/hu-HU.js
similarity index 100%
rename from packages/overlays/translations/hu-HU.js
rename to packages/ui/src/overlays/translations/hu-HU.js
diff --git a/packages/overlays/translations/hu.js b/packages/ui/src/overlays/translations/hu.js
similarity index 100%
rename from packages/overlays/translations/hu.js
rename to packages/ui/src/overlays/translations/hu.js
diff --git a/packages/overlays/translations/it-IT.js b/packages/ui/src/overlays/translations/it-IT.js
similarity index 100%
rename from packages/overlays/translations/it-IT.js
rename to packages/ui/src/overlays/translations/it-IT.js
diff --git a/packages/overlays/translations/it.js b/packages/ui/src/overlays/translations/it.js
similarity index 100%
rename from packages/overlays/translations/it.js
rename to packages/ui/src/overlays/translations/it.js
diff --git a/packages/overlays/translations/nl-BE.js b/packages/ui/src/overlays/translations/nl-BE.js
similarity index 100%
rename from packages/overlays/translations/nl-BE.js
rename to packages/ui/src/overlays/translations/nl-BE.js
diff --git a/packages/overlays/translations/nl-NL.js b/packages/ui/src/overlays/translations/nl-NL.js
similarity index 100%
rename from packages/overlays/translations/nl-NL.js
rename to packages/ui/src/overlays/translations/nl-NL.js
diff --git a/packages/overlays/translations/nl.js b/packages/ui/src/overlays/translations/nl.js
similarity index 100%
rename from packages/overlays/translations/nl.js
rename to packages/ui/src/overlays/translations/nl.js
diff --git a/packages/overlays/translations/pl-PL.js b/packages/ui/src/overlays/translations/pl-PL.js
similarity index 100%
rename from packages/overlays/translations/pl-PL.js
rename to packages/ui/src/overlays/translations/pl-PL.js
diff --git a/packages/overlays/translations/pl.js b/packages/ui/src/overlays/translations/pl.js
similarity index 100%
rename from packages/overlays/translations/pl.js
rename to packages/ui/src/overlays/translations/pl.js
diff --git a/packages/overlays/translations/ro-RO.js b/packages/ui/src/overlays/translations/ro-RO.js
similarity index 100%
rename from packages/overlays/translations/ro-RO.js
rename to packages/ui/src/overlays/translations/ro-RO.js
diff --git a/packages/overlays/translations/ro.js b/packages/ui/src/overlays/translations/ro.js
similarity index 100%
rename from packages/overlays/translations/ro.js
rename to packages/ui/src/overlays/translations/ro.js
diff --git a/packages/overlays/translations/ru-RU.js b/packages/ui/src/overlays/translations/ru-RU.js
similarity index 100%
rename from packages/overlays/translations/ru-RU.js
rename to packages/ui/src/overlays/translations/ru-RU.js
diff --git a/packages/overlays/translations/ru.js b/packages/ui/src/overlays/translations/ru.js
similarity index 100%
rename from packages/overlays/translations/ru.js
rename to packages/ui/src/overlays/translations/ru.js
diff --git a/packages/overlays/translations/sk-SK.js b/packages/ui/src/overlays/translations/sk-SK.js
similarity index 100%
rename from packages/overlays/translations/sk-SK.js
rename to packages/ui/src/overlays/translations/sk-SK.js
diff --git a/packages/overlays/translations/sk.js b/packages/ui/src/overlays/translations/sk.js
similarity index 100%
rename from packages/overlays/translations/sk.js
rename to packages/ui/src/overlays/translations/sk.js
diff --git a/packages/overlays/translations/uk-UA.js b/packages/ui/src/overlays/translations/uk-UA.js
similarity index 100%
rename from packages/overlays/translations/uk-UA.js
rename to packages/ui/src/overlays/translations/uk-UA.js
diff --git a/packages/overlays/translations/uk.js b/packages/ui/src/overlays/translations/uk.js
similarity index 100%
rename from packages/overlays/translations/uk.js
rename to packages/ui/src/overlays/translations/uk.js
diff --git a/packages/overlays/translations/zh.js b/packages/ui/src/overlays/translations/zh.js
similarity index 100%
rename from packages/overlays/translations/zh.js
rename to packages/ui/src/overlays/translations/zh.js
diff --git a/packages/overlays/types/ArrowMixinTypes.d.ts b/packages/ui/src/overlays/types/ArrowMixinTypes.d.ts
similarity index 91%
rename from packages/overlays/types/ArrowMixinTypes.d.ts
rename to packages/ui/src/overlays/types/ArrowMixinTypes.d.ts
index b46cd06b7..08e7592e5 100644
--- a/packages/overlays/types/ArrowMixinTypes.d.ts
+++ b/packages/ui/src/overlays/types/ArrowMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement, TemplateResult } from '@lion/core';
-import { CSSResultArray } from '@lion/core';
+import { LitElement, TemplateResult } from '@lion/ui/core.js';
+import { CSSResultArray } from '@lion/ui/core.js';
 import { Options as PopperOptions, State } from '@popperjs/core/lib/popper';
 import { OverlayConfig } from '../types/OverlayConfig';
 
diff --git a/packages/overlays/types/OverlayConfig.d.ts b/packages/ui/src/overlays/types/OverlayConfig.d.ts
similarity index 100%
rename from packages/overlays/types/OverlayConfig.d.ts
rename to packages/ui/src/overlays/types/OverlayConfig.d.ts
diff --git a/packages/overlays/types/OverlayMixinTypes.d.ts b/packages/ui/src/overlays/types/OverlayMixinTypes.d.ts
similarity index 96%
rename from packages/overlays/types/OverlayMixinTypes.d.ts
rename to packages/ui/src/overlays/types/OverlayMixinTypes.d.ts
index e8d0cd580..64a173ac4 100644
--- a/packages/overlays/types/OverlayMixinTypes.d.ts
+++ b/packages/ui/src/overlays/types/OverlayMixinTypes.d.ts
@@ -1,7 +1,7 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from '@lion/core';
+import { LitElement } from 'lit';
 import { OverlayConfig } from './OverlayConfig.js';
-import { OverlayController } from '../src/OverlayController.js';
+import { OverlayController } from '../src/OverlayController.js.js';
 
 export interface DefineOverlayConfig {
   /** The interactive element (usually a button) invoking the dialog or tooltip */
diff --git a/packages/overlays/src/utils/contain-focus.js b/packages/ui/src/overlays/utils/contain-focus.js
similarity index 100%
rename from packages/overlays/src/utils/contain-focus.js
rename to packages/ui/src/overlays/utils/contain-focus.js
diff --git a/packages/overlays/src/utils/deep-contains.js b/packages/ui/src/overlays/utils/deep-contains.js
similarity index 100%
rename from packages/overlays/src/utils/deep-contains.js
rename to packages/ui/src/overlays/utils/deep-contains.js
diff --git a/packages/overlays/src/utils/get-deep-active-element.js b/packages/ui/src/overlays/utils/get-deep-active-element.js
similarity index 100%
rename from packages/overlays/src/utils/get-deep-active-element.js
rename to packages/ui/src/overlays/utils/get-deep-active-element.js
diff --git a/packages/overlays/src/utils/get-focusable-elements.js b/packages/ui/src/overlays/utils/get-focusable-elements.js
similarity index 100%
rename from packages/overlays/src/utils/get-focusable-elements.js
rename to packages/ui/src/overlays/utils/get-focusable-elements.js
diff --git a/packages/overlays/src/utils/inert-siblings.js b/packages/ui/src/overlays/utils/inert-siblings.js
similarity index 100%
rename from packages/overlays/src/utils/inert-siblings.js
rename to packages/ui/src/overlays/utils/inert-siblings.js
diff --git a/packages/overlays/src/utils/is-equal-config.js b/packages/ui/src/overlays/utils/is-equal-config.js
similarity index 100%
rename from packages/overlays/src/utils/is-equal-config.js
rename to packages/ui/src/overlays/utils/is-equal-config.js
diff --git a/packages/overlays/src/utils/is-visible.js b/packages/ui/src/overlays/utils/is-visible.js
similarity index 100%
rename from packages/overlays/src/utils/is-visible.js
rename to packages/ui/src/overlays/utils/is-visible.js
diff --git a/packages/overlays/src/utils/key-codes.js b/packages/ui/src/overlays/utils/key-codes.js
similarity index 100%
rename from packages/overlays/src/utils/key-codes.js
rename to packages/ui/src/overlays/utils/key-codes.js
diff --git a/packages/overlays/src/utils/simulate-tab.js b/packages/ui/src/overlays/utils/simulate-tab.js
similarity index 100%
rename from packages/overlays/src/utils/simulate-tab.js
rename to packages/ui/src/overlays/utils/simulate-tab.js
diff --git a/packages/overlays/src/utils/sort-by-tabindex.js b/packages/ui/src/overlays/utils/sort-by-tabindex.js
similarity index 100%
rename from packages/overlays/src/utils/sort-by-tabindex.js
rename to packages/ui/src/overlays/utils/sort-by-tabindex.js
diff --git a/packages/pagination/src/LionPagination.js b/packages/ui/src/pagination/LionPagination.js
similarity index 85%
rename from packages/pagination/src/LionPagination.js
rename to packages/ui/src/pagination/LionPagination.js
index 3c8ae4b1d..807e6bb98 100644
--- a/packages/pagination/src/LionPagination.js
+++ b/packages/ui/src/pagination/LionPagination.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { LitElement, html, css } from '@lion/core';
-import { LocalizeMixin } from '@lion/localize';
+import { LitElement, html, css } from 'lit';
+import { LocalizeMixin } from '@lion/ui/localize.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
@@ -42,43 +42,43 @@ export class LionPagination extends LocalizeMixin(LitElement) {
         'lion-pagination': /** @param {string} locale */ locale => {
           switch (locale) {
             case 'bg-BG':
-              return import('@lion/pagination/translations/bg.js');
+              return import('@lion/ui/pagination-translations/bg.js');
             case 'cs-CZ':
-              return import('@lion/pagination/translations/cs.js');
+              return import('@lion/ui/pagination-translations/cs.js');
             case 'de-AT':
             case 'de-DE':
-              return import('@lion/pagination/translations/de.js');
+              return import('@lion/ui/pagination-translations/de.js');
             case 'en-AU':
             case 'en-GB':
             case 'en-PH':
             case 'en-US':
-              return import('@lion/pagination/translations/en.js');
+              return import('@lion/ui/pagination-translations/en.js');
             case 'es-ES':
-              return import('@lion/pagination/translations/es.js');
+              return import('@lion/ui/pagination-translations/es.js');
             case 'fr-FR':
             case 'fr-BE':
-              return import('@lion/pagination/translations/fr.js');
+              return import('@lion/ui/pagination-translations/fr.js');
             case 'hu-HU':
-              return import('@lion/pagination/translations/hu.js');
+              return import('@lion/ui/pagination-translations/hu.js');
             case 'it-IT':
-              return import('@lion/pagination/translations/it.js');
+              return import('@lion/ui/pagination-translations/it.js');
             case 'nl-BE':
             case 'nl-NL':
-              return import('@lion/pagination/translations/nl.js');
+              return import('@lion/ui/pagination-translations/nl.js');
             case 'pl-PL':
-              return import('@lion/pagination/translations/pl.js');
+              return import('@lion/ui/pagination-translations/pl.js');
             case 'ro-RO':
-              return import('@lion/pagination/translations/ro.js');
+              return import('@lion/ui/pagination-translations/ro.js');
             case 'ru-RU':
-              return import('@lion/pagination/translations/ru.js');
+              return import('@lion/ui/pagination-translations/ru.js');
             case 'sk-SK':
-              return import('@lion/pagination/translations/sk.js');
+              return import('@lion/ui/pagination-translations/sk.js');
             case 'uk-UA':
-              return import('@lion/pagination/translations/uk.js');
+              return import('@lion/ui/pagination-translations/uk.js');
             case 'zh-CN':
-              return import('@lion/pagination/translations/zh.js');
+              return import('@lion/ui/pagination-translations/zh.js');
             default:
-              return import('@lion/pagination/translations/en.js');
+              return import('@lion/ui/pagination-translations/en.js');
           }
         },
       },
diff --git a/packages/pagination/test/lion-pagination.test.js b/packages/ui/src/pagination/test/lion-pagination.test.js
similarity index 99%
rename from packages/pagination/test/lion-pagination.test.js
rename to packages/ui/src/pagination/test/lion-pagination.test.js
index 44e91d1cd..101d0f15b 100644
--- a/packages/pagination/test/lion-pagination.test.js
+++ b/packages/ui/src/pagination/test/lion-pagination.test.js
@@ -2,7 +2,7 @@ import { fixture as _fixture, expect } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
 
-import '@lion/pagination/define';
+import '@lion/ui/define/lion-pagination.js';
 
 /**
  * @typedef {import('../src/LionPagination').LionPagination} LionPagination
diff --git a/packages/pagination/translations/bg.js b/packages/ui/src/pagination/translations/bg.js
similarity index 100%
rename from packages/pagination/translations/bg.js
rename to packages/ui/src/pagination/translations/bg.js
diff --git a/packages/pagination/translations/cs.js b/packages/ui/src/pagination/translations/cs.js
similarity index 100%
rename from packages/pagination/translations/cs.js
rename to packages/ui/src/pagination/translations/cs.js
diff --git a/packages/pagination/translations/de.js b/packages/ui/src/pagination/translations/de.js
similarity index 100%
rename from packages/pagination/translations/de.js
rename to packages/ui/src/pagination/translations/de.js
diff --git a/packages/pagination/translations/en.js b/packages/ui/src/pagination/translations/en.js
similarity index 100%
rename from packages/pagination/translations/en.js
rename to packages/ui/src/pagination/translations/en.js
diff --git a/packages/pagination/translations/es.js b/packages/ui/src/pagination/translations/es.js
similarity index 100%
rename from packages/pagination/translations/es.js
rename to packages/ui/src/pagination/translations/es.js
diff --git a/packages/pagination/translations/fr.js b/packages/ui/src/pagination/translations/fr.js
similarity index 100%
rename from packages/pagination/translations/fr.js
rename to packages/ui/src/pagination/translations/fr.js
diff --git a/packages/pagination/translations/hu.js b/packages/ui/src/pagination/translations/hu.js
similarity index 100%
rename from packages/pagination/translations/hu.js
rename to packages/ui/src/pagination/translations/hu.js
diff --git a/packages/pagination/translations/it.js b/packages/ui/src/pagination/translations/it.js
similarity index 100%
rename from packages/pagination/translations/it.js
rename to packages/ui/src/pagination/translations/it.js
diff --git a/packages/pagination/translations/nl.js b/packages/ui/src/pagination/translations/nl.js
similarity index 100%
rename from packages/pagination/translations/nl.js
rename to packages/ui/src/pagination/translations/nl.js
diff --git a/packages/pagination/translations/pl.js b/packages/ui/src/pagination/translations/pl.js
similarity index 100%
rename from packages/pagination/translations/pl.js
rename to packages/ui/src/pagination/translations/pl.js
diff --git a/packages/pagination/translations/ro.js b/packages/ui/src/pagination/translations/ro.js
similarity index 100%
rename from packages/pagination/translations/ro.js
rename to packages/ui/src/pagination/translations/ro.js
diff --git a/packages/pagination/translations/ru.js b/packages/ui/src/pagination/translations/ru.js
similarity index 100%
rename from packages/pagination/translations/ru.js
rename to packages/ui/src/pagination/translations/ru.js
diff --git a/packages/pagination/translations/sk.js b/packages/ui/src/pagination/translations/sk.js
similarity index 100%
rename from packages/pagination/translations/sk.js
rename to packages/ui/src/pagination/translations/sk.js
diff --git a/packages/pagination/translations/uk.js b/packages/ui/src/pagination/translations/uk.js
similarity index 100%
rename from packages/pagination/translations/uk.js
rename to packages/ui/src/pagination/translations/uk.js
diff --git a/packages/pagination/translations/zh.js b/packages/ui/src/pagination/translations/zh.js
similarity index 100%
rename from packages/pagination/translations/zh.js
rename to packages/ui/src/pagination/translations/zh.js
diff --git a/packages/progress-indicator/src/LionProgressIndicator.js b/packages/ui/src/progress-indicator/LionProgressIndicator.js
similarity index 77%
rename from packages/progress-indicator/src/LionProgressIndicator.js
rename to packages/ui/src/progress-indicator/LionProgressIndicator.js
index 1af6cc42c..82ea882a6 100644
--- a/packages/progress-indicator/src/LionProgressIndicator.js
+++ b/packages/ui/src/progress-indicator/LionProgressIndicator.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { LitElement, nothing } from '@lion/core';
-import { localize, LocalizeMixin } from '@lion/localize';
+import { LitElement, nothing } from 'lit';
+import { localize, LocalizeMixin } from '@lion/ui/localize.js';
 
 /**
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
@@ -29,56 +29,56 @@ export class LionProgressIndicator extends LocalizeMixin(LitElement) {
           switch (locale) {
             case 'bg-BG':
             case 'bg':
-              return import('@lion/progress-indicator/translations/bg.js');
+              return import('@lion/ui/progress-indicator-translations/bg.js');
             case 'cs-CZ':
             case 'cs':
-              return import('@lion/progress-indicator/translations/cs.js');
+              return import('@lion/ui/progress-indicator-translations/cs.js');
             case 'de-DE':
             case 'de':
-              return import('@lion/progress-indicator/translations/de.js');
+              return import('@lion/ui/progress-indicator-translations/de.js');
             case 'en-AU':
             case 'en-GB':
             case 'en-US':
             case 'en-PH':
             case 'en':
-              return import('@lion/progress-indicator/translations/en.js');
+              return import('@lion/ui/progress-indicator-translations/en.js');
             case 'es-ES':
             case 'es':
-              return import('@lion/progress-indicator/translations/es.js');
+              return import('@lion/ui/progress-indicator-translations/es.js');
             case 'fr-BE':
             case 'fr-FR':
             case 'fr':
-              return import('@lion/progress-indicator/translations/fr.js');
+              return import('@lion/ui/progress-indicator-translations/fr.js');
             case 'hu-HU':
             case 'hu':
-              return import('@lion/progress-indicator/translations/hu.js');
+              return import('@lion/ui/progress-indicator-translations/hu.js');
             case 'it-IT':
             case 'it':
-              return import('@lion/progress-indicator/translations/it.js');
+              return import('@lion/ui/progress-indicator-translations/it.js');
             case 'nl-BE':
             case 'nl-NL':
             case 'nl':
-              return import('@lion/progress-indicator/translations/nl.js');
+              return import('@lion/ui/progress-indicator-translations/nl.js');
             case 'pl-PL':
             case 'pl':
-              return import('@lion/progress-indicator/translations/pl.js');
+              return import('@lion/ui/progress-indicator-translations/pl.js');
             case 'ro-RO':
             case 'ro':
-              return import('@lion/progress-indicator/translations/ro.js');
+              return import('@lion/ui/progress-indicator-translations/ro.js');
             case 'ru-RU':
             case 'ru':
-              return import('@lion/progress-indicator/translations/ru.js');
+              return import('@lion/ui/progress-indicator-translations/ru.js');
             case 'sk-SK':
             case 'sk':
-              return import('@lion/progress-indicator/translations/sk.js');
+              return import('@lion/ui/progress-indicator-translations/sk.js');
             case 'uk-UA':
             case 'uk':
-              return import('@lion/progress-indicator/translations/uk.js');
+              return import('@lion/ui/progress-indicator-translations/uk.js');
             case 'zh-CN':
             case 'zh':
-              return import('@lion/progress-indicator/translations/zh.js');
+              return import('@lion/ui/progress-indicator-translations/zh.js');
             default:
-              return import('@lion/progress-indicator/translations/en.js');
+              return import('@lion/ui/progress-indicator-translations/en.js');
           }
         },
       },
diff --git a/packages/progress-indicator/test/lion-progress-indicator.test.js b/packages/ui/src/progress-indicator/test/lion-progress-indicator.test.js
similarity index 98%
rename from packages/progress-indicator/test/lion-progress-indicator.test.js
rename to packages/ui/src/progress-indicator/test/lion-progress-indicator.test.js
index 361c37a0d..c1d03cd20 100644
--- a/packages/progress-indicator/test/lion-progress-indicator.test.js
+++ b/packages/ui/src/progress-indicator/test/lion-progress-indicator.test.js
@@ -1,7 +1,7 @@
-import { html } from '@lion/core';
+import { html } from 'lit';
 import { expect, fixture as _fixture } from '@open-wc/testing';
 
-import '@lion/progress-indicator/define';
+import '@lion/ui/define/lion-progress-indicator.js';
 
 /**
  * @typedef {import('../src/LionProgressIndicator').LionProgressIndicator} LionProgressIndicator
diff --git a/packages/progress-indicator/translations/bg.js b/packages/ui/src/progress-indicator/translations/bg.js
similarity index 100%
rename from packages/progress-indicator/translations/bg.js
rename to packages/ui/src/progress-indicator/translations/bg.js
diff --git a/packages/progress-indicator/translations/cs.js b/packages/ui/src/progress-indicator/translations/cs.js
similarity index 100%
rename from packages/progress-indicator/translations/cs.js
rename to packages/ui/src/progress-indicator/translations/cs.js
diff --git a/packages/progress-indicator/translations/de.js b/packages/ui/src/progress-indicator/translations/de.js
similarity index 100%
rename from packages/progress-indicator/translations/de.js
rename to packages/ui/src/progress-indicator/translations/de.js
diff --git a/packages/progress-indicator/translations/en.js b/packages/ui/src/progress-indicator/translations/en.js
similarity index 100%
rename from packages/progress-indicator/translations/en.js
rename to packages/ui/src/progress-indicator/translations/en.js
diff --git a/packages/progress-indicator/translations/es.js b/packages/ui/src/progress-indicator/translations/es.js
similarity index 100%
rename from packages/progress-indicator/translations/es.js
rename to packages/ui/src/progress-indicator/translations/es.js
diff --git a/packages/progress-indicator/translations/fr.js b/packages/ui/src/progress-indicator/translations/fr.js
similarity index 100%
rename from packages/progress-indicator/translations/fr.js
rename to packages/ui/src/progress-indicator/translations/fr.js
diff --git a/packages/progress-indicator/translations/hu.js b/packages/ui/src/progress-indicator/translations/hu.js
similarity index 100%
rename from packages/progress-indicator/translations/hu.js
rename to packages/ui/src/progress-indicator/translations/hu.js
diff --git a/packages/progress-indicator/translations/it.js b/packages/ui/src/progress-indicator/translations/it.js
similarity index 100%
rename from packages/progress-indicator/translations/it.js
rename to packages/ui/src/progress-indicator/translations/it.js
diff --git a/packages/progress-indicator/translations/nl.js b/packages/ui/src/progress-indicator/translations/nl.js
similarity index 100%
rename from packages/progress-indicator/translations/nl.js
rename to packages/ui/src/progress-indicator/translations/nl.js
diff --git a/packages/progress-indicator/translations/pl.js b/packages/ui/src/progress-indicator/translations/pl.js
similarity index 100%
rename from packages/progress-indicator/translations/pl.js
rename to packages/ui/src/progress-indicator/translations/pl.js
diff --git a/packages/progress-indicator/translations/ro.js b/packages/ui/src/progress-indicator/translations/ro.js
similarity index 100%
rename from packages/progress-indicator/translations/ro.js
rename to packages/ui/src/progress-indicator/translations/ro.js
diff --git a/packages/progress-indicator/translations/ru.js b/packages/ui/src/progress-indicator/translations/ru.js
similarity index 100%
rename from packages/progress-indicator/translations/ru.js
rename to packages/ui/src/progress-indicator/translations/ru.js
diff --git a/packages/progress-indicator/translations/sk.js b/packages/ui/src/progress-indicator/translations/sk.js
similarity index 100%
rename from packages/progress-indicator/translations/sk.js
rename to packages/ui/src/progress-indicator/translations/sk.js
diff --git a/packages/progress-indicator/translations/uk.js b/packages/ui/src/progress-indicator/translations/uk.js
similarity index 100%
rename from packages/progress-indicator/translations/uk.js
rename to packages/ui/src/progress-indicator/translations/uk.js
diff --git a/packages/progress-indicator/translations/zh.js b/packages/ui/src/progress-indicator/translations/zh.js
similarity index 100%
rename from packages/progress-indicator/translations/zh.js
rename to packages/ui/src/progress-indicator/translations/zh.js
diff --git a/packages/radio-group/src/LionRadio.js b/packages/ui/src/radio-group/LionRadio.js
similarity index 85%
rename from packages/radio-group/src/LionRadio.js
rename to packages/ui/src/radio-group/LionRadio.js
index 0d340701f..7d605d78b 100644
--- a/packages/radio-group/src/LionRadio.js
+++ b/packages/ui/src/radio-group/LionRadio.js
@@ -1,5 +1,5 @@
-import { ChoiceInputMixin } from '@lion/form-core';
-import { LionInput } from '@lion/input';
+import { ChoiceInputMixin } from '@lion/ui/form-core.js';
+import { LionInput } from '@lion/ui/input.js';
 
 /**
  * Lion-radio can be used inside a lion-radio-group.
diff --git a/packages/radio-group/src/LionRadioGroup.js b/packages/ui/src/radio-group/LionRadioGroup.js
similarity index 88%
rename from packages/radio-group/src/LionRadioGroup.js
rename to packages/ui/src/radio-group/LionRadioGroup.js
index 029710aa0..d2c1b7515 100644
--- a/packages/radio-group/src/LionRadioGroup.js
+++ b/packages/ui/src/radio-group/LionRadioGroup.js
@@ -1,5 +1,5 @@
-import { LitElement } from '@lion/core';
-import { ChoiceGroupMixin, FormGroupMixin } from '@lion/form-core';
+import { LitElement } from 'lit';
+import { ChoiceGroupMixin, FormGroupMixin } from '@lion/ui/form-core.js';
 
 /**
  * A wrapper around multiple radios.
diff --git a/packages/ui/src/radio-group/test/lion-radio-group-integrations.test.js b/packages/ui/src/radio-group/test/lion-radio-group-integrations.test.js
new file mode 100644
index 000000000..771b0891e
--- /dev/null
+++ b/packages/ui/src/radio-group/test/lion-radio-group-integrations.test.js
@@ -0,0 +1,9 @@
+import { runChoiceGroupMixinSuite } from '@lion/ui/form-core-test-suites.js';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
+
+runChoiceGroupMixinSuite({
+  parentTagString: 'lion-radio-group',
+  childTagString: 'lion-radio',
+  choiceType: 'single',
+});
diff --git a/packages/radio-group/test/lion-radio-group.test.js b/packages/ui/src/radio-group/test/lion-radio-group.test.js
similarity index 98%
rename from packages/radio-group/test/lion-radio-group.test.js
rename to packages/ui/src/radio-group/test/lion-radio-group.test.js
index 1739dd5d2..572fcea07 100644
--- a/packages/radio-group/test/lion-radio-group.test.js
+++ b/packages/ui/src/radio-group/test/lion-radio-group.test.js
@@ -1,6 +1,7 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/radio-group/define';
+import '@lion/ui/define/lion-radio-group.js';
+import '@lion/ui/define/lion-radio.js';
 
 /**
  * @typedef {import('../src/LionRadioGroup').LionRadioGroup} LionRadioGroup
diff --git a/packages/ui/src/radio-group/test/lion-radio-integrations.test.js b/packages/ui/src/radio-group/test/lion-radio-integrations.test.js
new file mode 100644
index 000000000..f979f88be
--- /dev/null
+++ b/packages/ui/src/radio-group/test/lion-radio-integrations.test.js
@@ -0,0 +1,4 @@
+import '@lion/ui/define/lion-radio.js';
+import { runChoiceInputMixinSuite } from '@lion/ui/form-core-test-suites.js';
+
+runChoiceInputMixinSuite({ tagString: 'lion-radio' });
diff --git a/packages/radio-group/test/lion-radio.test.js b/packages/ui/src/radio-group/test/lion-radio.test.js
similarity index 97%
rename from packages/radio-group/test/lion-radio.test.js
rename to packages/ui/src/radio-group/test/lion-radio.test.js
index fffdc6e19..ee847434d 100644
--- a/packages/radio-group/test/lion-radio.test.js
+++ b/packages/ui/src/radio-group/test/lion-radio.test.js
@@ -1,6 +1,6 @@
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/radio-group/define-radio';
+import '@lion/ui/define/lion-radio.js';
 
 /**
  * @typedef {import('../src/LionRadio').LionRadio} LionRadio
diff --git a/packages/select-rich/src/LionSelectInvoker.js b/packages/ui/src/select-rich/LionSelectInvoker.js
similarity index 96%
rename from packages/select-rich/src/LionSelectInvoker.js
rename to packages/ui/src/select-rich/LionSelectInvoker.js
index 21fcfeeaa..4b1fcdaa2 100644
--- a/packages/select-rich/src/LionSelectInvoker.js
+++ b/packages/ui/src/select-rich/LionSelectInvoker.js
@@ -1,5 +1,6 @@
-import { LionButton } from '@lion/button';
-import { css, html, SlotMixin } from '@lion/core';
+import { LionButton } from '@lion/ui/button.js';
+import { css, html } from 'lit';
+import { SlotMixin } from '@lion/ui/core.js';
 
 /**
  * @typedef {import('@lion/core').CSSResult} CSSResult
diff --git a/packages/select-rich/src/LionSelectRich.js b/packages/ui/src/select-rich/LionSelectRich.js
similarity index 98%
rename from packages/select-rich/src/LionSelectRich.js
rename to packages/ui/src/select-rich/LionSelectRich.js
index 061c3ba9f..35729c05d 100644
--- a/packages/select-rich/src/LionSelectRich.js
+++ b/packages/ui/src/select-rich/LionSelectRich.js
@@ -1,6 +1,8 @@
-import { LionListbox } from '@lion/listbox';
-import { html, ScopedElementsMixin, SlotMixin, browserDetection } from '@lion/core';
-import { OverlayMixin, withDropdownConfig } from '@lion/overlays';
+import { LionListbox } from '@lion/ui/listbox.js';
+import { html } from 'lit';
+import { SlotMixin, browserDetection } from '@lion/ui/core.js';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { OverlayMixin, withDropdownConfig } from '@lion/ui/overlays.js';
 import { LionSelectInvoker } from './LionSelectInvoker.js';
 
 /**
diff --git a/packages/select-rich/test/demos.screenshots-test.js b/packages/ui/src/select-rich/test/demos.screenshots-test.js
similarity index 100%
rename from packages/select-rich/test/demos.screenshots-test.js
rename to packages/ui/src/select-rich/test/demos.screenshots-test.js
diff --git a/packages/select-rich/test/lion-select-invoker.test.js b/packages/ui/src/select-rich/test/lion-select-invoker.test.js
similarity index 95%
rename from packages/select-rich/test/lion-select-invoker.test.js
rename to packages/ui/src/select-rich/test/lion-select-invoker.test.js
index 4bdbe7716..0ae640afb 100644
--- a/packages/select-rich/test/lion-select-invoker.test.js
+++ b/packages/ui/src/select-rich/test/lion-select-invoker.test.js
@@ -1,8 +1,9 @@
-import { LionButton } from '@lion/button';
+import { LionButton } from '@lion/ui/button.js';
 import { defineCE, expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
-import '@lion/select-rich/define-select-invoker';
-import { LionSelectInvoker } from '../src/LionSelectInvoker.js';
+import { LionSelectInvoker } from '@lion/ui/select-rich.js';
+
+import '@lion/ui/define/lion-select-invoker.js';
 
 /**
  * @typedef {import('@lion/listbox').LionOption} LionOption
diff --git a/packages/select-rich/test/lion-select-listbox-suite-integration.test.js b/packages/ui/src/select-rich/test/lion-select-listbox-suite-integration.test.js
similarity index 52%
rename from packages/select-rich/test/lion-select-listbox-suite-integration.test.js
rename to packages/ui/src/select-rich/test/lion-select-listbox-suite-integration.test.js
index 319621360..3d5916b9b 100644
--- a/packages/select-rich/test/lion-select-listbox-suite-integration.test.js
+++ b/packages/ui/src/select-rich/test/lion-select-listbox-suite-integration.test.js
@@ -1,5 +1,6 @@
-import { runListboxMixinSuite } from '@lion/listbox/test-suites';
-import '@lion/select-rich/define';
+import { runListboxMixinSuite } from '@lion/ui/listbox-test-suites.js';
+
+import '@lion/ui/define/lion-select-rich.js';
 
 describe('<lion-select-rich> integration with ListboxMixin', () => {
   runListboxMixinSuite({ tagString: 'lion-select-rich' });
diff --git a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js b/packages/ui/src/select-rich/test/lion-select-rich-dialog-integration.test.js
similarity index 89%
rename from packages/select-rich/test/lion-select-rich-dialog-integration.test.js
rename to packages/ui/src/select-rich/test/lion-select-rich-dialog-integration.test.js
index d9cc88c3b..091b3f62e 100644
--- a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
+++ b/packages/ui/src/select-rich/test/lion-select-rich-dialog-integration.test.js
@@ -1,9 +1,10 @@
-import { LitElement } from '@lion/core';
-import '@lion/listbox/define';
-import { OverlayMixin } from '@lion/overlays';
-import '@lion/select-rich/define';
+import { LitElement } from 'lit';
+import { OverlayMixin } from '@lion/ui/overlays.js';
 import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-select-rich.js';
+
 /**
  * @typedef {import('../src/LionSelectRich').LionSelectRich} LionSelectRich
  */
diff --git a/packages/select-rich/test/lion-select-rich-interaction.test.js b/packages/ui/src/select-rich/test/lion-select-rich-interaction.test.js
similarity index 97%
rename from packages/select-rich/test/lion-select-rich-interaction.test.js
rename to packages/ui/src/select-rich/test/lion-select-rich-interaction.test.js
index 61310a22f..fb7db4dfc 100644
--- a/packages/select-rich/test/lion-select-rich-interaction.test.js
+++ b/packages/ui/src/select-rich/test/lion-select-rich-interaction.test.js
@@ -1,9 +1,12 @@
-import { Required } from '@lion/form-core';
 import { expect, triggerBlurFor, triggerFocusFor, fixture } from '@open-wc/testing';
+import { Required } from '@lion/ui/form-core.js';
 import { html } from 'lit/static-html.js';
-import { browserDetection } from '@lion/core';
-import '@lion/listbox/define';
-import '@lion/select-rich/define';
+import { browserDetection } from '@lion/ui/core.js';
+
+import '@lion/ui/define/lion-option.js';
+
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-select-rich.js';
 
 /**
  * @typedef {import('../src/LionSelectRich').LionSelectRich} LionSelectRich
diff --git a/packages/select-rich/test/lion-select-rich.test.js b/packages/ui/src/select-rich/test/lion-select-rich.test.js
similarity index 97%
rename from packages/select-rich/test/lion-select-rich.test.js
rename to packages/ui/src/select-rich/test/lion-select-rich.test.js
index afbf6146f..48a79b589 100644
--- a/packages/select-rich/test/lion-select-rich.test.js
+++ b/packages/ui/src/select-rich/test/lion-select-rich.test.js
@@ -1,12 +1,14 @@
-import { LitElement } from '@lion/core';
-import { renderLitAsNode } from '@lion/helpers';
-import { LionOption } from '@lion/listbox';
-import '@lion/listbox/define';
-import { getListboxMembers } from '@lion/listbox/test-helpers';
-import { OverlayController } from '@lion/overlays';
-import { mimicClick } from '@lion/overlays/test-helpers';
-import { LionSelectInvoker, LionSelectRich } from '@lion/select-rich';
-import '@lion/select-rich/define';
+import { LitElement } from 'lit';
+import { renderLitAsNode } from '@lion/ui/helpers.js';
+import { LionOption } from '@lion/ui/listbox.js';
+import { getListboxMembers } from '@lion/ui/listbox-test-helpers.js';
+import { OverlayController } from '@lion/ui/overlays.js';
+import { mimicClick } from '@lion/ui/overlays-test-helpers.js';
+import { LionSelectInvoker, LionSelectRich } from '@lion/ui/select-rich.js';
+
+import '@lion/ui/define/lion-option.js';
+import '@lion/ui/define/lion-listbox.js';
+import '@lion/ui/define/lion-select-rich.js';
 import {
   aTimeout,
   defineCE,
diff --git a/packages/select/src/LionSelect.js b/packages/ui/src/select/LionSelect.js
similarity index 98%
rename from packages/select/src/LionSelect.js
rename to packages/ui/src/select/LionSelect.js
index 2b8dd1b56..5ec35884c 100644
--- a/packages/select/src/LionSelect.js
+++ b/packages/ui/src/select/LionSelect.js
@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import { LionField } from '@lion/form-core';
+import { LionField } from '@lion/ui/form-core.js';
 
 /**
  * @typedef {import('@lion/localize/types/LocalizeMixinTypes').FormatNumberOptions} FormatOptions
diff --git a/packages/select/test/lion-select.test.js b/packages/ui/src/select/test/lion-select.test.js
similarity index 97%
rename from packages/select/test/lion-select.test.js
rename to packages/ui/src/select/test/lion-select.test.js
index e1e25c2ad..e8841f051 100644
--- a/packages/select/test/lion-select.test.js
+++ b/packages/ui/src/select/test/lion-select.test.js
@@ -1,4 +1,4 @@
-import '@lion/select/define';
+import '@lion/ui/define/lion-select.js';
 import { aTimeout, expect, fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 
diff --git a/packages/steps/src/LionStep.js b/packages/ui/src/steps/LionStep.js
similarity index 98%
rename from packages/steps/src/LionStep.js
rename to packages/ui/src/steps/LionStep.js
index 78f3fdf70..ae589b414 100644
--- a/packages/steps/src/LionStep.js
+++ b/packages/ui/src/steps/LionStep.js
@@ -1,4 +1,4 @@
-import { css, html, LitElement } from '@lion/core';
+import { css, html, LitElement } from 'lit';
 
 /**
  * @typedef {import('./LionSteps').LionSteps} LionSteps
diff --git a/packages/steps/src/LionSteps.js b/packages/ui/src/steps/LionSteps.js
similarity index 98%
rename from packages/steps/src/LionSteps.js
rename to packages/ui/src/steps/LionSteps.js
index a16bca35b..a1720d6f8 100644
--- a/packages/steps/src/LionSteps.js
+++ b/packages/ui/src/steps/LionSteps.js
@@ -1,4 +1,4 @@
-import { css, html, LitElement } from '@lion/core';
+import { css, html, LitElement } from 'lit';
 
 /**
  * @typedef {import('./LionStep.js').LionStep} LionStep
diff --git a/packages/steps/refactorToStorybook/complex-demo-app.html b/packages/ui/src/steps/refactorToStorybook/complex-demo-app.html
similarity index 99%
rename from packages/steps/refactorToStorybook/complex-demo-app.html
rename to packages/ui/src/steps/refactorToStorybook/complex-demo-app.html
index 603da5f7c..4dae2eb1b 100644
--- a/packages/steps/refactorToStorybook/complex-demo-app.html
+++ b/packages/ui/src/steps/refactorToStorybook/complex-demo-app.html
@@ -4,7 +4,7 @@
 
 <script type="module">
   // eslint-disable-next-line import/no-extraneous-dependencies
-  import '@lion/steps/define';
+  import '@lion/ui/define/lion-steps.js';
 </script>
 
 <dom-module id="complex-demo-app">
diff --git a/packages/steps/refactorToStorybook/complex.html b/packages/ui/src/steps/refactorToStorybook/complex.html
similarity index 100%
rename from packages/steps/refactorToStorybook/complex.html
rename to packages/ui/src/steps/refactorToStorybook/complex.html
diff --git a/packages/steps/refactorToStorybook/data.json b/packages/ui/src/steps/refactorToStorybook/data.json
similarity index 100%
rename from packages/steps/refactorToStorybook/data.json
rename to packages/ui/src/steps/refactorToStorybook/data.json
diff --git a/packages/steps/test/lion-step.test.js b/packages/ui/src/steps/test/lion-step.test.js
similarity index 98%
rename from packages/steps/test/lion-step.test.js
rename to packages/ui/src/steps/test/lion-step.test.js
index d92a015eb..cc7e6b193 100644
--- a/packages/steps/test/lion-step.test.js
+++ b/packages/ui/src/steps/test/lion-step.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture, oneEvent } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 
-import '@lion/steps/define-step';
+import '@lion/ui/define/lion-step.js';
 
 /**
  * @typedef {import('../src/LionStep').LionStep} LionStep
diff --git a/packages/steps/test/lion-steps.test.js b/packages/ui/src/steps/test/lion-steps.test.js
similarity index 99%
rename from packages/steps/test/lion-steps.test.js
rename to packages/ui/src/steps/test/lion-steps.test.js
index 37ba286db..564749441 100644
--- a/packages/steps/test/lion-steps.test.js
+++ b/packages/ui/src/steps/test/lion-steps.test.js
@@ -1,7 +1,8 @@
 import { expect, fixture as _fixture, oneEvent } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import '@lion/steps/define';
+import '@lion/ui/define/lion-step.js';
+import '@lion/ui/define/lion-steps.js';
 
 /**
  * @typedef {import('../src/LionSteps').LionSteps} LionSteps
diff --git a/packages/switch/src/LionSwitch.js b/packages/ui/src/switch/LionSwitch.js
similarity index 95%
rename from packages/switch/src/LionSwitch.js
rename to packages/ui/src/switch/LionSwitch.js
index 8deaf8783..552d10140 100644
--- a/packages/switch/src/LionSwitch.js
+++ b/packages/ui/src/switch/LionSwitch.js
@@ -1,5 +1,6 @@
-import { css, html, ScopedElementsMixin } from '@lion/core';
-import { ChoiceInputMixin, LionField } from '@lion/form-core';
+import { css, html } from 'lit';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { ChoiceInputMixin, LionField } from '@lion/ui/form-core.js';
 import { LionSwitchButton } from './LionSwitchButton.js';
 
 export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField)) {
diff --git a/packages/switch/src/LionSwitchButton.js b/packages/ui/src/switch/LionSwitchButton.js
similarity index 97%
rename from packages/switch/src/LionSwitchButton.js
rename to packages/ui/src/switch/LionSwitchButton.js
index eea64c2b6..034032ab0 100644
--- a/packages/switch/src/LionSwitchButton.js
+++ b/packages/ui/src/switch/LionSwitchButton.js
@@ -1,4 +1,5 @@
-import { html, css, LitElement, DisabledWithTabIndexMixin } from '@lion/core';
+import { html, css, LitElement } from 'lit';
+import { DisabledWithTabIndexMixin } from '@lion/ui/core.js';
 
 export class LionSwitchButton extends DisabledWithTabIndexMixin(LitElement) {
   static get properties() {
diff --git a/packages/switch/test/lion-switch-button.test.js b/packages/ui/src/switch/test/lion-switch-button.test.js
similarity index 99%
rename from packages/switch/test/lion-switch-button.test.js
rename to packages/ui/src/switch/test/lion-switch-button.test.js
index e02666411..5932ec591 100644
--- a/packages/switch/test/lion-switch-button.test.js
+++ b/packages/ui/src/switch/test/lion-switch-button.test.js
@@ -1,7 +1,7 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import '@lion/switch/define-switch-button';
+import '@lion/ui/define/lion-switch-button.js';
 
 /**
  * @typedef {import('../src/LionSwitchButton').LionSwitchButton} LionSwitchButton
diff --git a/packages/switch/test/lion-switch.test.js b/packages/ui/src/switch/test/lion-switch.test.js
similarity index 97%
rename from packages/switch/test/lion-switch.test.js
rename to packages/ui/src/switch/test/lion-switch.test.js
index bd6998908..fbf1d8a32 100644
--- a/packages/switch/test/lion-switch.test.js
+++ b/packages/ui/src/switch/test/lion-switch.test.js
@@ -1,10 +1,11 @@
 import { expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import { Validator } from '@lion/form-core';
-import { LionSwitch } from '@lion/switch';
-import '@lion/switch/define';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { Validator } from '@lion/ui/form-core.js';
+import { LionSwitch } from '@lion/ui/switch.js';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+
+import '@lion/ui/define/lion-switch.js';
 
 /**
  * @typedef {import('../src/LionSwitchButton').LionSwitchButton} LionSwitchButton
diff --git a/packages/tabs/src/LionTabs.js b/packages/ui/src/tabs/LionTabs.js
similarity index 99%
rename from packages/tabs/src/LionTabs.js
rename to packages/ui/src/tabs/LionTabs.js
index 8a9757dab..e21d38567 100644
--- a/packages/tabs/src/LionTabs.js
+++ b/packages/ui/src/tabs/LionTabs.js
@@ -1,4 +1,5 @@
-import { css, html, LitElement, uuid } from '@lion/core';
+import { css, html, LitElement } from 'lit';
+import { uuid } from '@lion/ui/core.js';
 
 /**
  * @typedef {Object} StoreEntry
diff --git a/packages/tabs/test/lion-tabs.test.js b/packages/ui/src/tabs/test/lion-tabs.test.js
similarity index 99%
rename from packages/tabs/test/lion-tabs.test.js
rename to packages/ui/src/tabs/test/lion-tabs.test.js
index 4d0378de4..b1fccb0e5 100644
--- a/packages/tabs/test/lion-tabs.test.js
+++ b/packages/ui/src/tabs/test/lion-tabs.test.js
@@ -3,9 +3,9 @@ import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
 
 /**
- * @typedef {import('../src/LionTabs.js').LionTabs} LionTabs
+ * @typedef {import('../src/LionTabs.js.js').LionTabs} LionTabs
  */
-import '@lion/tabs/define';
+import '@lion/ui/define/lion-tabs.js';
 
 const basicTabs = html`
   <lion-tabs>
diff --git a/packages/textarea/src/LionTextarea.js b/packages/ui/src/textarea/LionTextarea.js
similarity index 98%
rename from packages/textarea/src/LionTextarea.js
rename to packages/ui/src/textarea/LionTextarea.js
index f2e681b7e..d8bf7a999 100644
--- a/packages/textarea/src/LionTextarea.js
+++ b/packages/ui/src/textarea/LionTextarea.js
@@ -1,8 +1,8 @@
 /* eslint-disable max-classes-per-file */
 // @ts-expect-error [external]: https://github.com/jackmoore/autosize/pull/384 wait for this, then we can switch to just 'autosize'; and then types will work!
 import autosize from 'autosize/src/autosize.js';
-import { LionField, NativeTextFieldMixin } from '@lion/form-core';
-import { css } from '@lion/core';
+import { LionField, NativeTextFieldMixin } from '@lion/ui/form-core.js';
+import { css } from 'lit';
 
 class LionFieldWithTextArea extends LionField {
   /**
diff --git a/packages/textarea/test/lion-textarea-integrations.test.js b/packages/ui/src/textarea/test/lion-textarea-integrations.test.js
similarity index 79%
rename from packages/textarea/test/lion-textarea-integrations.test.js
rename to packages/ui/src/textarea/test/lion-textarea-integrations.test.js
index 330fb7c31..dfaac9e78 100644
--- a/packages/textarea/test/lion-textarea-integrations.test.js
+++ b/packages/ui/src/textarea/test/lion-textarea-integrations.test.js
@@ -2,9 +2,9 @@ import {
   runInteractionStateMixinSuite,
   runFormatMixinSuite,
   runNativeTextFieldMixinSuite,
-} from '@lion/form-core/test-suites';
+} from '@lion/ui/form-core-test-suites.js';
 
-import '@lion/textarea/define';
+import '@lion/ui/define/lion-textarea.js';
 
 const tagString = 'lion-textarea';
 
diff --git a/packages/textarea/test/lion-textarea.test.js b/packages/ui/src/textarea/test/lion-textarea.test.js
similarity index 98%
rename from packages/textarea/test/lion-textarea.test.js
rename to packages/ui/src/textarea/test/lion-textarea.test.js
index 30f4bffb2..c09d0e5ec 100644
--- a/packages/textarea/test/lion-textarea.test.js
+++ b/packages/ui/src/textarea/test/lion-textarea.test.js
@@ -1,8 +1,9 @@
 import { aTimeout, expect, fixture as _fixture } from '@open-wc/testing';
 import { html } from 'lit/static-html.js';
 import sinon from 'sinon';
-import '@lion/textarea/define';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { getFormControlMembers } from '@lion/ui/form-core-test-helpers.js';
+
+import '@lion/ui/define/lion-textarea.js';
 
 /**
  * @typedef {import('../src/LionTextarea').LionTextarea} LionTextarea
diff --git a/packages/tooltip/src/LionTooltip.js b/packages/ui/src/tooltip/LionTooltip.js
similarity index 97%
rename from packages/tooltip/src/LionTooltip.js
rename to packages/ui/src/tooltip/LionTooltip.js
index ce73cd419..8622c86fa 100644
--- a/packages/tooltip/src/LionTooltip.js
+++ b/packages/ui/src/tooltip/LionTooltip.js
@@ -1,5 +1,5 @@
-import { css, LitElement } from '@lion/core';
-import { ArrowMixin, OverlayMixin } from '@lion/overlays';
+import { css, LitElement } from 'lit';
+import { ArrowMixin, OverlayMixin } from '@lion/ui/overlays.js';
 
 /**
  * @typedef {import('@lion/overlays/types/OverlayConfig').OverlayConfig} OverlayConfig
diff --git a/packages/tooltip/test/lion-tooltip.test.js b/packages/ui/src/tooltip/test/lion-tooltip.test.js
similarity index 99%
rename from packages/tooltip/test/lion-tooltip.test.js
rename to packages/ui/src/tooltip/test/lion-tooltip.test.js
index ee070c735..864324494 100644
--- a/packages/tooltip/test/lion-tooltip.test.js
+++ b/packages/ui/src/tooltip/test/lion-tooltip.test.js
@@ -1,9 +1,9 @@
-import '@lion/tooltip/define';
+import '@lion/ui/define/lion-tooltip.js';
 import { aTimeout, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js';
 
 /**
- * @typedef {import('../src/LionTooltip.js').LionTooltip} LionTooltip
+ * @typedef {import('../src/LionTooltip.js.js').LionTooltip} LionTooltip
  * @typedef {import('@lion/overlays/types/OverlayConfig').OverlayConfig} OverlayConfig
  */
 
diff --git a/packages/validate-messages/src/loadDefaultFeedbackMessages.js b/packages/ui/src/validate-messages/loadDefaultFeedbackMessages.js
similarity index 61%
rename from packages/validate-messages/src/loadDefaultFeedbackMessages.js
rename to packages/ui/src/validate-messages/loadDefaultFeedbackMessages.js
index 23fa2b02c..b049293f1 100644
--- a/packages/validate-messages/src/loadDefaultFeedbackMessages.js
+++ b/packages/ui/src/validate-messages/loadDefaultFeedbackMessages.js
@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { localize } from '@lion/localize';
+import { localize } from '@lion/ui/localize.js';
 import {
   DefaultSuccess,
   IsDate,
@@ -18,8 +18,8 @@ import {
   MinLength,
   MinMaxLength,
   Pattern,
-} from '@lion/form-core';
-import { PhoneNumber } from '@lion/input-tel';
+} from '@lion/ui/form-core.js';
+import { PhoneNumber } from '@lion/ui/input-tel.js';
 
 /**
  * @typedef {import('@lion/form-core/types').FeedbackMessageData} FeedbackMessageData
@@ -38,76 +38,76 @@ export function loadDefaultFeedbackMessages() {
         'lion-validate': /** @param {string} locale */ locale => {
           switch (locale) {
             case 'bg-BG':
-              return import('@lion/validate-messages/translations/bg-BG.js');
+              return import('@lion/ui/validate-messages-translations/bg-BG.js');
             case 'bg':
-              return import('@lion/validate-messages/translations/bg.js');
+              return import('@lion/ui/validate-messages-translations/bg.js');
             case 'cs-CZ':
-              return import('@lion/validate-messages/translations/cs-CZ.js');
+              return import('@lion/ui/validate-messages-translations/cs-CZ.js');
             case 'cs':
-              return import('@lion/validate-messages/translations/cs.js');
+              return import('@lion/ui/validate-messages-translations/cs.js');
             case 'de-DE':
-              return import('@lion/validate-messages/translations/de-DE.js');
+              return import('@lion/ui/validate-messages-translations/de-DE.js');
             case 'de':
-              return import('@lion/validate-messages/translations/de.js');
+              return import('@lion/ui/validate-messages-translations/de.js');
             case 'en-AU':
-              return import('@lion/validate-messages/translations/en-AU.js');
+              return import('@lion/ui/validate-messages-translations/en-AU.js');
             case 'en-GB':
-              return import('@lion/validate-messages/translations/en-GB.js');
+              return import('@lion/ui/validate-messages-translations/en-GB.js');
             case 'en-US':
-              return import('@lion/validate-messages/translations/en-US.js');
+              return import('@lion/ui/validate-messages-translations/en-US.js');
             case 'en-PH':
-              return import('@lion/validate-messages/translations/en-PH.js');
+              return import('@lion/ui/validate-messages-translations/en-PH.js');
             case 'en':
-              return import('@lion/validate-messages/translations/en.js');
+              return import('@lion/ui/validate-messages-translations/en.js');
             case 'es-ES':
-              return import('@lion/validate-messages/translations/es-ES.js');
+              return import('@lion/ui/validate-messages-translations/es-ES.js');
             case 'es':
-              return import('@lion/validate-messages/translations/es.js');
+              return import('@lion/ui/validate-messages-translations/es.js');
             case 'fr-FR':
-              return import('@lion/validate-messages/translations/fr-FR.js');
+              return import('@lion/ui/validate-messages-translations/fr-FR.js');
             case 'fr-BE':
-              return import('@lion/validate-messages/translations/fr-BE.js');
+              return import('@lion/ui/validate-messages-translations/fr-BE.js');
             case 'fr':
-              return import('@lion/validate-messages/translations/fr.js');
+              return import('@lion/ui/validate-messages-translations/fr.js');
             case 'hu-HU':
-              return import('@lion/validate-messages/translations/hu-HU.js');
+              return import('@lion/ui/validate-messages-translations/hu-HU.js');
             case 'hu':
-              return import('@lion/validate-messages/translations/hu.js');
+              return import('@lion/ui/validate-messages-translations/hu.js');
             case 'it-IT':
-              return import('@lion/validate-messages/translations/it-IT.js');
+              return import('@lion/ui/validate-messages-translations/it-IT.js');
             case 'it':
-              return import('@lion/validate-messages/translations/it.js');
+              return import('@lion/ui/validate-messages-translations/it.js');
             case 'nl-BE':
-              return import('@lion/validate-messages/translations/nl-BE.js');
+              return import('@lion/ui/validate-messages-translations/nl-BE.js');
             case 'nl-NL':
-              return import('@lion/validate-messages/translations/nl-NL.js');
+              return import('@lion/ui/validate-messages-translations/nl-NL.js');
             case 'nl':
-              return import('@lion/validate-messages/translations/nl.js');
+              return import('@lion/ui/validate-messages-translations/nl.js');
             case 'pl-PL':
-              return import('@lion/validate-messages/translations/pl-PL.js');
+              return import('@lion/ui/validate-messages-translations/pl-PL.js');
             case 'pl':
-              return import('@lion/validate-messages/translations/pl.js');
+              return import('@lion/ui/validate-messages-translations/pl.js');
             case 'ro-RO':
-              return import('@lion/validate-messages/translations/ro-RO.js');
+              return import('@lion/ui/validate-messages-translations/ro-RO.js');
             case 'ro':
-              return import('@lion/validate-messages/translations/ro.js');
+              return import('@lion/ui/validate-messages-translations/ro.js');
             case 'ru-RU':
-              return import('@lion/validate-messages/translations/ru-RU.js');
+              return import('@lion/ui/validate-messages-translations/ru-RU.js');
             case 'ru':
-              return import('@lion/validate-messages/translations/ru.js');
+              return import('@lion/ui/validate-messages-translations/ru.js');
             case 'sk-SK':
-              return import('@lion/validate-messages/translations/sk-SK.js');
+              return import('@lion/ui/validate-messages-translations/sk-SK.js');
             case 'sk':
-              return import('@lion/validate-messages/translations/sk.js');
+              return import('@lion/ui/validate-messages-translations/sk.js');
             case 'uk-UA':
-              return import('@lion/validate-messages/translations/uk-UA.js');
+              return import('@lion/ui/validate-messages-translations/uk-UA.js');
             case 'uk':
-              return import('@lion/validate-messages/translations/uk.js');
+              return import('@lion/ui/validate-messages-translations/uk.js');
             case 'zh-CN':
             case 'zh':
-              return import('@lion/validate-messages/translations/zh.js');
+              return import('@lion/ui/validate-messages-translations/zh.js');
             default:
-              return import('@lion/validate-messages/translations/en.js');
+              return import('@lion/ui/validate-messages-translations/en.js');
           }
         },
       },
diff --git a/packages/validate-messages/test/loadDefaultFeedbackMessages.test.js b/packages/ui/src/validate-messages/test/loadDefaultFeedbackMessages.test.js
similarity index 89%
rename from packages/validate-messages/test/loadDefaultFeedbackMessages.test.js
rename to packages/ui/src/validate-messages/test/loadDefaultFeedbackMessages.test.js
index 8712f3968..21b74b8b2 100644
--- a/packages/validate-messages/test/loadDefaultFeedbackMessages.test.js
+++ b/packages/ui/src/validate-messages/test/loadDefaultFeedbackMessages.test.js
@@ -1,8 +1,8 @@
 /* eslint-disable no-unused-vars, no-param-reassign */
 import { expect } from '@open-wc/testing';
-import { localize } from '@lion/localize';
-import { Required } from '@lion/form-core';
-import { loadDefaultFeedbackMessages } from '../src/loadDefaultFeedbackMessages.js';
+import { localize } from '@lion/ui/localize.js';
+import { Required } from '@lion/ui/form-core.js';
+import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
 
 /**
  * @typedef {import('@lion/form-core').Validator} Validator
diff --git a/packages/validate-messages/translations/bg-BG.js b/packages/ui/src/validate-messages/translations/bg-BG.js
similarity index 100%
rename from packages/validate-messages/translations/bg-BG.js
rename to packages/ui/src/validate-messages/translations/bg-BG.js
diff --git a/packages/validate-messages/translations/bg.js b/packages/ui/src/validate-messages/translations/bg.js
similarity index 100%
rename from packages/validate-messages/translations/bg.js
rename to packages/ui/src/validate-messages/translations/bg.js
diff --git a/packages/validate-messages/translations/cs-CZ.js b/packages/ui/src/validate-messages/translations/cs-CZ.js
similarity index 100%
rename from packages/validate-messages/translations/cs-CZ.js
rename to packages/ui/src/validate-messages/translations/cs-CZ.js
diff --git a/packages/validate-messages/translations/cs.js b/packages/ui/src/validate-messages/translations/cs.js
similarity index 100%
rename from packages/validate-messages/translations/cs.js
rename to packages/ui/src/validate-messages/translations/cs.js
diff --git a/packages/validate-messages/translations/de-DE.js b/packages/ui/src/validate-messages/translations/de-DE.js
similarity index 100%
rename from packages/validate-messages/translations/de-DE.js
rename to packages/ui/src/validate-messages/translations/de-DE.js
diff --git a/packages/validate-messages/translations/de.js b/packages/ui/src/validate-messages/translations/de.js
similarity index 100%
rename from packages/validate-messages/translations/de.js
rename to packages/ui/src/validate-messages/translations/de.js
diff --git a/packages/validate-messages/translations/en-AU.js b/packages/ui/src/validate-messages/translations/en-AU.js
similarity index 100%
rename from packages/validate-messages/translations/en-AU.js
rename to packages/ui/src/validate-messages/translations/en-AU.js
diff --git a/packages/validate-messages/translations/en-GB.js b/packages/ui/src/validate-messages/translations/en-GB.js
similarity index 100%
rename from packages/validate-messages/translations/en-GB.js
rename to packages/ui/src/validate-messages/translations/en-GB.js
diff --git a/packages/validate-messages/translations/en-PH.js b/packages/ui/src/validate-messages/translations/en-PH.js
similarity index 100%
rename from packages/validate-messages/translations/en-PH.js
rename to packages/ui/src/validate-messages/translations/en-PH.js
diff --git a/packages/validate-messages/translations/en-US.js b/packages/ui/src/validate-messages/translations/en-US.js
similarity index 100%
rename from packages/validate-messages/translations/en-US.js
rename to packages/ui/src/validate-messages/translations/en-US.js
diff --git a/packages/validate-messages/translations/en.js b/packages/ui/src/validate-messages/translations/en.js
similarity index 100%
rename from packages/validate-messages/translations/en.js
rename to packages/ui/src/validate-messages/translations/en.js
diff --git a/packages/validate-messages/translations/es-ES.js b/packages/ui/src/validate-messages/translations/es-ES.js
similarity index 100%
rename from packages/validate-messages/translations/es-ES.js
rename to packages/ui/src/validate-messages/translations/es-ES.js
diff --git a/packages/validate-messages/translations/es.js b/packages/ui/src/validate-messages/translations/es.js
similarity index 100%
rename from packages/validate-messages/translations/es.js
rename to packages/ui/src/validate-messages/translations/es.js
diff --git a/packages/validate-messages/translations/fr-BE.js b/packages/ui/src/validate-messages/translations/fr-BE.js
similarity index 100%
rename from packages/validate-messages/translations/fr-BE.js
rename to packages/ui/src/validate-messages/translations/fr-BE.js
diff --git a/packages/validate-messages/translations/fr-FR.js b/packages/ui/src/validate-messages/translations/fr-FR.js
similarity index 100%
rename from packages/validate-messages/translations/fr-FR.js
rename to packages/ui/src/validate-messages/translations/fr-FR.js
diff --git a/packages/validate-messages/translations/fr.js b/packages/ui/src/validate-messages/translations/fr.js
similarity index 100%
rename from packages/validate-messages/translations/fr.js
rename to packages/ui/src/validate-messages/translations/fr.js
diff --git a/packages/validate-messages/translations/hu-HU.js b/packages/ui/src/validate-messages/translations/hu-HU.js
similarity index 100%
rename from packages/validate-messages/translations/hu-HU.js
rename to packages/ui/src/validate-messages/translations/hu-HU.js
diff --git a/packages/validate-messages/translations/hu.js b/packages/ui/src/validate-messages/translations/hu.js
similarity index 100%
rename from packages/validate-messages/translations/hu.js
rename to packages/ui/src/validate-messages/translations/hu.js
diff --git a/packages/validate-messages/translations/it-IT.js b/packages/ui/src/validate-messages/translations/it-IT.js
similarity index 100%
rename from packages/validate-messages/translations/it-IT.js
rename to packages/ui/src/validate-messages/translations/it-IT.js
diff --git a/packages/validate-messages/translations/it.js b/packages/ui/src/validate-messages/translations/it.js
similarity index 100%
rename from packages/validate-messages/translations/it.js
rename to packages/ui/src/validate-messages/translations/it.js
diff --git a/packages/validate-messages/translations/nl-BE.js b/packages/ui/src/validate-messages/translations/nl-BE.js
similarity index 100%
rename from packages/validate-messages/translations/nl-BE.js
rename to packages/ui/src/validate-messages/translations/nl-BE.js
diff --git a/packages/validate-messages/translations/nl-NL.js b/packages/ui/src/validate-messages/translations/nl-NL.js
similarity index 100%
rename from packages/validate-messages/translations/nl-NL.js
rename to packages/ui/src/validate-messages/translations/nl-NL.js
diff --git a/packages/validate-messages/translations/nl.js b/packages/ui/src/validate-messages/translations/nl.js
similarity index 100%
rename from packages/validate-messages/translations/nl.js
rename to packages/ui/src/validate-messages/translations/nl.js
diff --git a/packages/validate-messages/translations/pl-PL.js b/packages/ui/src/validate-messages/translations/pl-PL.js
similarity index 100%
rename from packages/validate-messages/translations/pl-PL.js
rename to packages/ui/src/validate-messages/translations/pl-PL.js
diff --git a/packages/validate-messages/translations/pl.js b/packages/ui/src/validate-messages/translations/pl.js
similarity index 100%
rename from packages/validate-messages/translations/pl.js
rename to packages/ui/src/validate-messages/translations/pl.js
diff --git a/packages/validate-messages/translations/ro-RO.js b/packages/ui/src/validate-messages/translations/ro-RO.js
similarity index 100%
rename from packages/validate-messages/translations/ro-RO.js
rename to packages/ui/src/validate-messages/translations/ro-RO.js
diff --git a/packages/validate-messages/translations/ro.js b/packages/ui/src/validate-messages/translations/ro.js
similarity index 100%
rename from packages/validate-messages/translations/ro.js
rename to packages/ui/src/validate-messages/translations/ro.js
diff --git a/packages/validate-messages/translations/ru-RU.js b/packages/ui/src/validate-messages/translations/ru-RU.js
similarity index 100%
rename from packages/validate-messages/translations/ru-RU.js
rename to packages/ui/src/validate-messages/translations/ru-RU.js
diff --git a/packages/validate-messages/translations/ru.js b/packages/ui/src/validate-messages/translations/ru.js
similarity index 100%
rename from packages/validate-messages/translations/ru.js
rename to packages/ui/src/validate-messages/translations/ru.js
diff --git a/packages/validate-messages/translations/sk-SK.js b/packages/ui/src/validate-messages/translations/sk-SK.js
similarity index 100%
rename from packages/validate-messages/translations/sk-SK.js
rename to packages/ui/src/validate-messages/translations/sk-SK.js
diff --git a/packages/validate-messages/translations/sk.js b/packages/ui/src/validate-messages/translations/sk.js
similarity index 100%
rename from packages/validate-messages/translations/sk.js
rename to packages/ui/src/validate-messages/translations/sk.js
diff --git a/packages/validate-messages/translations/uk-UA.js b/packages/ui/src/validate-messages/translations/uk-UA.js
similarity index 100%
rename from packages/validate-messages/translations/uk-UA.js
rename to packages/ui/src/validate-messages/translations/uk-UA.js
diff --git a/packages/validate-messages/translations/uk.js b/packages/ui/src/validate-messages/translations/uk.js
similarity index 100%
rename from packages/validate-messages/translations/uk.js
rename to packages/ui/src/validate-messages/translations/uk.js
diff --git a/packages/validate-messages/translations/zh.js b/packages/ui/src/validate-messages/translations/zh.js
similarity index 100%
rename from packages/validate-messages/translations/zh.js
rename to packages/ui/src/validate-messages/translations/zh.js
diff --git a/packages/validate-messages/README.md b/packages/validate-messages/README.md
deleted file mode 100644
index 78088853f..000000000
--- a/packages/validate-messages/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lion Input
-
-[=> See Source <=](../../docs/components/input/overview.md)
diff --git a/packages/validate-messages/docs/overview.md b/packages/validate-messages/docs/overview.md
deleted file mode 100644
index 6ec15dfe0..000000000
--- a/packages/validate-messages/docs/overview.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Select Rich
-
-[=> See Source <=](../../../docs/components/select-rich/overview.md)
diff --git a/packages/validate-messages/docs/use-cases.md b/packages/validate-messages/docs/use-cases.md
deleted file mode 100644
index 651c7ae94..000000000
--- a/packages/validate-messages/docs/use-cases.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Select Rich Use Cases
-
-[=> See Source <=](../../../docs/components/select-rich/use-cases.md)
diff --git a/packages/validate-messages/index.js b/packages/validate-messages/index.js
deleted file mode 100644
index d4e356ef7..000000000
--- a/packages/validate-messages/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { loadDefaultFeedbackMessages } from './src/loadDefaultFeedbackMessages.js';
diff --git a/packages/validate-messages/package.json b/packages/validate-messages/package.json
deleted file mode 100644
index d1c3fc909..000000000
--- a/packages/validate-messages/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "name": "@lion/validate-messages",
-  "version": "0.10.1",
-  "description": "A set of localized messages for default Validators",
-  "license": "MIT",
-  "author": "ing-bank",
-  "homepage": "https://github.com/ing-bank/lion/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/validate-messages"
-  },
-  "type": "module",
-  "main": "index.js",
-  "module": "index.js",
-  "files": [
-    "*.d.ts",
-    "*.js",
-    "custom-elements.json",
-    "docs",
-    "src",
-    "test",
-    "test-helpers",
-    "translations",
-    "types"
-  ],
-  "scripts": {
-    "debug": "cd ../../ && npm run debug -- --group validate-messages",
-    "debug:firefox": "cd ../../ && npm run debug:firefox -- --group validate-messages",
-    "debug:webkit": "cd ../../ && npm run debug:webkit -- --group validate-messages",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../",
-    "prepublishOnly": "npm run publish-docs",
-    "test": "cd ../../ && npm run test:browser -- --group validate-messages"
-  },
-  "dependencies": {
-    "@lion/form-core": "^0.18.3",
-    "@lion/input-tel": "^0.2.3",
-    "@lion/localize": "^0.26.0"
-  },
-  "keywords": [
-    "feedback",
-    "lion",
-    "messages",
-    "translations",
-    "validate",
-    "web-components"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./translations/*": "./translations/*",
-    "./docs/*": "./docs/*"
-  }
-}
diff --git a/scripts/eslint-resolver.cjs b/scripts/eslint-resolver.cjs
new file mode 100644
index 000000000..92d4a21df
--- /dev/null
+++ b/scripts/eslint-resolver.cjs
@@ -0,0 +1,19 @@
+'use strict';
+
+const { createRequire, builtinModules } = require('module');
+
+exports.interfaceVersion = 2;
+
+exports.resolve = function (source, file, config) {
+  try {
+    if (builtinModules.includes(source)) {
+      return { found: true, path: null };
+    }
+    const myRequire = createRequire(file);
+    const resolvedPath = myRequire.resolve(source);
+
+    return { found: true, path: resolvedPath };
+  } catch (err) {
+    return { found: false };
+  }
+};
diff --git a/web-test-runner.config.mjs b/web-test-runner.config.mjs
index ed769458d..3c3a53895 100644
--- a/web-test-runner.config.mjs
+++ b/web-test-runner.config.mjs
@@ -2,21 +2,23 @@ import fs from 'fs';
 import { playwrightLauncher } from '@web/test-runner-playwright';
 
 const packages = fs
-  .readdirSync('packages')
+  .readdirSync('packages/ui/src')
   .filter(
-    dir => fs.statSync(`packages/${dir}`).isDirectory() && fs.existsSync(`packages/${dir}/test`),
-  )
-  // .filter(x => x.endsWith('-dropdown'))
-  .concat(
-    fs
-      .readdirSync('packages/helpers')
-      .filter(
-        dir =>
-          fs.statSync(`packages/helpers/${dir}`).isDirectory() &&
-          fs.existsSync(`packages/helpers/${dir}/test`),
-      )
-      .map(dir => `helpers/${dir}`),
+    dir =>
+      fs.statSync(`packages/ui/src/${dir}`).isDirectory() &&
+      fs.existsSync(`packages/ui/src/${dir}/test`),
   );
+// .filter(x => x.endsWith('-dropdown'))
+// .concat(
+//   fs
+//     .readdirSync('packages/helpers')
+//     .filter(
+//       dir =>
+//         fs.statSync(`packages/helpers/${dir}`).isDirectory() &&
+//         fs.existsSync(`packages/helpers/${dir}/test`),
+//     )
+//     .map(dir => `helpers/${dir}`),
+// );
 
 export default {
   nodeResolve: true,
@@ -32,7 +34,7 @@ export default {
   },
   testFramework: {
     config: {
-      timeout: '3000',
+      timeout: '5000',
     },
   },
   browsers: [
@@ -42,6 +44,6 @@ export default {
   ],
   groups: packages.map(pkg => ({
     name: pkg,
-    files: `packages/${pkg}/test/**/*.test.js`,
+    files: `packages/ui/src/${pkg}/test/**/*.test.js`,
   })),
 };