diff --git a/.circleci/config.yml b/.circleci/config.yml
index d74f5e3672d2..5e926c7e8ca6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -267,7 +267,7 @@ jobs:
           at: .
       - codecov/upload
       - report-workflow-on-failure
-  chromatic-internal-storybooks:
+  chromatic-internal-storybook:
     executor:
       class: medium+
       name: sb_node_18_browsers
@@ -280,10 +280,8 @@ jobs:
           at: .
       - run:
           name: Running Chromatic
-          command: |
-            cd code
-            yarn storybook:ui:chromatic
-            yarn storybook:blocks:chromatic
+          command: yarn storybook:ui:chromatic
+          working_directory: code
       - report-workflow-on-failure
       - store_test_results:
           path: test-results
@@ -655,7 +653,7 @@ workflows:
       - script-checks:
           requires:
             - build
-      - chromatic-internal-storybooks:
+      - chromatic-internal-storybook:
           requires:
             - build
       - coverage:
@@ -717,7 +715,7 @@ workflows:
       - script-checks:
           requires:
             - build
-      - chromatic-internal-storybooks:
+      - chromatic-internal-storybook:
           requires:
             - build
       - coverage:
@@ -780,7 +778,7 @@ workflows:
       - script-checks:
           requires:
             - build
-      - chromatic-internal-storybooks:
+      - chromatic-internal-storybook:
           requires:
             - build
       - create-sandboxes:
diff --git a/code/.eslintrc.js b/code/.eslintrc.js
index 4cc444790ddb..f3f4206c8da8 100644
--- a/code/.eslintrc.js
+++ b/code/.eslintrc.js
@@ -9,10 +9,6 @@ const addonsPackages = fs
 const libPackages = fs
   .readdirSync(path.join(__dirname, 'lib'))
   .filter((p) => fs.statSync(path.join(__dirname, 'lib', p)).isDirectory());
-const uiPackages = fs
-  .readdirSync(path.join(__dirname, 'ui'))
-  .filter((p) => fs.statSync(path.join(__dirname, 'ui', p)).isDirectory())
-  .filter((p) => !p.startsWith('.'));
 
 module.exports = {
   root: true,
@@ -104,7 +100,7 @@ module.exports = {
       },
     },
     {
-      files: ['**/ui/.storybook/**'],
+      files: ['**/.storybook/**'],
       rules: {
         'import/no-extraneous-dependencies': [
           'error',
@@ -124,19 +120,6 @@ module.exports = {
         ],
       },
     })),
