diff --git a/src/Umbraco.Web.UI.Client/.storybook/main.ts b/src/Umbraco.Web.UI.Client/.storybook/main.ts
index 58d9e365e4..9fe61fc676 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/main.ts
+++ b/src/Umbraco.Web.UI.Client/.storybook/main.ts
@@ -1,7 +1,7 @@
 import { StorybookConfig } from '@storybook/web-components-vite';
 
 const config: StorybookConfig = {
-	stories: ['../@(src|libs|apps)/**/*.mdx', '../@(src|libs|apps)/**/*.stories.@(js|jsx|ts|tsx)'],
+	stories: ['../@(src|libs|apps|storybook)/**/*.mdx', '../@(src|libs|apps|storybook)/**/*.stories.@(js|jsx|ts|tsx)'],
 	addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-a11y'],
 	framework: {
 		name: '@storybook/web-components-vite',
diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js
index e55d5c7558..abb33a59ec 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/preview.js
+++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js
@@ -24,7 +24,7 @@ import { umbExtensionsRegistry } from '../libs/extensions-api';
 
 import '../src/core/context-provider/context-provider.element';
 import '../src/core/controller-host/controller-host-test.element';
-import '../src/backoffice/shared/components';
+import '../src/backoffice/core/components';
 
 import { manifests as documentManifests } from '../src/backoffice/documents';
 
diff --git a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
index f131df752a..06bd40723d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
@@ -1,6 +1,6 @@
 import { html } from 'lit';
 import { UmbInstallerContext } from '../installer.context';
-import '../../core/context-provider/context-provider.element';
+import '../../../storybook/utils/context-provider/context-provider.element';
 
 export const installerContextProvider = (story: any, installerContext = new UmbInstallerContext()) => html`
 	<umb-context-provider
diff --git a/src/Umbraco.Web.UI.Client/src/stories/context-api.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/context-api.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/context-api.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/context-api.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/entity-actions.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/entity-actions.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/header-apps.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/header-apps.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/header-apps.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/header-apps.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/menu.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/menu.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/menu.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/menu.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/modals/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/modals/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/modals/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/modals/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/property-editors.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/property-editors.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/registration.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/registration.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/registration.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/registration.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/repositories.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/repositories.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/repositories.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/repositories.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/sidebar.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/sidebar.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/sidebar.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/sidebar.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/views.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/views.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/views.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/views.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/tree.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/tree.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/tree.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/tree.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/actions.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/actions.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/actions.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/actions.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/context.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/context.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/context.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/context.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/views.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/views.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/views.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/views.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/getting-started.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/getting-started.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/getting-started.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/getting-started.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/store.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/store.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/store.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/store.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/umb-element.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/umb-element.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/umb-element.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/umb-element.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.test.ts b/src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.test.ts
rename to src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.ts b/src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.ts
rename to src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.ts