diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index c625df6072..7bf371be6a 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -27,7 +27,7 @@
 		"./content-type": "./dist-cms/packages/core/content-type/index.js",
 		"./culture": "./dist-cms/packages/core/culture/index.js",
 		"./current-user": "./dist-cms/packages/user/current-user/index.js",
-		"./data-type": "./dist-cms/packages/core/data-type/index.js",
+		"./data-type": "./dist-cms/packages/data-type/index.js",
 		"./debug": "./dist-cms/packages/core/debug/index.js",
 		"./dictionary": "./dist-cms/packages/dictionary/index.js",
 		"./document-blueprint": "./dist-cms/packages/documents/document-blueprints/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts
index 844a5ea2ea..1d13c69b80 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts
@@ -1,6 +1,6 @@
 import { manifests as collectionManifests } from './collection/manifests.js';
 import { manifests as cultureManifests } from './culture/manifests.js';
-import { manifests as dataTypeManifests } from './data-type/manifests.js';
+import { manifests as dataTypeManifests } from '../data-type/manifests.js';
 import { manifests as debugManifests } from './debug/manifests.js';
 import { manifests as entityActionManifests } from './entity-action/manifests.js';
 import { manifests as extensionManifests } from './extension-registry/manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts
index 6d9f0e45e1..83d0ec724a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts
@@ -1,4 +1,4 @@
-import type { UmbCopyDataTypeRepository } from '../../data-type/repository/copy/data-type-copy.repository.js';
+import type { UmbCopyDataTypeRepository } from '../../../data-type/repository/copy/data-type-copy.repository.js';
 import { UmbReloadTreeItemChildrenRequestEntityActionEvent } from './reload-tree-item-children-request.event.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-flow-input/data-type-flow-input.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-flow-input/data-type-flow-input.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/property-editor-config.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/property-editor-config.element.ts
index f5448334f3..93a55a4c38 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/property-editor-config.element.ts
@@ -1,8 +1,8 @@
+import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../workspace/data-type-workspace.context-token.js';
 import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { PropertyEditorConfigProperty } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/data-type';
 
 /**
  * @element umb-property-editor-config
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/property-editor-config.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/property-editor-config/property-editor-config.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/ref-data-type/ref-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/ref-data-type/ref-data-type.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/ref-data-type/ref-data-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/ref-data-type/ref-data-type.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/ref-data-type/ref-data-type.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/ref-data-type/ref-data-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/ref-data-type/ref-data-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/components/ref-data-type/ref-data-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/copy/copy.action.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/copy/copy.action.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/copy/copy.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/copy/copy.action.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/copy/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/copy/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/copy/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/copy/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/create.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/modal/data-type-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/data-type-create-options-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/modal/data-type-create-options-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/data-type-create-options-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/modal/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/move/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/move/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/move/move.action.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/move.action.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/move/move.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/move.action.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/entity.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/menu-item/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/menu-item/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/menu-item/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
index c75eb16f3d..55acd43813 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -1,5 +1,6 @@
 import { UmbDataTypeTreeRepository } from '../../tree/data-type-tree.repository.js';
 import type { UmbDataTypeTreeItemModel } from '../../tree/types.js';
+import { UMB_DATATYPE_WORKSPACE_MODAL } from '../../workspace/data-type-workspace.modal-token.js';
 import { css, html, repeat, customElement, state, when, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
@@ -15,7 +16,6 @@ import {
 } from '@umbraco-cms/backoffice/modal';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import { UMB_DATATYPE_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/data-type';
 
 interface GroupedItems<T> {
 	[key: string]: Array<T>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/modals/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
index 894a40e515..5ba6e7a053 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
@@ -4,7 +4,7 @@ import { html } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUIPickerModalValue } from '@umbraco-cms/backoffice/modal';
 
 import './property-editor-ui-picker-modal.element.js';
-import '../../../components/body-layout/body-layout.element.js';
+import '../../../core/components/body-layout/body-layout.element.js';
 
 export default {
 	title: 'API/Modals/Layouts/Property Editor UI Picker',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/data-type-copy.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/data-type-copy.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/data-type-copy.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/data-type-copy.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/copy/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.store.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.store.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.store.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/data-type-item.store.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/types.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/types.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/item/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
index 83645d8609..b0a3b12a27 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
@@ -1,4 +1,4 @@
-import { UmbTreeRepositoryBase } from '../../tree/tree-repository-base.js';
+import { UmbTreeRepositoryBase } from '../../core/tree/tree-repository-base.js';
 import { UMB_DATA_TYPE_ROOT_ENTITY_TYPE } from '../entity.js';
 import { UmbDataTypeTreeServerDataSource } from './data-type-tree.server.data-source.js';
 import { UMB_DATA_TYPE_TREE_STORE_CONTEXT } from './data-type-tree.store.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.store.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.store.ts
index 1984a64eed..b3647216a1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.store.ts
@@ -1,5 +1,5 @@
-import { UmbStoreConnector } from '../../store/store-connector.js';
-import { UmbUniqueTreeStore } from '../../tree/unique-tree-store.js';
+import { UmbStoreConnector } from '../../core/store/store-connector.js';
+import { UmbUniqueTreeStore } from '../../core/tree/unique-tree-store.js';
 import { UMB_DATA_TYPE_DETAIL_STORE_CONTEXT } from '../repository/detail/data-type-detail.store.js';
 import type { UmbDataTypeDetailModel } from '../types.js';
 import type { UmbDataTypeTreeItemModel } from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/types.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/types.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/reload-tree-item-children/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context-token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.context-token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context-token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.modal-token.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.modal-token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.modal-token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.modal-token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.stories.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.stories.ts
index b844aa0604..07fa260983 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.stories.ts
@@ -1,7 +1,7 @@
 import './data-type-workspace.element.js';
 
 import type { Meta, Story } from '@storybook/web-components';
-import { data } from '../../../../mocks/data/data-type/data-type.data.js';
+import { data } from '../../../mocks/data/data-type/data-type.data.js';
 import type { UmbDataTypeWorkspaceElement } from './data-type-workspace.element.js';
 import { html, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 7e6d737e78..3c5d11fd85 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -45,7 +45,7 @@
 			"@umbraco-cms/backoffice/content-type": ["./src/packages/core/content-type/index.ts"],
 			"@umbraco-cms/backoffice/culture": ["./src/packages/core/culture/index.ts"],
 			"@umbraco-cms/backoffice/current-user": ["./src/packages/user/current-user/index.ts"],
-			"@umbraco-cms/backoffice/data-type": ["./src/packages/core/data-type/index.ts"],
+			"@umbraco-cms/backoffice/data-type": ["./src/packages/data-type/index.ts"],
 			"@umbraco-cms/backoffice/debug": ["./src/packages/core/debug/index.ts"],
 			"@umbraco-cms/backoffice/dictionary": ["./src/packages/dictionary/index.ts"],
 			"@umbraco-cms/backoffice/document-blueprint": ["./src/packages/documents/document-blueprints/index.ts"],