diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts
index 79b526fe29..c85cf0ed4f 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts
@@ -11,30 +11,31 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import './components/index.js';
 
 const CORE_PACKAGES = [
-	import('../../packages/umbraco-news/umbraco-package.js'),
-	import('../../packages/documents/umbraco-package.js'),
+	import('../../packages/audit-log/umbraco-package.js'),
+	import('../../packages/block/umbraco-package.js'),
 	import('../../packages/data-type/umbraco-package.js'),
+	import('../../packages/dictionary/umbraco-package.js'),
+	import('../../packages/documents/umbraco-package.js'),
+	import('../../packages/dynamic-root/umbraco-package.js'),
+	import('../../packages/health-check/umbraco-package.js'),
+	import('../../packages/language/umbraco-package.js'),
+	import('../../packages/log-viewer/umbraco-package.js'),
+	import('../../packages/markdown-editor/umbraco-package.js'),
 	import('../../packages/media/umbraco-package.js'),
 	import('../../packages/members/umbraco-package.js'),
+	import('../../packages/models-builder/umbraco-package.js'),
+	import('../../packages/packages/umbraco-package.js'),
+	import('../../packages/property-editors/umbraco-package.js'),
+	import('../../packages/relations/umbraco-package.js'),
 	import('../../packages/search/umbraco-package.js'),
 	import('../../packages/settings/umbraco-package.js'),
-	import('../../packages/language/umbraco-package.js'),
 	import('../../packages/static-file/umbraco-package.js'),
-	import('../../packages/dynamic-root/umbraco-package.js'),
-	import('../../packages/block/umbraco-package.js'),
 	import('../../packages/tags/umbraco-package.js'),
-	import('../../packages/tiny-mce/umbraco-package.js'),
-	import('../../packages/markdown-editor/umbraco-package.js'),
 	import('../../packages/templating/umbraco-package.js'),
-	import('../../packages/dictionary/umbraco-package.js'),
+	import('../../packages/tiny-mce/umbraco-package.js'),
+	import('../../packages/umbraco-news/umbraco-package.js'),
 	import('../../packages/user/umbraco-package.js'),
-	import('../../packages/health-check/umbraco-package.js'),
-	import('../../packages/audit-log/umbraco-package.js'),
 	import('../../packages/webhook/umbraco-package.js'),
-	import('../../packages/relations/umbraco-package.js'),
-	import('../../packages/models-builder/umbraco-package.js'),
-	import('../../packages/log-viewer/umbraco-package.js'),
-	import('../../packages/packages/umbraco-package.js'),
 ];
 
 @customElement('umb-backoffice')
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
index 4936630ae2..3ca9b4271a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
@@ -1,4 +1,3 @@
 import { manifests as propertyEditorSchemaManifests } from './schemas/manifests.js';
-import { manifests as propertyEditorUIManifests } from './uis/manifests.js';
 
