diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
index 912cee601d..0fe761cc15 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
@@ -6,7 +6,6 @@ import { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UmbExtensionsApiInitializer, type UmbEntryPointOnInit } from '@umbraco-cms/backoffice/extension-api';
 
-// TODO temp relative import until modules ship a component sub module
 import './menu/components/index.js';
 import './extension-registry/components/index.js';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts
index 01ccf3bcb3..f03bcd1173 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts
@@ -1,4 +1,4 @@
-import { UMB_MENU_CONTEXT } from '../../menu/menu.context.js';
+import { UMB_MENU_CONTEXT } from '../../menu/components/menu/menu.context.js';
 import { UmbConditionBase } from './condition-base.controller.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/index.ts
index 339f7d3c5f..d7ba135f70 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/index.ts
@@ -1,2 +1,3 @@
+export * from './menu/index.js';
 export * from './menu-item/index.js';
 export * from './menu-item-layout/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/index.ts
new file mode 100644
index 0000000000..ed60e33603
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/index.ts
@@ -0,0 +1,2 @@
+export * from './menu.element.js';
+export * from './menu.context.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.context.ts
similarity index 87%
rename from src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.context.ts
index 17ff5dfa35..cdf877331f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.context.ts
@@ -1,4 +1,4 @@
-import type { ManifestMenu } from '../extension-registry/models/index.js';
+import type { ManifestMenu } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbDeepState } from '@umbraco-cms/backoffice/observable-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.element.ts
index 75e39a0d1e..819fa6b5e9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu/menu.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import type { ManifestMenu, ManifestMenuItem } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
-import './components/menu-item/menu-item-default.element.js';
+import '../menu-item/menu-item-default.element.js';
 
 @customElement('umb-menu')
 export class UmbMenuElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
index 714002d519..3022ede2c2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/index.ts
@@ -1,6 +1,4 @@
 export * from './components/index.js';
-export * from './menu.element.js';
-export * from './menu.context.js';
 export * from './menu-tree-structure-workspace-context-base.js';
 export * from './menu-variant-tree-structure-workspace-context-base.js';
 export * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
index 72594db443..a6f56bb4cb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
@@ -1,4 +1,4 @@
-import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '@umbraco-cms/backoffice/property-editor';
+import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '../../constants.js';
 import { UUIRefNodeElement } from '@umbraco-cms/backoffice/external/uui';
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/constants.ts
new file mode 100644
index 0000000000..169e03657c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/constants.ts
@@ -0,0 +1 @@
+export const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = 'Umbraco.Label';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
index 8ac291fc4e..5f5c1f5388 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
@@ -1,5 +1,4 @@
 export * from './components/index.js';
 export * from './config/index.js';
 export * from './events/index.js';
-
-export const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = 'Umbraco.Label';
+export * from './constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
index a513f6da0d..4bdb073781 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts
@@ -2,12 +2,9 @@ import { UmbSectionSidebarMenuElement } from '../section-sidebar-menu/section-si
 import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import type {
 	ManifestSectionSidebarAppMenuWithEntityActionsKind,
-	UmbBackofficeManifestKind} from '@umbraco-cms/backoffice/extension-registry';
-import {
-	umbExtensionsRegistry,
+	UmbBackofficeManifestKind,
 } from '@umbraco-cms/backoffice/extension-registry';
