diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
index 7f31b74cf7..e142386382 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
@@ -1,5 +1,5 @@
-import type { UmbDocumentPickerModalData, UmbDocumentPickerModalValue } from '../../modals/index.js';
-import { UMB_DOCUMENT_PICKER_MODAL } from '../../modals/index.js';
+import type { UmbDocumentPickerModalData, UmbDocumentPickerModalValue } from '../../picker/index.js';
+import { UMB_DOCUMENT_PICKER_MODAL } from '../../picker/index.js';
 import { UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS } from '../../repository/index.js';
 import type { UmbDocumentItemModel } from '../../repository/index.js';
 import type { UmbDocumentTreeItemModel } from '../../tree/types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
index 16628f33b6..cd01660773 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
@@ -12,6 +12,7 @@ export * from './reference/index.js';
 export * from './repository/index.js';
 export * from './user-permissions/index.js';
 export * from './workspace/index.js';
+export * from './picker/index.js';
 
 export * from './tree/index.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu/manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
index 5730bfbf75..06f584c66b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
@@ -4,5 +4,4 @@ export * from './save-modal/index.js';
 export * from './unpublish-modal/index.js';
 export * from './schedule-modal/index.js';
 export * from './shared/index.js';
-export * from './document-picker-modal.token.js';
 export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/document-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/document-picker-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/document-picker-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/document-picker-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/index.ts
new file mode 100644
index 0000000000..822da85065
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/index.ts
@@ -0,0 +1 @@
+export * from './document-picker-modal.token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
index 7aa3d7932b..6afbe3525a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts
@@ -2,7 +2,7 @@ import { UMB_DOCUMENT_RECYCLE_BIN_REPOSITORY_ALIAS } from '../repository/index.j
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS } from '../../repository/index.js';
 import { UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../entity.js';
-import { UMB_DOCUMENT_PICKER_MODAL } from '../../modals/document-picker-modal.token.js';
+import { UMB_DOCUMENT_PICKER_MODAL } from '../../picker/index.js';
 import {
 	UMB_USER_PERMISSION_DOCUMENT_DELETE,
 	UMB_USER_PERMISSION_DOCUMENT_MOVE,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts
index 6ab1ecd687..78954fe3b7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts
@@ -1,6 +1,6 @@
 import type { UmbDocumentUserPermissionModel } from '../types.js';
 import { UmbDocumentItemRepository, type UmbDocumentItemModel } from '../../repository/index.js';
-import { UMB_DOCUMENT_PICKER_MODAL } from '../../modals/index.js';
+import { UMB_DOCUMENT_PICKER_MODAL } from '../../picker/index.js';
 import { css, customElement, html, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';