-export const manifests = [...propertyEditorSchemaManifests, ...propertyEditorUIManifests];
+export const manifests = [...propertyEditorSchemaManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/index.ts
deleted file mode 100644
index 0eef45ef3c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// TODO: Currently we export input-checkbox-list because package-builder uses it, but this should be changed over time, so package builder uses the property editor UI and then this export can be removed.
-export * from './checkbox-list/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/input-checkbox-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/input-checkbox-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/input-checkbox-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/components/input-checkbox-list/input-checkbox-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.element.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.element.ts
index 7f78f66b71..1341fde46e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.element.ts
@@ -1,11 +1,11 @@
-import type { UmbInputCheckboxListElement } from './input-checkbox-list/input-checkbox-list.element.js';
+import type { UmbInputCheckboxListElement } from './components/input-checkbox-list/input-checkbox-list.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 
-import './input-checkbox-list/input-checkbox-list.element.js';
+import './components/input-checkbox-list/input-checkbox-list.element.js';
 
 /**
  * @element umb-property-editor-ui-checkbox-list
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/checkbox-list/property-editor-ui-checkbox-list.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.element.ts
index 9233e7b7d4..d532c1db53 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.element.ts
@@ -1,4 +1,4 @@
-import type { UmbCollectionBulkActionPermissions } from '../../../../../collection/types.js';
+import type { UmbCollectionBulkActionPermissions } from '../../../../core/collection/types.js';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit';
 import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/bulk-action-permissions/permissions.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.element.ts
index 872a98d141..6b20b6056b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.element.ts
@@ -1,4 +1,4 @@
-import type { UmbCollectionColumnConfiguration } from '../../../../../collection/types.js';
+import type { UmbCollectionColumnConfiguration } from '../../../../core/collection/types.js';
 import { html, customElement, property, repeat, css, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/column-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/column/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/layout-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/layout/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/config/order-by/order-by.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.element.ts
index 3990f98bb9..a0ff07cfbc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.element.ts
@@ -1,4 +1,4 @@
-import type { UmbPropertyEditorConfigCollection } from '../../config/index.js';
+import type { UmbPropertyEditorConfigCollection } from '../../core/property-editor/config/index.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from '@umbraco-cms/backoffice/document';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/collection-view/property-editor-ui-collection-view.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-picker/property-editor-ui-color-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-swatches-editor/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-swatches-editor/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.element.ts
index 9912586cf8..12699ce6d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.element.ts
@@ -1,5 +1,5 @@
-import { UmbPropertyValueChangeEvent } from '../../index.js';
-import type { UmbPropertyEditorConfigCollection } from '../../index.js';
+import { UmbPropertyValueChangeEvent } from '../../core/property-editor/index.js';
+import type { UmbPropertyEditorConfigCollection } from '../../core/property-editor/index.js';
 import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbInputDateElement } from '@umbraco-cms/backoffice/components';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.test.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.test.ts
index 7568a5eaef..ec822f74f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/date-picker/property-editor-ui-date-picker.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import type { UmbInputDateElement } from '../../../components/input-date/input-date.element.js';
+import type { UmbInputDateElement } from '../../core/components/input-date/input-date.element.js';
 import { UmbPropertyEditorUIDatePickerElement } from './property-editor-ui-date-picker.element.js';
 import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
 import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/dropdown/property-editor-ui-dropdown.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts
new file mode 100644
index 0000000000..a6a004ace8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/entry-point.ts
@@ -0,0 +1 @@
+import './checkbox-list/components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/eye-dropper/property-editor-ui-eye-dropper.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.stories.ts
similarity index 85%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.stories.ts
index 0637256ae5..147fc4a16e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.stories.ts
@@ -1,5 +1,5 @@
 import type { Meta, Story } from '@storybook/web-components';
-import type { UmbIconPickerModalElement } from '../../../modal/common/icon-picker/icon-picker-modal.element.js';
+import type { UmbIconPickerModalElement } from '../../core/modal/common/icon-picker/icon-picker-modal.element.js';
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
 import './property-editor-ui-icon-picker.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/index.ts
new file mode 100644
index 0000000000..b0f0268059
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/index.ts
@@ -0,0 +1 @@
+export * from './checkbox-list/components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/label/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/label/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/label/property-editor-ui-label.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
index a4602e52ef..481d01d635 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
@@ -1,5 +1,5 @@
-import { UmbLitElement } from '../../../lit-element/index.js';
-import { UMB_PROPERTY_CONTEXT } from '../../../property/property/index.js';
+import { UmbLitElement } from '../../core/lit-element/index.js';
+import { UMB_PROPERTY_CONTEXT } from '../../core/property/property/index.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
 import type { UmbInputMultiUrlElement } from '@umbraco-cms/backoffice/components';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
index 24dec4c9af..5cbb4572b2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
@@ -1,4 +1,4 @@
-import { UmbPropertyValueChangeEvent } from '../../index.js';
+import { UmbPropertyValueChangeEvent } from '../../core/property-editor/index.js';
 import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
index 20341c7838..a74c87da8e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.element.ts
@@ -1,4 +1,4 @@
-import type { UmbInputNumberRangeElement } from '../../../components/input-number-range/input-number-range.element.js';
+import type { UmbInputNumberRangeElement } from '../../core/components/input-number-range/input-number-range.element.js';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
@@ -6,7 +6,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models';
 
-import '../../../components/input-number-range/input-number-range.element.js';
+import '../../core/components/input-number-range/input-number-range.element.js';
 import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
 
 /**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number-range/property-editor-ui-number-range.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/number/property-editor-ui-number.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/order-direction/property-editor-ui-order-direction.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/overlay-size/property-editor-ui-overlay-size.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.element.ts
similarity index 87%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.element.ts
index e5f2f00257..510e3200d8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.element.ts
@@ -1,11 +1,11 @@
-import type { UmbInputRadioButtonListElement } from '../../../components/input-radio-button-list/input-radio-button-list.element.js';
+import type { UmbInputRadioButtonListElement } from '../../core/components/input-radio-button-list/input-radio-button-list.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 
-import '../../../components/input-radio-button-list/input-radio-button-list.element.js';
+import '../../core/components/input-radio-button-list/input-radio-button-list.element.js';
 
 /**
  * @element umb-property-editor-ui-radio-button-list
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/radio-button-list/property-editor-ui-radio-button-list.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/select/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/select/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/select/property-editor-ui-select.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/select/property-editor-ui-select.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
index af2b70ea0a..7202a0e904 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.element.ts
@@ -1,4 +1,4 @@
-import type { UmbInputSliderElement } from '../../../components/input-slider/input-slider.element.js';
+import type { UmbInputSliderElement } from '../../core/components/input-slider/input-slider.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/property-editor-ui-slider.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/property-editor-ui-textarea.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/property-editor-ui-textarea.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/property-editor-ui-textarea.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/property-editor-ui-textarea.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
index ebb7f464fe..587e4216d5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.element.ts
@@ -1,4 +1,4 @@
-import type { UmbInputToggleElement } from '../../../components/input-toggle/input-toggle.element.js';
+import type { UmbInputToggleElement } from '../../core/components/input-toggle/input-toggle.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/property-editor-ui-toggle.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-type-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-type-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/tree-picker/property-editor-ui-tree-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/umbraco-package.ts
new file mode 100644
index 0000000000..539a97da8b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/umbraco-package.ts
@@ -0,0 +1,15 @@
+export const name = 'Umbraco.Core.PropertyEditors';
+export const extensions = [
+	{
+		name: 'Property Editors Bundle',
+		alias: 'Umb.Bundle.PropertyEditors',
+		type: 'bundle',
+		js: () => import('./manifests.js'),
+	},
+	{
+		name: 'Property Editors Entry Point',
+		alias: 'Umb.EntryPoint.PropertyEditors',
+		type: 'entryPoint',
+		js: () => import('./entry-point.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.element.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.element.ts
index c93f11a438..1b55630fb5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.element.ts
@@ -1,4 +1,4 @@
-import type { UmbInputUploadFieldElement } from '../../../components/input-upload-field/input-upload-field.element.js';
+import type { UmbInputUploadFieldElement } from '../../core/components/input-upload-field/input-upload-field.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/upload-field/property-editor-ui-upload-field.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.test.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/value-type/property-editor-ui-value-type.test.ts