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
index 7bd376eb40..91ac2c4199 100644
--- 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
@@ -2,3 +2,4 @@ export * from './image-cropper/index.js';
 export * from './image-crops-configuration/index.js';
 export * from './media-entity-picker/index.js';
 export * from './media-picker/index.js';
+export * from './upload-field/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/manifests.ts
index df593bb995..0cd00a29b7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/manifests.ts
@@ -1,12 +1,14 @@
-import { manifests as imageCropperManifests } from './image-cropper/manifests.js';
 import { manifest as imageCropsConfiguration } from './image-crops-configuration/manifests.js';
 import { manifest as mediaEntityPicker } from './media-entity-picker/manifests.js';
+import { manifests as imageCropperManifests } from './image-cropper/manifests.js';
 import { manifests as mediaPickerManifests } from './media-picker/manifests.js';
+import { manifests as uploadFieldManifests } from './upload-field/manifests.js';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<ManifestTypes> = [
 	...imageCropperManifests,
+	...mediaPickerManifests,
+	...uploadFieldManifests,
 	imageCropsConfiguration,
 	mediaEntityPicker,
-	...mediaPickerManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/Umbraco.UploadField.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/Umbraco.UploadField.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/Umbraco.UploadField.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/Umbraco.UploadField.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/index.ts
new file mode 100644
index 0000000000..5b8efc2967
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/index.ts
@@ -0,0 +1 @@
+export * from './property-editor-ui-upload-field.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/media/property-editors/upload-field/property-editor-ui-upload-field.test.ts
rename to src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/upload-field/property-editor-ui-upload-field.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/manifests.ts
deleted file mode 100644
index a62a14c46a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/media/property-editors/manifests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { manifests as uploadFieldManifests } from './upload-field/manifests.js';
-
-export const manifests = [...uploadFieldManifests];