diff --git a/src/packages/core/manifests.ts b/src/packages/core/manifests.ts
index a5d086a242..25e388e063 100644
--- a/src/packages/core/manifests.ts
+++ b/src/packages/core/manifests.ts
@@ -13,6 +13,7 @@ import { manifests as menuManifests } from './menu/manifests.js';
 import { manifests as modalManifests } from './modal/manifests.js';
 import { manifests as pickerManifests } from './picker/manifests.js';
 import { manifests as propertyActionManifests } from './property-action/manifests.js';
+import { manifests as propertyEditorManifests } from './property-editor/manifests.js';
 import { manifests as propertyManifests } from './property/manifests.js';
 import { manifests as propertyTypeManifests } from './property-type/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
@@ -40,6 +41,7 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 	...modalManifests,
 	...pickerManifests,
 	...propertyActionManifests,
+	...propertyEditorManifests,
 	...propertyManifests,
 	...propertyTypeManifests,
 	...recycleBinManifests,
diff --git a/src/packages/core/modal/token/index.ts b/src/packages/core/modal/token/index.ts
index 0a0e3bf541..dcddaf3a9a 100644
--- a/src/packages/core/modal/token/index.ts
+++ b/src/packages/core/modal/token/index.ts
@@ -1,4 +1,3 @@
 export * from './change-password-modal.token.js';
 export * from './embedded-media-modal.token.js';
 export * from './modal-token.js';
-export * from './property-editor-ui-picker-modal.token.js';
diff --git a/src/packages/core/property-editor/index.ts b/src/packages/core/property-editor/index.ts
index 5f5c1f5388..abd78bfa28 100644
--- a/src/packages/core/property-editor/index.ts
+++ b/src/packages/core/property-editor/index.ts
@@ -1,4 +1,5 @@
 export * from './components/index.js';
 export * from './config/index.js';
-export * from './events/index.js';
 export * from './constants.js';
+export * from './events/index.js';
+export * from './ui-picker-modal/index.js';
diff --git a/src/packages/core/property-editor/manifests.ts b/src/packages/core/property-editor/manifests.ts
new file mode 100644
index 0000000000..fb5a8ae26f
--- /dev/null
+++ b/src/packages/core/property-editor/manifests.ts
@@ -0,0 +1,3 @@
+import { manifests as uiPickerModalManifests } from './ui-picker-modal/manifests.js';
+
+export const manifests: Array<UmbExtensionManifest> = [...uiPickerModalManifests];
diff --git a/src/packages/core/property-editor/ui-picker-modal/index.ts b/src/packages/core/property-editor/ui-picker-modal/index.ts
new file mode 100644
index 0000000000..10ce5e62e5
--- /dev/null
+++ b/src/packages/core/property-editor/ui-picker-modal/index.ts
@@ -0,0 +1 @@
+export * from './property-editor-ui-picker-modal.token.js';
diff --git a/src/packages/core/property-editor/ui-picker-modal/manifests.ts b/src/packages/core/property-editor/ui-picker-modal/manifests.ts
new file mode 100644
index 0000000000..95c29a5ee0
--- /dev/null
+++ b/src/packages/core/property-editor/ui-picker-modal/manifests.ts
@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.PropertyEditorUiPicker',
+		name: 'Property Editor UI Picker Modal',
+		element: () => import('./property-editor-ui-picker-modal.element.js'),
+	},
+];
diff --git a/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
similarity index 99%
rename from src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
rename to src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
index 3fb5bd97c2..b3aeeede87 100644
--- a/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
+++ b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
@@ -1,13 +1,13 @@
+import type {
+	UmbPropertyEditorUIPickerModalData,
+	UmbPropertyEditorUIPickerModalValue,
+} from './property-editor-ui-picker-modal.token.js';
 import { css, customElement, html, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { fromCamelCase } from '@umbraco-cms/backoffice/utils';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry';
-import type {
-	UmbPropertyEditorUIPickerModalData,
-	UmbPropertyEditorUIPickerModalValue,
-} from '@umbraco-cms/backoffice/modal';
 import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-property-editor-ui-picker-modal')
diff --git a/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
similarity index 81%
rename from src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
rename to src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
index 036a9c7c58..6d9d81d8a6 100644
--- a/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
+++ b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
@@ -1,10 +1,10 @@
 import type { UmbPropertyEditorUIPickerModalElement } from './property-editor-ui-picker-modal.element.js';
+import type { UmbPropertyEditorUIPickerModalValue } from './property-editor-ui-picker-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 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 '../../../core/components/body-layout/body-layout.element.js';
+import '../../components/body-layout/body-layout.element.js';
 
 export default {
 	title: 'API/Modals/Layouts/Property Editor UI Picker',
diff --git a/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.token.ts
similarity index 88%
rename from src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
rename to src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.token.ts
index 185f5ff781..d6aacdea4b 100644
--- a/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
+++ b/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbPropertyEditorUIPickerModalData {
 	/** @deprecated This property will be removed in Umbraco 15. */
diff --git a/src/packages/data-type/modals/manifests.ts b/src/packages/data-type/modals/manifests.ts
index 253bef89c2..f93db92b61 100644
--- a/src/packages/data-type/modals/manifests.ts
+++ b/src/packages/data-type/modals/manifests.ts
@@ -1,10 +1,4 @@
 export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.PropertyEditorUiPicker',
-		name: 'Property Editor UI Picker Modal',
-		element: () => import('./property-editor-ui-picker/property-editor-ui-picker-modal.element.js'),
-	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.DataTypePickerFlow',
diff --git a/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts b/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
index 3d19245fe3..8b246fd9f3 100644
--- a/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
+++ b/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
@@ -2,7 +2,8 @@ import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../data-type-workspace.conte
 import { css, customElement, html, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_PROPERTY_EDITOR_UI_PICKER_MODAL } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace';
 import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';