-
-import '../../menu/menu.element.js';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
 const manifestWithEntityActions: UmbBackofficeManifestKind = {
 	type: 'kind',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts
deleted file mode 100644
index 71d7a0b546..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './variant-selector.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.stories.ts
deleted file mode 100644
index 0d4e95dc7a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.stories.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/web-components';
-import './variant-selector.element.js';
-import type { UmbVariantSelectorElement } from './variant-selector.element.js';
-
-const meta: Meta<UmbVariantSelectorElement> = {
-	title: 'Components/Variant Selector',
-	component: 'umb-variant-selector',
-};
-
-export default meta;
-type Story = StoryObj<UmbVariantSelectorElement>;
-
-export const Overview: Story = {
-	args: {},
-};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts
index 03af0c4306..defa5dfccc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts
@@ -1,6 +1,7 @@
-import type { UmbSubmittableWorkspaceContext } from '../../../../contexts/tokens/submittable-workspace-context.interface.js';
+import { UMB_SUBMITTABLE_WORKSPACE_CONTEXT } from '../../../../contexts/tokens/index.js';
+import type { UmbSubmittableWorkspaceContext } from '../../../../contexts/tokens/index.js';
+import type { UmbWorkspaceActionArgs } from '../../types.js';
 import { UmbWorkspaceActionBase } from '../../workspace-action-base.controller.js';
-import { UMB_SUBMITTABLE_WORKSPACE_CONTEXT, type UmbWorkspaceActionArgs } from '@umbraco-cms/backoffice/workspace';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbSubmitWorkspaceAction extends UmbWorkspaceActionBase<UmbSubmittableWorkspaceContext> {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
index 9e60d8febc..d32795c9f9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
@@ -1,8 +1,9 @@
+import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../contexts/index.js';
+import type { UmbWorkspaceUniqueType } from '../../types.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state, nothing, query } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_ENTITY_WORKSPACE_CONTEXT, type UmbWorkspaceUniqueType } from '@umbraco-cms/backoffice/workspace';
 import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
 @customElement('umb-workspace-entity-action-menu')
 export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts
index 4ac37f06a7..a5a63c3e6b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts
@@ -1,4 +1,6 @@
-import { UmbVariantId } from '../../../variant/variant-id.class.js';
+import type { ActiveVariant } from '../../controllers/index.js';
+import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT } from './workspace-split-view.context.js';
+import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UMB_PROPERTY_DATASET_CONTEXT, isNameablePropertyDatasetContext } from '@umbraco-cms/backoffice/property';
 import {
 	type UUIInputElement,
@@ -6,7 +8,6 @@ import {
 	type UUIPopoverContainerElement,
 } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, nothing, customElement, state, query } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, type ActiveVariant } from '@umbraco-cms/backoffice/workspace';
 import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -22,8 +23,9 @@ type UmbDocumentVariantOption = {
 
 type UmbDocumentVariantOptions = Array<UmbDocumentVariantOption>;
 
-@customElement('umb-variant-selector')
-export class UmbVariantSelectorElement extends UmbLitElement {
+const elementName = 'umb-workspace-split-view-variant-selector';
+@customElement(elementName)
+export class UmbWorkspaceSplitViewVariantSelectorElement extends UmbLitElement {
 	@query('#variant-selector-popover')
 	private _popoverElement?: UUIPopoverContainerElement;
 
@@ -407,10 +409,8 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 	];
 }
 
-export default UmbVariantSelectorElement;
-
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-variant-selector': UmbVariantSelectorElement;
+		[elementName]: UmbWorkspaceSplitViewVariantSelectorElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
index 86eadc6bab..03e3af042a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
@@ -2,7 +2,10 @@ import { UmbWorkspaceSplitViewContext } from './workspace-split-view.context.js'
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, property, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import '../variant-selector/index.js';
+
+// import local components
+import './workspace-split-view-variant-selector.element.js';
+
 /**
  *
  * Example. Document Workspace would use a Variant-component(variant component would talk directly to the workspace-context)
@@ -38,7 +41,7 @@ export class UmbWorkspaceSplitViewElement extends UmbLitElement {
 				.hideNavigation=${!this.displayNavigation}
 				.enforceNoFooter=${true}>
 				<div id="header" slot="header">
-					<umb-variant-selector></umb-variant-selector>
+					<umb-workspace-split-view-variant-selector></umb-workspace-split-view-variant-selector>
 				</div>
 				${this.displayNavigation
 					? html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 13dea12347..0fba78f8f9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -1,14 +1,14 @@
+import { UmbDocumentCultureAndHostnamesRepository } from '../repository/index.js';
+import type {
+	UmbCultureAndHostnamesModalData,
+	UmbCultureAndHostnamesModalValue,
+} from './culture-and-hostnames-modal.token.js';
 import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language';
 import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language';
 import type { DomainPresentationModel } from '@umbraco-cms/backoffice/external/backend-api';
-import {
-	UmbDocumentCultureAndHostnamesRepository,
-	type UmbCultureAndHostnamesModalData,
-	type UmbCultureAndHostnamesModalValue,
-} from '@umbraco-cms/backoffice/document';
 import type { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-culture-and-hostnames-modal')
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts
index ad2b066c3e..7a450b9714 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts
@@ -1,13 +1,10 @@
 import { UmbDocumentPublicAccessRepository } from '../repository/public-access.repository.js';
+import { UmbDocumentDetailRepository } from '../../../repository/index.js';
+import type { UmbInputDocumentElement } from '../../../components/index.js';
+import type { UmbPublicAccessModalData, UmbPublicAccessModalValue } from './public-access-modal.token.js';
 import { html, customElement, state, css, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
-import {
-	UmbDocumentDetailRepository,
-	type UmbInputDocumentElement,
-	type UmbPublicAccessModalData,
-	type UmbPublicAccessModalValue,
-} from '@umbraco-cms/backoffice/document';
 import type { UUIRadioEvent } from '@umbraco-cms/backoffice/external/uui';
 import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbInputMemberTypeElement } from '@umbraco-cms/backoffice/member-type';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
index f619b2c031..bd1bafdaa9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
@@ -4,8 +4,8 @@ import type {
 } from '../../modal/member-type-picker-modal.token.js';
 import { UMB_MEMBER_TYPE_PICKER_MODAL } from '../../modal/member-type-picker-modal.token.js';
 import type { UmbMemberTypeItemModel } from '../../repository/item/types.js';
-import type { UmbMemberTypeTreeItemModel } from '@umbraco-cms/backoffice/member-type';
-import { UMB_MEMBER_TYPE_ITEM_REPOSITORY_ALIAS } from '@umbraco-cms/backoffice/member-type';
+import { UMB_MEMBER_TYPE_ITEM_REPOSITORY_ALIAS } from '../../repository/index.js';
+import type { UmbMemberTypeTreeItemModel } from '../../tree/index.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';