diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
index 9abc8b7014..b1939d8726 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts
@@ -31,4 +31,3 @@ export * from './multiple-text-string-input/index.js';
 export * from './popover-layout/index.js';
 export * from './table/index.js';
 export * from './tooltip-menu/index.js';
-export * from './variant-selector/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/index.ts
new file mode 100644
index 0000000000..e5a2aa7cca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/index.ts
@@ -0,0 +1 @@
+export * from './ref-property-editor-ui/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/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
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
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 575fe7d99f..8ac291fc4e 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,3 +1,4 @@
+export * from './components/index.js';
 export * from './config/index.js';
 export * from './events/index.js';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts
new file mode 100644
index 0000000000..dc0e41c16f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts
@@ -0,0 +1,5 @@
+export * from './workspace-action-menu/index.js';
+export * from './workspace-action/index.js';
+export * from './workspace-editor/index.js';
+export * from './workspace-footer/index.js';
+export * from './workspace-split-view/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/variant-selector.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
index 55e5dad438..7e608a8c58 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
@@ -1,6 +1,10 @@
-import { UmbVariantId } from '../../variant/variant-id.class.js';
+import { UmbVariantId } from '../../../variant/variant-id.class.js';
 import { UMB_PROPERTY_DATASET_CONTEXT, isNameablePropertyDatasetContext } from '@umbraco-cms/backoffice/property';
-import { UUIInputElement, UUIInputEvent, UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
+import {
+	type UUIInputElement,
+	UUIInputEvent,
+	type UUIPopoverContainerElement,
+} from '@umbraco-cms/backoffice/external/uui';
 import {
 	css,
 	html,
@@ -11,13 +15,9 @@ import {
 	ifDefined,
 	query,
 } from '@umbraco-cms/backoffice/external/lit';
-import {
-	UmbWorkspaceSplitViewContext,
-	UMB_WORKSPACE_SPLIT_VIEW_CONTEXT,
-	ActiveVariant,
-} from '@umbraco-cms/backoffice/workspace';
+import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, type ActiveVariant } from '@umbraco-cms/backoffice/workspace';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { DocumentVariantResponseModel, ContentStateModel } from '@umbraco-cms/backoffice/backend-api';
+import { type DocumentVariantResponseModel, ContentStateModel } from '@umbraco-cms/backoffice/backend-api';
 
 @customElement('umb-variant-selector')
 export class UmbVariantSelectorElement extends UmbLitElement {
@@ -36,7 +36,7 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 		return this._activeVariants.map((el) => el.culture ?? '') ?? [];
 	}
 
-	#splitViewContext?: UmbWorkspaceSplitViewContext;
+	#splitViewContext?: typeof UMB_WORKSPACE_SPLIT_VIEW_CONTEXT.TYPE;
 	#variantContext?: typeof UMB_PROPERTY_DATASET_CONTEXT.TYPE;
 
 	@state()
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/variant-selector.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/variant-selector/variant-selector.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/save/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/save/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/save/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/save/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/save/save.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/save/save.action.ts
similarity index 87%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/save/save.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/save/save.action.ts
index 47ffc11f70..7ed47c5e65 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/common/save/save.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/save/save.action.ts
@@ -1,4 +1,4 @@
-import { UmbSaveableWorkspaceContextInterface } from '../../../workspace-context/saveable-workspace-context.interface.js';
+import { UmbSaveableWorkspaceContextInterface } from '../../../../workspace-context/saveable-workspace-context.interface.js';
 import { UmbWorkspaceActionBase } from '../../workspace-action-base.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts
index 51480ae686..3d24872ea3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts
@@ -1,4 +1,4 @@
-import { UmbWorkspaceContextInterface, UMB_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
+import { UmbWorkspaceContextInterface, UMB_WORKSPACE_CONTEXT } from '../../workspace-context/index.js';
 import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
index 91189577f7..9ba933c009 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
@@ -72,7 +72,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 					component: () => {
 						if (manifest.type === 'workspaceViewCollection') {
 							return import(
-								'../workspace-content/views/collection/workspace-view-collection.element.js'
+								'../../workspace-content/views/collection/workspace-view-collection.element.js'
 							) as unknown as Promise<HTMLElement>;
 						}
 						return createExtensionElement(manifest);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
index b179ca01e9..97834d551a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
@@ -1,4 +1,4 @@
-import { UMB_SAVEABLE_WORKSPACE_CONTEXT } from '../saveable-workspace.context-token.js';
+import { UMB_SAVEABLE_WORKSPACE_CONTEXT } from '../../saveable-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts
index 259993ee1e..c18dfa440d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts
@@ -1,5 +1,5 @@
-import { UmbPropertyDatasetContext } from '../../property/property-dataset/index.js';
-import { UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN } from '../index.js';
+import { UmbPropertyDatasetContext } from '../../../property/property-dataset/index.js';
+import { UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN } from '../../index.js';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/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
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
index 12cb3c3ce8..f8d871b563 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/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,7 @@ import { UmbWorkspaceSplitViewContext } from './workspace-split-view.context.js'
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-
+import '../variant-selector/index.js';
 /**
  *
  * Example. Document Workspace would use a Variant-component(variant component would talk directly to the workspace-context)
@@ -11,7 +11,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
  */
 @customElement('umb-workspace-split-view')
 export class UmbWorkspaceSplitViewElement extends UmbLitElement {
-	// TODO: stop prop drilling this alias. Instead use the workspace context.
 	@property()
 	alias!: string;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
index 2ddc9d732c..1b12cbf033 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
@@ -1,14 +1,10 @@
-export * from './saveable-workspace.context-token.js';
+export * from './components/index.js';
 export * from './publishable-workspace.context-token.js';
-export * from './workspace-action-menu/index.js';
-export * from './workspace-action/index.js';
+export * from './saveable-workspace.context-token.js';
 export * from './workspace-context/index.js';
-export * from './workspace-editor/index.js';
-export * from './workspace-footer/index.js';
 export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
 export * from './workspace-property-dataset/index.js';
 export * from './workspace-split-view-manager.class.js';
-export * from './workspace-split-view/index.js';
 export type { WorkspaceAliasConditionConfig } from './workspace-alias.condition.js';
 export type { WorkspaceEntityTypeConditionConfig } from './workspace-entity-type.condition.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
index 96d00cefde..dff1683135 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
@@ -1,8 +1,9 @@
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from './document-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, nothing, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
-import { ActiveVariant } from '@umbraco-cms/backoffice/workspace';
+import { type ActiveVariant } from '@umbraco-cms/backoffice/workspace';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
+
 @customElement('umb-document-workspace-split-view')
 export class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement {
 	// TODO: Refactor: use the split view context token: