diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts
index a828ba2612..ff26554219 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts
@@ -15,9 +15,9 @@ import { manifest as markdownEditor } from './markdown-editor/manifests.js';
 import { manifest as radioButtonList } from './radio-button-list/manifests.js';
 import { manifest as checkboxList } from './checkbox-list/manifests.js';
 import { manifest as numberRange } from './number-range/manifests.js';
-import { manifest as mediaPicker } from './media-picker/manifests.js';
-import { manifest as imageCropsConfiguration } from './image-crops-configuration/manifests.js';
-import { manifest as imageCropper } from './image-cropper/manifests.js';
+import { manifest as mediaPicker } from '../../../media/media/property-editors/media-picker/manifests.js';
+import { manifest as imageCropsConfiguration } from '../../../media/media/property-editors/image-crops-configuration/manifests.js';
+import { manifest as imageCropper } from '../../../media/media/property-editors/image-cropper/manifests.js';
 import { manifest as uploadField } from './upload-field/manifests.js';
 import { manifest as orderDirection } from './order-direction/manifests.js';
 import { manifests as collectionView } from './collection-view/manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/index.ts
index b0cd856c7d..3c48dc1e29 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/index.ts
@@ -1,3 +1,4 @@
-import './input-media/input-media.element.js';
+import './input-media/index.js';
 
-export * from './input-media/input-media.element.js';
+export * from './input-media/index.js';
+export * from './input-image-cropper/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper-focus-setter.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper-focus-setter.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper-preview.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper-preview.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/image-cropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/input-image-cropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-image-cropper/input-image-cropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts
new file mode 100644
index 0000000000..6d1340ddc3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts
@@ -0,0 +1 @@
+export * from './input-media.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/index.ts
new file mode 100644
index 0000000000..ac32434996
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/index.ts
@@ -0,0 +1 @@
+export * from './property-editor-ui-image-cropper.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts
index cb354a1844..b70d30f8e6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts
@@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
-import '../../../components/input-image-cropper/input-image-cropper.element.js';
+import '../../components/input-image-cropper/input-image-cropper.element.js';
 
 /**
  * @element umb-property-editor-ui-image-cropper
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/index.ts
new file mode 100644
index 0000000000..c68c521c08
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/index.ts
@@ -0,0 +1 @@
+export * from './property-editor-ui-image-crops-configuration.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/index.ts
new file mode 100644
index 0000000000..badeba99cf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/index.ts
@@ -0,0 +1,3 @@
+export * from './image-cropper/index.js';
+export * from './image-crops-configuration/index.js';
+export * from './image-picker/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/index.ts
new file mode 100644
index 0000000000..7eddcc7572
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/index.ts
@@ -0,0 +1 @@
+export * from './property-editor-ui-media-picker.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts
index 4a43a6cd40..7796508a54 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts
@@ -1,4 +1,4 @@
-import { UmbInputMediaElement } from '../../../../media/media/components/input-media/input-media.element.js';
+import { UmbInputMediaElement } from '../../components/input-media/input-media.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.test.ts