-    ...uiPackages.map((directory) => ({
-      files: [path.join('**', 'ui', directory, '**', '*.*')],
-      rules: {
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            packageDir: [__dirname, path.join(__dirname, 'ui', directory)],
-            devDependencies: true,
-            peerDependencies: true,
-          },
-        ],
-      },
-    })),
     ...libPackages.map((directory) => ({
       files: [path.join('**', 'lib', directory, '**', '*.*')],
       rules: {
diff --git a/code/ui/.storybook/isChromatic.ts b/code/.storybook/isChromatic.ts
similarity index 100%
rename from code/ui/.storybook/isChromatic.ts
rename to code/.storybook/isChromatic.ts
diff --git a/code/.storybook/main.ts b/code/.storybook/main.ts
new file mode 100644
index 000000000000..b1a6bab8bdc9
--- /dev/null
+++ b/code/.storybook/main.ts
@@ -0,0 +1,87 @@
+import path from 'path';
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import { mergeConfig } from 'vite';
+import type { StorybookConfig } from '../frameworks/react-vite';
+
+const componentsPath = path.join(__dirname, '../core/src/components');
+const managerApiPath = path.join(__dirname, '../core/src/manager-api');
+
+const config: StorybookConfig = {
+  stories: [
+    {
+      directory: '../core/src/manager',
+      titlePrefix: '@manager',
+    },
+    {
+      directory: '../core/src/preview-api',
+      titlePrefix: '@preview',
+    },
+    {
+      directory: '../core/src/components',
+      titlePrefix: '@components',
+    },
+    {
+      directory: '../lib/blocks/src',
+      titlePrefix: '@blocks',
+    },
+    {
+      directory: '../addons/controls/src',
+      titlePrefix: '@addons/controls',
+    },
+    {
+      directory: '../addons/onboarding/src',
+      titlePrefix: '@addons/onboarding',
+    },
+    {
+      directory: '../addons/interactions/src',
+      titlePrefix: '@addons/interactions',
+    },
+  ],
+  addons: [
+    '@storybook/addon-links',
+    '@storybook/addon-essentials',
+    '@storybook/addon-interactions',
+    '@storybook/addon-storysource',
+    '@storybook/addon-designs',
+    '@storybook/addon-a11y',
+    '@chromatic-com/storybook',
+  ],
+  build: {
+    test: {
+      // we have stories for the blocks here, we can't exclude them
+      disableBlocks: false,
+      // some stories in blocks (ArgTypes, Controls) depends on argTypes inference
+      disableDocgen: false,
+    },
+  },
+  framework: {
+    name: '@storybook/react-vite',
+    options: {},
+  },
+  core: {
+    disableTelemetry: true,
+  },
+  viteFinal: (viteConfig, { configType }) =>
+    mergeConfig(viteConfig, {
+      resolve: {
+        alias: {
+          ...(configType === 'DEVELOPMENT'
+            ? {
+                '@storybook/components': componentsPath,
+                'storybook/components': componentsPath,
+                '@storybook/manager-api': managerApiPath,
+                'storybook/manager-api': managerApiPath,
+              }
+            : {}),
+        },
+      },
+      optimizeDeps: { force: true },
+      build: {
+        // disable sourcemaps in CI to not run out of memory
+        sourcemap: process.env.CI !== 'true',
+      },
+    }),
+  logLevel: 'debug',
+};
+
+export default config;
diff --git a/code/ui/.storybook/manager.tsx b/code/.storybook/manager.tsx
similarity index 100%
rename from code/ui/.storybook/manager.tsx
rename to code/.storybook/manager.tsx
diff --git a/code/ui/.storybook/preview-head.html b/code/.storybook/preview-head.html
similarity index 100%
rename from code/ui/.storybook/preview-head.html
rename to code/.storybook/preview-head.html
diff --git a/code/ui/.storybook/preview.tsx b/code/.storybook/preview.tsx
similarity index 98%
rename from code/ui/.storybook/preview.tsx
rename to code/.storybook/preview.tsx
index b26224b106e0..30da95f9b47d 100644
--- a/code/ui/.storybook/preview.tsx
+++ b/code/.storybook/preview.tsx
@@ -17,7 +17,7 @@ import type { Channel } from 'storybook/channels';
 
 import { DocsContext } from '@storybook/blocks';
 
-import { DocsPageWrapper } from '../blocks/src/components';
+import { DocsPageWrapper } from '../lib/blocks/src/components';
 
 const { document } = global;
 
@@ -107,7 +107,7 @@ export const loaders = [
     if (!relativeCsfPaths) return {};
     const csfFiles = await Promise.all(
       (relativeCsfPaths as string[]).map(async (blocksRelativePath) => {
-        const projectRelativePath = `./ui/blocks/src/${blocksRelativePath.replace(
+        const projectRelativePath = `./lib/blocks/src/${blocksRelativePath.replace(
           /^..\//,
           ''
         )}.tsx`;
diff --git a/code/addons/interactions/src/components/InteractionsPanel.stories.tsx b/code/addons/interactions/src/components/InteractionsPanel.stories.tsx
index 609ab8f16275..93789fa77006 100644
--- a/code/addons/interactions/src/components/InteractionsPanel.stories.tsx
+++ b/code/addons/interactions/src/components/InteractionsPanel.stories.tsx
@@ -3,7 +3,7 @@ import type { StoryObj, Meta } from '@storybook/react';
 import { CallStates } from '@storybook/instrumenter';
 import { styled } from 'storybook/theming';
 import { userEvent, within, waitFor, expect } from '@storybook/test';
-import { isChromatic } from '../../../../ui/.storybook/isChromatic';
+import { isChromatic } from '../../../../.storybook/isChromatic';
 
 import { getCalls, getInteractions } from '../mocks';
 import { InteractionsPanel } from './InteractionsPanel';
diff --git a/code/chromatic.config.json b/code/chromatic.config.json
index a2ed8ccde24c..c8b84125b00f 100644
--- a/code/chromatic.config.json
+++ b/code/chromatic.config.json
@@ -3,7 +3,7 @@
   "projectToken": "80b312430ec4",
   "buildScriptName": "storybook:ui:build",
   "onlyChanged": false,
-  "storybookConfigDir": "ui/.storybook",
+  "storybookConfigDir": ".storybook",
   "storybookBaseDir": "./code",
   "zip": true
 }
diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts
index 2a4f55e45320..7276888e3941 100644
--- a/code/core/src/common/versions.ts
+++ b/code/core/src/common/versions.ts
@@ -56,6 +56,7 @@ export default {
   '@storybook/vue3-webpack5': '8.2.0-alpha.10',
   '@storybook/web-components-vite': '8.2.0-alpha.10',
   '@storybook/web-components-webpack5': '8.2.0-alpha.10',
+  '@storybook/blocks': '8.2.0-alpha.10',
   storybook: '8.2.0-alpha.10',
   sb: '8.2.0-alpha.10',
   '@storybook/cli': '8.2.0-alpha.10',
@@ -80,5 +81,4 @@ export default {
   '@storybook/svelte': '8.2.0-alpha.10',
   '@storybook/vue3': '8.2.0-alpha.10',
   '@storybook/web-components': '8.2.0-alpha.10',
-  '@storybook/blocks': '8.2.0-alpha.10',
 };
diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts b/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts
index 65716555042f..8d8ce89ae44f 100644
--- a/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts
+++ b/code/core/src/preview-api/modules/preview-web/PreviewWeb.integration.test.ts
@@ -30,7 +30,7 @@ vi.mock('@storybook/core/channels', async (importOriginal) => {
   };
 });
 vi.mock('@storybook/blocks', async () => {
-  const { CodeOrSourceMdx } = await import('../../../../../ui/blocks/src/blocks/mdx');
+  const { CodeOrSourceMdx } = await import('../../../../../lib/blocks/src/blocks/mdx');
   return {
     Docs: vi.fn(() => 'Docs'),
     CodeOrSourceMdx: CodeOrSourceMdx,
diff --git a/code/deprecated/components/package.json b/code/deprecated/components/package.json
index 9db2c37ceb59..be6a0734f7c1 100644
--- a/code/deprecated/components/package.json
+++ b/code/deprecated/components/package.json
@@ -5,14 +5,14 @@
   "keywords": [
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/ui/components",
+  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/deprecated/components",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "code/ui/components"
+    "directory": "code/deprecated/components"
   },
   "funding": {
     "type": "opencollective",
diff --git a/code/deprecated/manager/package.json b/code/deprecated/manager/package.json
index 46663b0c8267..8e3f558dcc79 100644
--- a/code/deprecated/manager/package.json
+++ b/code/deprecated/manager/package.json
@@ -5,14 +5,14 @@
   "keywords": [
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/ui/manager",
+  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/deprecated/manager",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "code/ui/manager"
+    "directory": "code/deprecated/manager"
   },
   "funding": {
     "type": "opencollective",
diff --git a/code/ui/blocks/README.md b/code/lib/blocks/README.md
similarity index 100%
rename from code/ui/blocks/README.md
rename to code/lib/blocks/README.md
diff --git a/code/ui/blocks/package.json b/code/lib/blocks/package.json
similarity index 97%
rename from code/ui/blocks/package.json
rename to code/lib/blocks/package.json
index 4c438a76da3b..2903f0b5d2a1 100644
--- a/code/ui/blocks/package.json
+++ b/code/lib/blocks/package.json
@@ -5,14 +5,14 @@
   "keywords": [
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/ui/blocks",
+  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/blocks",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "code/ui/blocks"
+    "directory": "code/lib/blocks"
   },
   "funding": {
     "type": "opencollective",
diff --git a/code/ui/blocks/project.json b/code/lib/blocks/project.json
similarity index 100%
rename from code/ui/blocks/project.json
rename to code/lib/blocks/project.json
diff --git a/code/ui/blocks/src/blocks/Anchor.stories.tsx b/code/lib/blocks/src/blocks/Anchor.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Anchor.stories.tsx
rename to code/lib/blocks/src/blocks/Anchor.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Anchor.tsx b/code/lib/blocks/src/blocks/Anchor.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Anchor.tsx
rename to code/lib/blocks/src/blocks/Anchor.tsx
diff --git a/code/ui/blocks/src/blocks/ArgTypes.stories.tsx b/code/lib/blocks/src/blocks/ArgTypes.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/ArgTypes.stories.tsx
rename to code/lib/blocks/src/blocks/ArgTypes.stories.tsx
diff --git a/code/ui/blocks/src/blocks/ArgTypes.tsx b/code/lib/blocks/src/blocks/ArgTypes.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/ArgTypes.tsx
rename to code/lib/blocks/src/blocks/ArgTypes.tsx
diff --git a/code/ui/blocks/src/blocks/Canvas.stories.tsx b/code/lib/blocks/src/blocks/Canvas.stories.tsx
similarity index 99%
rename from code/ui/blocks/src/blocks/Canvas.stories.tsx
rename to code/lib/blocks/src/blocks/Canvas.stories.tsx
index 3a4184b2bc65..bc5f889b995a 100644
--- a/code/ui/blocks/src/blocks/Canvas.stories.tsx
+++ b/code/lib/blocks/src/blocks/Canvas.stories.tsx
@@ -81,7 +81,7 @@ export const PropAdditionalActions: Story = {
         title: 'Open in GitHub',
         onClick: () => {
           window.open(
-            'https://github.com/storybookjs/storybook/blob/next/code/ui/blocks/src/examples/Button.stories.tsx',
+            'https://github.com/storybookjs/storybook/blob/next/code/lib/blocks/src/examples/Button.stories.tsx',
             '_blank'
           );
         },
diff --git a/code/ui/blocks/src/blocks/Canvas.tsx b/code/lib/blocks/src/blocks/Canvas.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Canvas.tsx
rename to code/lib/blocks/src/blocks/Canvas.tsx
diff --git a/code/ui/blocks/src/blocks/Controls.stories.tsx b/code/lib/blocks/src/blocks/Controls.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Controls.stories.tsx
rename to code/lib/blocks/src/blocks/Controls.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Controls.tsx b/code/lib/blocks/src/blocks/Controls.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Controls.tsx
rename to code/lib/blocks/src/blocks/Controls.tsx
diff --git a/code/ui/blocks/src/blocks/Description.stories.tsx b/code/lib/blocks/src/blocks/Description.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Description.stories.tsx
rename to code/lib/blocks/src/blocks/Description.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Description.tsx b/code/lib/blocks/src/blocks/Description.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Description.tsx
rename to code/lib/blocks/src/blocks/Description.tsx
diff --git a/code/ui/blocks/src/blocks/Docs.tsx b/code/lib/blocks/src/blocks/Docs.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Docs.tsx
rename to code/lib/blocks/src/blocks/Docs.tsx
diff --git a/code/ui/blocks/src/blocks/DocsContainer.tsx b/code/lib/blocks/src/blocks/DocsContainer.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsContainer.tsx
rename to code/lib/blocks/src/blocks/DocsContainer.tsx
diff --git a/code/ui/blocks/src/blocks/DocsContext.ts b/code/lib/blocks/src/blocks/DocsContext.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsContext.ts
rename to code/lib/blocks/src/blocks/DocsContext.ts
diff --git a/code/ui/blocks/src/blocks/DocsPage.stories.tsx b/code/lib/blocks/src/blocks/DocsPage.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsPage.stories.tsx
rename to code/lib/blocks/src/blocks/DocsPage.stories.tsx
diff --git a/code/ui/blocks/src/blocks/DocsPage.test.ts b/code/lib/blocks/src/blocks/DocsPage.test.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsPage.test.ts
rename to code/lib/blocks/src/blocks/DocsPage.test.ts
diff --git a/code/ui/blocks/src/blocks/DocsPage.tsx b/code/lib/blocks/src/blocks/DocsPage.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsPage.tsx
rename to code/lib/blocks/src/blocks/DocsPage.tsx
diff --git a/code/ui/blocks/src/blocks/DocsStory.tsx b/code/lib/blocks/src/blocks/DocsStory.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/DocsStory.tsx
rename to code/lib/blocks/src/blocks/DocsStory.tsx
diff --git a/code/ui/blocks/src/blocks/Heading.tsx b/code/lib/blocks/src/blocks/Heading.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Heading.tsx
rename to code/lib/blocks/src/blocks/Heading.tsx
diff --git a/code/ui/blocks/src/blocks/Markdown.stories.tsx b/code/lib/blocks/src/blocks/Markdown.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Markdown.stories.tsx
rename to code/lib/blocks/src/blocks/Markdown.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Markdown.tsx b/code/lib/blocks/src/blocks/Markdown.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Markdown.tsx
rename to code/lib/blocks/src/blocks/Markdown.tsx
diff --git a/code/ui/blocks/src/blocks/Meta.tsx b/code/lib/blocks/src/blocks/Meta.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Meta.tsx
rename to code/lib/blocks/src/blocks/Meta.tsx
diff --git a/code/ui/blocks/src/blocks/Primary.stories.tsx b/code/lib/blocks/src/blocks/Primary.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Primary.stories.tsx
rename to code/lib/blocks/src/blocks/Primary.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Primary.tsx b/code/lib/blocks/src/blocks/Primary.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Primary.tsx
rename to code/lib/blocks/src/blocks/Primary.tsx
diff --git a/code/ui/blocks/src/blocks/Source.stories.tsx b/code/lib/blocks/src/blocks/Source.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Source.stories.tsx
rename to code/lib/blocks/src/blocks/Source.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Source.tsx b/code/lib/blocks/src/blocks/Source.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Source.tsx
rename to code/lib/blocks/src/blocks/Source.tsx
diff --git a/code/ui/blocks/src/blocks/SourceContainer.tsx b/code/lib/blocks/src/blocks/SourceContainer.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/SourceContainer.tsx
rename to code/lib/blocks/src/blocks/SourceContainer.tsx
diff --git a/code/ui/blocks/src/blocks/Stories.stories.tsx b/code/lib/blocks/src/blocks/Stories.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Stories.stories.tsx
rename to code/lib/blocks/src/blocks/Stories.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Stories.tsx b/code/lib/blocks/src/blocks/Stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Stories.tsx
rename to code/lib/blocks/src/blocks/Stories.tsx
diff --git a/code/ui/blocks/src/blocks/Story.stories.tsx b/code/lib/blocks/src/blocks/Story.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Story.stories.tsx
rename to code/lib/blocks/src/blocks/Story.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Story.tsx b/code/lib/blocks/src/blocks/Story.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Story.tsx
rename to code/lib/blocks/src/blocks/Story.tsx
diff --git a/code/ui/blocks/src/blocks/Subheading.tsx b/code/lib/blocks/src/blocks/Subheading.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Subheading.tsx
rename to code/lib/blocks/src/blocks/Subheading.tsx
diff --git a/code/ui/blocks/src/blocks/Subtitle.stories.tsx b/code/lib/blocks/src/blocks/Subtitle.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Subtitle.stories.tsx
rename to code/lib/blocks/src/blocks/Subtitle.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Subtitle.tsx b/code/lib/blocks/src/blocks/Subtitle.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Subtitle.tsx
rename to code/lib/blocks/src/blocks/Subtitle.tsx
diff --git a/code/ui/blocks/src/blocks/Title.stories.tsx b/code/lib/blocks/src/blocks/Title.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Title.stories.tsx
rename to code/lib/blocks/src/blocks/Title.stories.tsx
diff --git a/code/ui/blocks/src/blocks/Title.tsx b/code/lib/blocks/src/blocks/Title.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Title.tsx
rename to code/lib/blocks/src/blocks/Title.tsx
diff --git a/code/ui/blocks/src/blocks/Unstyled.mdx b/code/lib/blocks/src/blocks/Unstyled.mdx
similarity index 96%
rename from code/ui/blocks/src/blocks/Unstyled.mdx
rename to code/lib/blocks/src/blocks/Unstyled.mdx
index c50246fd7918..48d35ca1bd44 100644
--- a/code/ui/blocks/src/blocks/Unstyled.mdx
+++ b/code/lib/blocks/src/blocks/Unstyled.mdx
@@ -1,4 +1,4 @@
-import { Unstyled } from './Unstyled.tsx';
+import { Unstyled } from './Unstyled';
 
 # The Unstyled Block
 
diff --git a/code/ui/blocks/src/blocks/Unstyled.tsx b/code/lib/blocks/src/blocks/Unstyled.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Unstyled.tsx
rename to code/lib/blocks/src/blocks/Unstyled.tsx
diff --git a/code/ui/blocks/src/blocks/Wrapper.tsx b/code/lib/blocks/src/blocks/Wrapper.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/Wrapper.tsx
rename to code/lib/blocks/src/blocks/Wrapper.tsx
diff --git a/code/ui/blocks/src/blocks/external/ExternalDocs.tsx b/code/lib/blocks/src/blocks/external/ExternalDocs.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/external/ExternalDocs.tsx
rename to code/lib/blocks/src/blocks/external/ExternalDocs.tsx
diff --git a/code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx b/code/lib/blocks/src/blocks/external/ExternalDocsContainer.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/external/ExternalDocsContainer.tsx
rename to code/lib/blocks/src/blocks/external/ExternalDocsContainer.tsx
diff --git a/code/ui/blocks/src/blocks/external/ExternalDocsContext.ts b/code/lib/blocks/src/blocks/external/ExternalDocsContext.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/external/ExternalDocsContext.ts
rename to code/lib/blocks/src/blocks/external/ExternalDocsContext.ts
diff --git a/code/ui/blocks/src/blocks/external/ExternalPreview.ts b/code/lib/blocks/src/blocks/external/ExternalPreview.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/external/ExternalPreview.ts
rename to code/lib/blocks/src/blocks/external/ExternalPreview.ts
diff --git a/code/ui/blocks/src/blocks/index.ts b/code/lib/blocks/src/blocks/index.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/index.ts
rename to code/lib/blocks/src/blocks/index.ts
diff --git a/code/ui/blocks/src/blocks/internal/README.md b/code/lib/blocks/src/blocks/internal/README.md
similarity index 100%
rename from code/ui/blocks/src/blocks/internal/README.md
rename to code/lib/blocks/src/blocks/internal/README.md
diff --git a/code/ui/blocks/src/blocks/mdx.tsx b/code/lib/blocks/src/blocks/mdx.tsx
similarity index 100%
rename from code/ui/blocks/src/blocks/mdx.tsx
rename to code/lib/blocks/src/blocks/mdx.tsx
diff --git a/code/ui/blocks/src/blocks/types.ts b/code/lib/blocks/src/blocks/types.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/types.ts
rename to code/lib/blocks/src/blocks/types.ts
diff --git a/code/ui/blocks/src/blocks/useArgs.ts b/code/lib/blocks/src/blocks/useArgs.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/useArgs.ts
rename to code/lib/blocks/src/blocks/useArgs.ts
diff --git a/code/ui/blocks/src/blocks/useGlobals.ts b/code/lib/blocks/src/blocks/useGlobals.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/useGlobals.ts
rename to code/lib/blocks/src/blocks/useGlobals.ts
diff --git a/code/ui/blocks/src/blocks/useOf.ts b/code/lib/blocks/src/blocks/useOf.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/useOf.ts
rename to code/lib/blocks/src/blocks/useOf.ts
diff --git a/code/ui/blocks/src/blocks/useStory.ts b/code/lib/blocks/src/blocks/useStory.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/useStory.ts
rename to code/lib/blocks/src/blocks/useStory.ts
diff --git a/code/ui/blocks/src/blocks/utils.ts b/code/lib/blocks/src/blocks/utils.ts
similarity index 100%
rename from code/ui/blocks/src/blocks/utils.ts
rename to code/lib/blocks/src/blocks/utils.ts
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgControl.tsx b/code/lib/blocks/src/components/ArgsTable/ArgControl.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgControl.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgControl.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx b/code/lib/blocks/src/components/ArgsTable/ArgJsDoc.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgJsDoc.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgRow.stories.tsx b/code/lib/blocks/src/components/ArgsTable/ArgRow.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgRow.stories.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgRow.stories.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx b/code/lib/blocks/src/components/ArgsTable/ArgRow.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgRow.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgRow.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx b/code/lib/blocks/src/components/ArgsTable/ArgValue.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgValue.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgValue.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgsTable.stories.tsx b/code/lib/blocks/src/components/ArgsTable/ArgsTable.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgsTable.stories.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgsTable.stories.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx b/code/lib/blocks/src/components/ArgsTable/ArgsTable.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx
rename to code/lib/blocks/src/components/ArgsTable/ArgsTable.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/Empty.tsx b/code/lib/blocks/src/components/ArgsTable/Empty.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/Empty.tsx
rename to code/lib/blocks/src/components/ArgsTable/Empty.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/SectionRow.stories.tsx b/code/lib/blocks/src/components/ArgsTable/SectionRow.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/SectionRow.stories.tsx
rename to code/lib/blocks/src/components/ArgsTable/SectionRow.stories.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx b/code/lib/blocks/src/components/ArgsTable/SectionRow.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/SectionRow.tsx
rename to code/lib/blocks/src/components/ArgsTable/SectionRow.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/Skeleton.tsx b/code/lib/blocks/src/components/ArgsTable/Skeleton.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/Skeleton.tsx
rename to code/lib/blocks/src/components/ArgsTable/Skeleton.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.stories.tsx b/code/lib/blocks/src/components/ArgsTable/TabbedArgsTable.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.stories.tsx
rename to code/lib/blocks/src/components/ArgsTable/TabbedArgsTable.stories.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx b/code/lib/blocks/src/components/ArgsTable/TabbedArgsTable.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx
rename to code/lib/blocks/src/components/ArgsTable/TabbedArgsTable.tsx
diff --git a/code/ui/blocks/src/components/ArgsTable/index.ts b/code/lib/blocks/src/components/ArgsTable/index.ts
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/index.ts
rename to code/lib/blocks/src/components/ArgsTable/index.ts
diff --git a/code/ui/blocks/src/components/ArgsTable/types.ts b/code/lib/blocks/src/components/ArgsTable/types.ts
similarity index 100%
rename from code/ui/blocks/src/components/ArgsTable/types.ts
rename to code/lib/blocks/src/components/ArgsTable/types.ts
diff --git a/code/ui/blocks/src/components/BlockBackgroundStyles.tsx b/code/lib/blocks/src/components/BlockBackgroundStyles.tsx
similarity index 100%
rename from code/ui/blocks/src/components/BlockBackgroundStyles.tsx
rename to code/lib/blocks/src/components/BlockBackgroundStyles.tsx
diff --git a/code/ui/blocks/src/components/ColorPalette.stories.tsx b/code/lib/blocks/src/components/ColorPalette.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ColorPalette.stories.tsx
rename to code/lib/blocks/src/components/ColorPalette.stories.tsx
diff --git a/code/ui/blocks/src/components/ColorPalette.tsx b/code/lib/blocks/src/components/ColorPalette.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ColorPalette.tsx
rename to code/lib/blocks/src/components/ColorPalette.tsx
diff --git a/code/ui/blocks/src/components/DocsPage.stories.tsx b/code/lib/blocks/src/components/DocsPage.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/DocsPage.stories.tsx
rename to code/lib/blocks/src/components/DocsPage.stories.tsx
diff --git a/code/ui/blocks/src/components/DocsPage.tsx b/code/lib/blocks/src/components/DocsPage.tsx
similarity index 100%
rename from code/ui/blocks/src/components/DocsPage.tsx
rename to code/lib/blocks/src/components/DocsPage.tsx
diff --git a/code/ui/blocks/src/components/DocsPageExampleCaption.md b/code/lib/blocks/src/components/DocsPageExampleCaption.md
similarity index 100%
rename from code/ui/blocks/src/components/DocsPageExampleCaption.md
rename to code/lib/blocks/src/components/DocsPageExampleCaption.md
diff --git a/code/ui/blocks/src/components/DocsPageExampleCaption.mdx b/code/lib/blocks/src/components/DocsPageExampleCaption.mdx
similarity index 100%
rename from code/ui/blocks/src/components/DocsPageExampleCaption.mdx
rename to code/lib/blocks/src/components/DocsPageExampleCaption.mdx
diff --git a/code/ui/blocks/src/components/EmptyBlock.stories.tsx b/code/lib/blocks/src/components/EmptyBlock.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/EmptyBlock.stories.tsx
rename to code/lib/blocks/src/components/EmptyBlock.stories.tsx
diff --git a/code/ui/blocks/src/components/EmptyBlock.tsx b/code/lib/blocks/src/components/EmptyBlock.tsx
similarity index 100%
rename from code/ui/blocks/src/components/EmptyBlock.tsx
rename to code/lib/blocks/src/components/EmptyBlock.tsx
diff --git a/code/ui/blocks/src/components/IFrame.tsx b/code/lib/blocks/src/components/IFrame.tsx
similarity index 100%
rename from code/ui/blocks/src/components/IFrame.tsx
rename to code/lib/blocks/src/components/IFrame.tsx
diff --git a/code/ui/blocks/src/components/IconGallery.stories.tsx b/code/lib/blocks/src/components/IconGallery.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/IconGallery.stories.tsx
rename to code/lib/blocks/src/components/IconGallery.stories.tsx
diff --git a/code/ui/blocks/src/components/IconGallery.tsx b/code/lib/blocks/src/components/IconGallery.tsx
similarity index 100%
rename from code/ui/blocks/src/components/IconGallery.tsx
rename to code/lib/blocks/src/components/IconGallery.tsx
diff --git a/code/ui/blocks/src/components/Preview.stories.tsx b/code/lib/blocks/src/components/Preview.stories.tsx
similarity index 99%
rename from code/ui/blocks/src/components/Preview.stories.tsx
rename to code/lib/blocks/src/components/Preview.stories.tsx
index 27354d798b0d..19a9bd665c9e 100644
--- a/code/ui/blocks/src/components/Preview.stories.tsx
+++ b/code/lib/blocks/src/components/Preview.stories.tsx
@@ -249,7 +249,7 @@ export const WithAdditionalActions = (
         title: 'Open on GitHub',
         onClick: () => {
           global.location.href =
-            'https://github.com/storybookjs/storybook/blob/next/code/ui/blocks/src/components/Preview.stories.tsx#L165-L186';
+            'https://github.com/storybookjs/storybook/blob/next/code/lib/blocks/src/components/Preview.stories.tsx#L165-L186';
         },
       },
     ]}
diff --git a/code/ui/blocks/src/components/Preview.tsx b/code/lib/blocks/src/components/Preview.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Preview.tsx
rename to code/lib/blocks/src/components/Preview.tsx
diff --git a/code/ui/blocks/src/components/Source.stories.tsx b/code/lib/blocks/src/components/Source.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Source.stories.tsx
rename to code/lib/blocks/src/components/Source.stories.tsx
diff --git a/code/ui/blocks/src/components/Source.tsx b/code/lib/blocks/src/components/Source.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Source.tsx
rename to code/lib/blocks/src/components/Source.tsx
diff --git a/code/ui/blocks/src/components/Story.stories.tsx b/code/lib/blocks/src/components/Story.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Story.stories.tsx
rename to code/lib/blocks/src/components/Story.stories.tsx
diff --git a/code/ui/blocks/src/components/Story.tsx b/code/lib/blocks/src/components/Story.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Story.tsx
rename to code/lib/blocks/src/components/Story.tsx
diff --git a/code/ui/blocks/src/components/TableOfContents.tsx b/code/lib/blocks/src/components/TableOfContents.tsx
similarity index 100%
rename from code/ui/blocks/src/components/TableOfContents.tsx
rename to code/lib/blocks/src/components/TableOfContents.tsx
diff --git a/code/ui/blocks/src/components/Title.stories.ts b/code/lib/blocks/src/components/Title.stories.ts
similarity index 100%
rename from code/ui/blocks/src/components/Title.stories.ts
rename to code/lib/blocks/src/components/Title.stories.ts
diff --git a/code/ui/blocks/src/components/Title.tsx b/code/lib/blocks/src/components/Title.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Title.tsx
rename to code/lib/blocks/src/components/Title.tsx
diff --git a/code/ui/blocks/src/components/Toolbar.tsx b/code/lib/blocks/src/components/Toolbar.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Toolbar.tsx
rename to code/lib/blocks/src/components/Toolbar.tsx
diff --git a/code/ui/blocks/src/components/Typeset.stories.tsx b/code/lib/blocks/src/components/Typeset.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Typeset.stories.tsx
rename to code/lib/blocks/src/components/Typeset.stories.tsx
diff --git a/code/ui/blocks/src/components/Typeset.tsx b/code/lib/blocks/src/components/Typeset.tsx
similarity index 100%
rename from code/ui/blocks/src/components/Typeset.tsx
rename to code/lib/blocks/src/components/Typeset.tsx
diff --git a/code/ui/blocks/src/components/ZoomContext.tsx b/code/lib/blocks/src/components/ZoomContext.tsx
similarity index 100%
rename from code/ui/blocks/src/components/ZoomContext.tsx
rename to code/lib/blocks/src/components/ZoomContext.tsx
diff --git a/code/ui/blocks/src/components/index.ts b/code/lib/blocks/src/components/index.ts
similarity index 100%
rename from code/ui/blocks/src/components/index.ts
rename to code/lib/blocks/src/components/index.ts
diff --git a/code/ui/blocks/src/controls/Boolean.stories.tsx b/code/lib/blocks/src/controls/Boolean.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Boolean.stories.tsx
rename to code/lib/blocks/src/controls/Boolean.stories.tsx
diff --git a/code/ui/blocks/src/controls/Boolean.tsx b/code/lib/blocks/src/controls/Boolean.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Boolean.tsx
rename to code/lib/blocks/src/controls/Boolean.tsx
diff --git a/code/ui/blocks/src/controls/Color.stories.tsx b/code/lib/blocks/src/controls/Color.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Color.stories.tsx
rename to code/lib/blocks/src/controls/Color.stories.tsx
diff --git a/code/ui/blocks/src/controls/Color.tsx b/code/lib/blocks/src/controls/Color.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Color.tsx
rename to code/lib/blocks/src/controls/Color.tsx
diff --git a/code/ui/blocks/src/controls/Date.stories.tsx b/code/lib/blocks/src/controls/Date.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Date.stories.tsx
rename to code/lib/blocks/src/controls/Date.stories.tsx
diff --git a/code/ui/blocks/src/controls/Date.test.ts b/code/lib/blocks/src/controls/Date.test.ts
similarity index 100%
rename from code/ui/blocks/src/controls/Date.test.ts
rename to code/lib/blocks/src/controls/Date.test.ts
diff --git a/code/ui/blocks/src/controls/Date.tsx b/code/lib/blocks/src/controls/Date.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Date.tsx
rename to code/lib/blocks/src/controls/Date.tsx
diff --git a/code/ui/blocks/src/controls/Files.stories.tsx b/code/lib/blocks/src/controls/Files.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Files.stories.tsx
rename to code/lib/blocks/src/controls/Files.stories.tsx
diff --git a/code/ui/blocks/src/controls/Files.tsx b/code/lib/blocks/src/controls/Files.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Files.tsx
rename to code/lib/blocks/src/controls/Files.tsx
diff --git a/code/ui/blocks/src/controls/Number.stories.tsx b/code/lib/blocks/src/controls/Number.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Number.stories.tsx
rename to code/lib/blocks/src/controls/Number.stories.tsx
diff --git a/code/ui/blocks/src/controls/Number.tsx b/code/lib/blocks/src/controls/Number.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Number.tsx
rename to code/lib/blocks/src/controls/Number.tsx
diff --git a/code/ui/blocks/src/controls/Object.stories.tsx b/code/lib/blocks/src/controls/Object.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Object.stories.tsx
rename to code/lib/blocks/src/controls/Object.stories.tsx
diff --git a/code/ui/blocks/src/controls/Object.tsx b/code/lib/blocks/src/controls/Object.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Object.tsx
rename to code/lib/blocks/src/controls/Object.tsx
diff --git a/code/ui/blocks/src/controls/Range.stories.tsx b/code/lib/blocks/src/controls/Range.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Range.stories.tsx
rename to code/lib/blocks/src/controls/Range.stories.tsx
diff --git a/code/ui/blocks/src/controls/Range.tsx b/code/lib/blocks/src/controls/Range.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Range.tsx
rename to code/lib/blocks/src/controls/Range.tsx
diff --git a/code/ui/blocks/src/controls/Text.stories.tsx b/code/lib/blocks/src/controls/Text.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Text.stories.tsx
rename to code/lib/blocks/src/controls/Text.stories.tsx
diff --git a/code/ui/blocks/src/controls/Text.tsx b/code/lib/blocks/src/controls/Text.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/Text.tsx
rename to code/lib/blocks/src/controls/Text.tsx
diff --git a/code/ui/blocks/src/controls/helpers.test.ts b/code/lib/blocks/src/controls/helpers.test.ts
similarity index 100%
rename from code/ui/blocks/src/controls/helpers.test.ts
rename to code/lib/blocks/src/controls/helpers.test.ts
diff --git a/code/ui/blocks/src/controls/helpers.ts b/code/lib/blocks/src/controls/helpers.ts
similarity index 100%
rename from code/ui/blocks/src/controls/helpers.ts
rename to code/lib/blocks/src/controls/helpers.ts
diff --git a/code/ui/blocks/src/controls/index.tsx b/code/lib/blocks/src/controls/index.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/index.tsx
rename to code/lib/blocks/src/controls/index.tsx
diff --git a/code/ui/blocks/src/controls/options/CheckOptions.stories.tsx b/code/lib/blocks/src/controls/options/CheckOptions.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/CheckOptions.stories.tsx
rename to code/lib/blocks/src/controls/options/CheckOptions.stories.tsx
diff --git a/code/ui/blocks/src/controls/options/Checkbox.tsx b/code/lib/blocks/src/controls/options/Checkbox.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/Checkbox.tsx
rename to code/lib/blocks/src/controls/options/Checkbox.tsx
diff --git a/code/ui/blocks/src/controls/options/Options.tsx b/code/lib/blocks/src/controls/options/Options.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/Options.tsx
rename to code/lib/blocks/src/controls/options/Options.tsx
diff --git a/code/ui/blocks/src/controls/options/Radio.tsx b/code/lib/blocks/src/controls/options/Radio.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/Radio.tsx
rename to code/lib/blocks/src/controls/options/Radio.tsx
diff --git a/code/ui/blocks/src/controls/options/RadioOptions.stories.tsx b/code/lib/blocks/src/controls/options/RadioOptions.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/RadioOptions.stories.tsx
rename to code/lib/blocks/src/controls/options/RadioOptions.stories.tsx
diff --git a/code/ui/blocks/src/controls/options/Select.tsx b/code/lib/blocks/src/controls/options/Select.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/Select.tsx
rename to code/lib/blocks/src/controls/options/Select.tsx
diff --git a/code/ui/blocks/src/controls/options/SelectOptions.stories.tsx b/code/lib/blocks/src/controls/options/SelectOptions.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/options/SelectOptions.stories.tsx
rename to code/lib/blocks/src/controls/options/SelectOptions.stories.tsx
diff --git a/code/ui/blocks/src/controls/options/helpers.ts b/code/lib/blocks/src/controls/options/helpers.ts
similarity index 100%
rename from code/ui/blocks/src/controls/options/helpers.ts
rename to code/lib/blocks/src/controls/options/helpers.ts
diff --git a/code/ui/blocks/src/controls/options/index.ts b/code/lib/blocks/src/controls/options/index.ts
similarity index 100%
rename from code/ui/blocks/src/controls/options/index.ts
rename to code/lib/blocks/src/controls/options/index.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx b/code/lib/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx
rename to code/lib/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/LICENSE.md b/code/lib/blocks/src/controls/react-editable-json-tree/LICENSE.md
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/LICENSE.md
rename to code/lib/blocks/src/controls/react-editable-json-tree/LICENSE.md
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/index.tsx b/code/lib/blocks/src/controls/react-editable-json-tree/index.tsx
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/index.tsx
rename to code/lib/blocks/src/controls/react-editable-json-tree/index.tsx
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/types/dataTypes.ts b/code/lib/blocks/src/controls/react-editable-json-tree/types/dataTypes.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/types/dataTypes.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/types/dataTypes.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/types/deltaTypes.ts b/code/lib/blocks/src/controls/react-editable-json-tree/types/deltaTypes.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/types/deltaTypes.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/types/deltaTypes.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/types/inputUsageTypes.ts b/code/lib/blocks/src/controls/react-editable-json-tree/types/inputUsageTypes.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/types/inputUsageTypes.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/types/inputUsageTypes.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/utils/objectTypes.ts b/code/lib/blocks/src/controls/react-editable-json-tree/utils/objectTypes.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/utils/objectTypes.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/utils/objectTypes.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/utils/parse.ts b/code/lib/blocks/src/controls/react-editable-json-tree/utils/parse.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/utils/parse.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/utils/parse.ts
diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/utils/styles.ts b/code/lib/blocks/src/controls/react-editable-json-tree/utils/styles.ts
similarity index 100%
rename from code/ui/blocks/src/controls/react-editable-json-tree/utils/styles.ts
rename to code/lib/blocks/src/controls/react-editable-json-tree/utils/styles.ts
diff --git a/code/ui/blocks/src/controls/types.ts b/code/lib/blocks/src/controls/types.ts
similarity index 100%
rename from code/ui/blocks/src/controls/types.ts
rename to code/lib/blocks/src/controls/types.ts
diff --git a/code/ui/blocks/src/examples/ArgTypesParameters.stories.tsx b/code/lib/blocks/src/examples/ArgTypesParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ArgTypesParameters.stories.tsx
rename to code/lib/blocks/src/examples/ArgTypesParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/ArgTypesParameters.tsx b/code/lib/blocks/src/examples/ArgTypesParameters.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ArgTypesParameters.tsx
rename to code/lib/blocks/src/examples/ArgTypesParameters.tsx
diff --git a/code/ui/blocks/src/examples/ArgTypesWithSubcomponentsParameters.stories.tsx b/code/lib/blocks/src/examples/ArgTypesWithSubcomponentsParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ArgTypesWithSubcomponentsParameters.stories.tsx
rename to code/lib/blocks/src/examples/ArgTypesWithSubcomponentsParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/Button.stories.tsx b/code/lib/blocks/src/examples/Button.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/Button.stories.tsx
rename to code/lib/blocks/src/examples/Button.stories.tsx
diff --git a/code/ui/blocks/src/examples/Button.tsx b/code/lib/blocks/src/examples/Button.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/Button.tsx
rename to code/lib/blocks/src/examples/Button.tsx
diff --git a/code/ui/blocks/src/examples/ButtonNoAutodocs.stories.tsx b/code/lib/blocks/src/examples/ButtonNoAutodocs.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonNoAutodocs.stories.tsx
rename to code/lib/blocks/src/examples/ButtonNoAutodocs.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonReadonly.stories.tsx b/code/lib/blocks/src/examples/ButtonReadonly.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonReadonly.stories.tsx
rename to code/lib/blocks/src/examples/ButtonReadonly.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonSomeAutodocs.stories.tsx b/code/lib/blocks/src/examples/ButtonSomeAutodocs.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonSomeAutodocs.stories.tsx
rename to code/lib/blocks/src/examples/ButtonSomeAutodocs.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsBoth.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsBoth.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsBoth.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsBoth.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsComment.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsComment.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsComment.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsComment.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsParameter.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsParameter.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaDescriptionAsParameter.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaDescriptionAsParameter.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsBoth.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsBoth.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsBoth.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsBoth.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsComponentSubtitle.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsComponentSubtitle.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsComponentSubtitle.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsComponentSubtitle.stories.tsx
diff --git a/code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsDocsSubtitle.stories.tsx b/code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsDocsSubtitle.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ButtonWithMetaSubtitleAsDocsSubtitle.stories.tsx
rename to code/lib/blocks/src/examples/ButtonWithMetaSubtitleAsDocsSubtitle.stories.tsx
diff --git a/code/ui/blocks/src/examples/CanvasParameters.stories.tsx b/code/lib/blocks/src/examples/CanvasParameters.stories.tsx
similarity index 97%
rename from code/ui/blocks/src/examples/CanvasParameters.stories.tsx
rename to code/lib/blocks/src/examples/CanvasParameters.stories.tsx
index f5dd9acf0baf..aa9affefbfec 100644
--- a/code/ui/blocks/src/examples/CanvasParameters.stories.tsx
+++ b/code/lib/blocks/src/examples/CanvasParameters.stories.tsx
@@ -22,7 +22,7 @@ export const AdditionalActions: Story = {
             title: 'Open in GitHub',
             onClick: () => {
               window.open(
-                'https://github.com/storybookjs/storybook/blob/next/code/ui/blocks/src/examples/Button.stories.tsx',
+                'https://github.com/storybookjs/storybook/blob/next/code/lib/blocks/src/examples/Button.stories.tsx',
                 '_blank'
               );
             },
diff --git a/code/ui/blocks/src/examples/ControlsParameters.stories.tsx b/code/lib/blocks/src/examples/ControlsParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ControlsParameters.stories.tsx
rename to code/lib/blocks/src/examples/ControlsParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/ControlsParameters.tsx b/code/lib/blocks/src/examples/ControlsParameters.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ControlsParameters.tsx
rename to code/lib/blocks/src/examples/ControlsParameters.tsx
diff --git a/code/ui/blocks/src/examples/ControlsWithSubcomponentsParameters.stories.tsx b/code/lib/blocks/src/examples/ControlsWithSubcomponentsParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/ControlsWithSubcomponentsParameters.stories.tsx
rename to code/lib/blocks/src/examples/ControlsWithSubcomponentsParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/DocsPageParameters.stories.tsx b/code/lib/blocks/src/examples/DocsPageParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/DocsPageParameters.stories.tsx
rename to code/lib/blocks/src/examples/DocsPageParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/EmptyArgTypes.stories.tsx b/code/lib/blocks/src/examples/EmptyArgTypes.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/EmptyArgTypes.stories.tsx
rename to code/lib/blocks/src/examples/EmptyArgTypes.stories.tsx
diff --git a/code/ui/blocks/src/examples/EmptyExample.tsx b/code/lib/blocks/src/examples/EmptyExample.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/EmptyExample.tsx
rename to code/lib/blocks/src/examples/EmptyExample.tsx
diff --git a/code/ui/blocks/src/examples/Markdown-content.md b/code/lib/blocks/src/examples/Markdown-content.md
similarity index 100%
rename from code/ui/blocks/src/examples/Markdown-content.md
rename to code/lib/blocks/src/examples/Markdown-content.md
diff --git a/code/ui/blocks/src/examples/SimpleSizeTest.tsx b/code/lib/blocks/src/examples/SimpleSizeTest.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/SimpleSizeTest.tsx
rename to code/lib/blocks/src/examples/SimpleSizeTest.tsx
diff --git a/code/ui/blocks/src/examples/SourceParameters.stories.tsx b/code/lib/blocks/src/examples/SourceParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/SourceParameters.stories.tsx
rename to code/lib/blocks/src/examples/SourceParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/StoriesParameters.stories.tsx b/code/lib/blocks/src/examples/StoriesParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/StoriesParameters.stories.tsx
rename to code/lib/blocks/src/examples/StoriesParameters.stories.tsx
diff --git a/code/ui/blocks/src/examples/StoryParameters.stories.tsx b/code/lib/blocks/src/examples/StoryParameters.stories.tsx
similarity index 100%
rename from code/ui/blocks/src/examples/StoryParameters.stories.tsx
rename to code/lib/blocks/src/examples/StoryParameters.stories.tsx
diff --git a/code/ui/blocks/src/index.ts b/code/lib/blocks/src/index.ts
similarity index 100%
rename from code/ui/blocks/src/index.ts
rename to code/lib/blocks/src/index.ts
diff --git a/code/ui/blocks/src/typings.d.ts b/code/lib/blocks/src/typings.d.ts
similarity index 100%
rename from code/ui/blocks/src/typings.d.ts
rename to code/lib/blocks/src/typings.d.ts
diff --git a/code/ui/blocks/tsconfig.json b/code/lib/blocks/tsconfig.json
similarity index 100%
rename from code/ui/blocks/tsconfig.json
rename to code/lib/blocks/tsconfig.json
diff --git a/code/ui/blocks/vitest.config.ts b/code/lib/blocks/vitest.config.ts
similarity index 100%
rename from code/ui/blocks/vitest.config.ts
rename to code/lib/blocks/vitest.config.ts
diff --git a/code/package.json b/code/package.json
index f91aea5453d5..0f7bf201cdb3 100644
--- a/code/package.json
+++ b/code/package.json
@@ -20,7 +20,6 @@
       "lib/*",
       "deprecated/*",
       "builders/*",
-      "ui/*",
       "presets/*",
       "renderers/*"
     ]
@@ -46,12 +45,9 @@
     "lint:package": "sort-package-json",
     "local-registry": "yarn --cwd ../scripts local-registry",
     "publish-sandboxes": "yarn --cwd ../scripts publish",
-    "storybook:blocks": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui",
-    "storybook:blocks:build": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:build",
-    "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}",
-    "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs dev --port 6006 --config-dir ./ui/.storybook",
-    "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs build --config-dir ./ui/.storybook --webpack-stats-json",
-    "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-base-dir ./ --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --exit-zero-on-changes --exit-once-uploaded",
+    "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs dev --port 6006 --config-dir ./.storybook",
+    "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs build --config-dir ./.storybook --webpack-stats-json",
+    "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-base-dir ./ --exit-zero-on-changes --exit-once-uploaded",
     "task": "yarn --cwd ../scripts task",
     "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run",
     "test:watch": "NODE_OPTIONS=--max_old_space_size=4096 vitest watch"
diff --git a/code/ui/.storybook/main.ts b/code/ui/.storybook/main.ts
deleted file mode 100644
index 511c667a56c0..000000000000
--- a/code/ui/.storybook/main.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import path from 'path';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { mergeConfig } from 'vite';
-import type { StorybookConfig } from '../../frameworks/react-vite';
-
-const isBlocksOnly = process.env.STORYBOOK_BLOCKS_ONLY === 'true';
-
-const allStories = [
-  {
-    directory: '../../core/src/manager',
-    titlePrefix: '@manager',
-  },
-  {
-    directory: '../../core/src/preview-api',
-    titlePrefix: '@preview',
-  },
-  {
-    directory: '../../core/src/components',
-    titlePrefix: '@components',
-  },
-  {
-    directory: '../blocks/src',
-    titlePrefix: '@blocks',
-  },
-  {
-    directory: '../../addons/controls/src', // TODO other addons?
-    titlePrefix: '@addons/controls',
-  },
-  {
-    directory: '../../addons/onboarding/src',
-    titlePrefix: '@addons/onboarding',
-  },
-  {
-    directory: '../../addons/interactions/src',
-    titlePrefix: '@addons/interactions',
-  },
-];
-
-/**
- * match all stories in blocks/src/blocks, blocks/src/controls and blocks/src/examples EXCEPT blocks/src/blocks/internal
- * Examples:
- *
- * src/blocks/Canvas.stories.tsx - MATCH
- * src/blocks/internal/InternalCanvas.stories.tsx - IGNORED, internal stories
- * src/blocks/internal/nested/InternalCanvas.stories.tsx - IGNORED, internal stories
- *
- * src/blocks/Canvas.tsx - IGNORED, not story
- * src/blocks/nested/Canvas.stories.tsx - MATCH
- * src/blocks/nested/deep/Canvas.stories.tsx - MATCH
- *
- * src/controls/Boolean.stories.tsx - MATCH
- * src/controls/Boolean.tsx - IGNORED, not story
- *
- * src/components/ColorPalette.stories.tsx - MATCH
- * src/components/ColorPalette.tsx - IGNORED, not story
- */
-const blocksOnlyStories = [
-  '../blocks/src/@(blocks|controls|examples)/!(internal)/**/*.@(mdx|stories.@(js|jsx|mjs|ts|tsx))',
-  '../blocks/src/@(blocks|controls|examples)/*.@(mdx|stories.@(js|jsx|mjs|ts|tsx))',
-];
-
-const componentsPath = path.join(__dirname, '../../core/src/components');
-const managerApiPath = path.join(__dirname, '../../core/src/manager-api');
-const themingPath = path.join(__dirname, '../../core/src/theming');
-const docsToolsPath = path.join(__dirname, '../../core/src/docs-tools');
-
-const config: StorybookConfig = {
-  stories: isBlocksOnly ? blocksOnlyStories : allStories,
-  addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
-    '@storybook/addon-storysource',
-    '@storybook/addon-designs',
-    '@storybook/addon-a11y',
-    '@chromatic-com/storybook',
-  ],
-  build: {
-    test: {
-      // we have stories for the blocks here, we can't exclude them
-      disableBlocks: false,
-      // some stories in blocks (ArgTypes, Controls) depends on argTypes inference
-      disableDocgen: false,
-    },
-  },
-  framework: {
-    name: '@storybook/react-vite',
-    options: {},
-  },
-  core: {
-    disableTelemetry: true,
-  },
-  viteFinal: (viteConfig, { configType }) =>
-    mergeConfig(viteConfig, {
-      resolve: {
-        alias: {
-          ...(configType === 'DEVELOPMENT'
-            ? {
-                '@storybook/theming': themingPath,
-                'storybook/theming': themingPath,
-                'storybook/docs-tools': docsToolsPath,
-                '@storybook/components': componentsPath,
-                'storybook/components': componentsPath,
-                '@storybook/manager-api': managerApiPath,
-                'storybook/manager-api': managerApiPath,
-              }
-            : {}),
-        },
-      },
-      optimizeDeps: { force: true },
-      build: {
-        // disable sourcemaps in CI to not run out of memory
-        sourcemap: process.env.CI !== 'true',
-      },
-    }),
-  logLevel: 'debug',
-};
-
-export default config;
diff --git a/code/vitest.workspace.ts b/code/vitest.workspace.ts
index 19688a04221d..ce15cacce016 100644
--- a/code/vitest.workspace.ts
+++ b/code/vitest.workspace.ts
@@ -8,7 +8,6 @@ export default defineWorkspace([
   'core/vitest.config.ts',
   'deprecated/*/vitest.config.ts',
   'builders/*/vitest.config.ts',
-  'ui/*/vitest.config.ts',
   'presets/*/vitest.config.ts',
   'renderers/*/vitest.config.ts',
 ]);
diff --git a/code/yarn.lock b/code/yarn.lock
index f7d99bf9382b..3b7a71a6b814 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -5506,9 +5506,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks":
+"@storybook/blocks@workspace:*, @storybook/blocks@workspace:lib/blocks":
   version: 0.0.0-use.local
-  resolution: "@storybook/blocks@workspace:ui/blocks"
+  resolution: "@storybook/blocks@workspace:lib/blocks"
   dependencies:
     "@storybook/addon-actions": "workspace:*"
     "@storybook/csf": "npm:^0.1.8"
diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json
index 261b1b0051cc..9eba65d74111 100644
--- a/test-storybooks/ember-cli/package.json
+++ b/test-storybooks/ember-cli/package.json
@@ -29,7 +29,7 @@
     "@storybook/addon-toolbars": "file:../../code/addons/toolbars",
     "@storybook/addon-viewport": "file:../../code/addons/viewport",
     "@storybook/angular": "file:../../code/frameworks/angular",
-    "@storybook/blocks": "file:../../code/ui/blocks",
+    "@storybook/blocks": "file:../../code/lib/blocks",
     "@storybook/builder-manager": "file:../../code/builders/builder-manager",
     "@storybook/builder-vite": "file:../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json
index e0c121bcd57c..0032f36fada3 100644
--- a/test-storybooks/external-docs/package.json
+++ b/test-storybooks/external-docs/package.json
@@ -29,7 +29,7 @@
     "@storybook/addon-toolbars": "file:../../code/addons/toolbars",
     "@storybook/addon-viewport": "file:../../code/addons/viewport",
     "@storybook/angular": "file:../../code/frameworks/angular",
-    "@storybook/blocks": "file:../../code/ui/blocks",
+    "@storybook/blocks": "file:../../code/lib/blocks",
     "@storybook/builder-manager": "file:../../code/builders/builder-manager",
     "@storybook/builder-vite": "file:../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
index 22e4070d78ff..6e91d1a6f72c 100644
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
@@ -32,7 +32,7 @@
     "@storybook/addon-toolbars": "file:../../../code/addons/toolbars",
     "@storybook/addon-viewport": "file:../../../code/addons/viewport",
     "@storybook/angular": "file:../../../code/frameworks/angular",
-    "@storybook/blocks": "file:../../../code/ui/blocks",
+    "@storybook/blocks": "file:../../../code/lib/blocks",
     "@storybook/builder-vite": "file:../../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5",
     "@storybook/codemod": "file:../../../code/lib/codemod",
@@ -104,4 +104,4 @@
   "maintainer_please_read_this": {
     "_": "we use file protocol to make this setup close to real life scenarios as well as avoid issues with duplicated React instances. When you recompile the SB packages, you need to rerun install."
   }
-}
+}
\ No newline at end of file
diff --git a/test-storybooks/portable-stories-kitchen-sink/react/package.json b/test-storybooks/portable-stories-kitchen-sink/react/package.json
index 6a1153314e5d..1019f2a65f00 100644
--- a/test-storybooks/portable-stories-kitchen-sink/react/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/react/package.json
@@ -33,7 +33,7 @@
     "@storybook/addon-toolbars": "portal:../../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../../code/addons/viewport",
     "@storybook/angular": "portal:../../../code/frameworks/angular",
-    "@storybook/blocks": "portal:../../../code/ui/blocks",
+    "@storybook/blocks": "portal:../../../code/lib/blocks",
     "@storybook/builder-vite": "portal:../../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5",
     "@storybook/codemod": "portal:../../../code/lib/codemod",
@@ -109,4 +109,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.1.1"
   }
-}
+}
\ No newline at end of file
diff --git a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json
index d34f124dab80..2ec66597aa0c 100644
--- a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json
@@ -32,7 +32,7 @@
     "@storybook/addon-toolbars": "portal:../../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../../code/addons/viewport",
     "@storybook/angular": "portal:../../../code/frameworks/angular",
-    "@storybook/blocks": "portal:../../../code/ui/blocks",
+    "@storybook/blocks": "portal:../../../code/lib/blocks",
     "@storybook/builder-vite": "portal:../../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5",
     "@storybook/codemod": "portal:../../../code/lib/codemod",
@@ -95,4 +95,4 @@
     "vite": "^5.1.4",
     "vitest": "^1.3.1"
   }
-}
+}
\ No newline at end of file
diff --git a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json
index f33adcc81f94..cb7ada414600 100644
--- a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json
@@ -33,7 +33,7 @@
     "@storybook/addon-toolbars": "portal:../../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../../code/addons/viewport",
     "@storybook/angular": "portal:../../../code/frameworks/angular",
-    "@storybook/blocks": "portal:../../../code/ui/blocks",
+    "@storybook/blocks": "portal:../../../code/lib/blocks",
     "@storybook/builder-vite": "portal:../../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5",
     "@storybook/codemod": "portal:../../../code/lib/codemod",
@@ -96,4 +96,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.1.1"
   }
-}
+}
\ No newline at end of file
diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json
index 99bdc3fadea5..295980020f94 100644
--- a/test-storybooks/server-kitchen-sink/package.json
+++ b/test-storybooks/server-kitchen-sink/package.json
@@ -32,7 +32,7 @@
     "@storybook/addon-toolbars": "file:../../code/addons/toolbars",
     "@storybook/addon-viewport": "file:../../code/addons/viewport",
     "@storybook/angular": "file:../../code/frameworks/angular",
-    "@storybook/blocks": "file:../../code/ui/blocks",
+    "@storybook/blocks": "file:../../code/lib/blocks",
     "@storybook/builder-manager": "file:../../code/builders/builder-manager",
     "@storybook/builder-vite": "file:../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json
index 181904250008..a01e714cfde9 100644
--- a/test-storybooks/standalone-preview/package.json
+++ b/test-storybooks/standalone-preview/package.json
@@ -25,7 +25,7 @@
     "@storybook/addon-toolbars": "file:../../code/addons/toolbars",
     "@storybook/addon-viewport": "file:../../code/addons/viewport",
     "@storybook/angular": "file:../../code/frameworks/angular",
-    "@storybook/blocks": "file:../../code/ui/blocks",
+    "@storybook/blocks": "file:../../code/lib/blocks",
     "@storybook/builder-manager": "file:../../code/builders/builder-manager",
     "@storybook/builder-vite": "file:../../code/builders/builder-vite",
     "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",