diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/index.ts
index c901ad56cb..388ec6aca4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/index.ts
@@ -1,2 +1,2 @@
-export { UmbDocumentTypeFolderRepository } from './document-type-folder.repository.js';
-export * from './constants.js';
+export * from './repository/index.js';
+export * from './workspace/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts
index de51893e4c..9715c8438e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts
@@ -1,20 +1,9 @@
 import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
-import { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS, UMB_DOCUMENT_TYPE_FOLDER_STORE_ALIAS } from './constants.js';
+import { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from './repository/constants.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
+import { manifests as repositoryManifests } from './repository/manifests.js';
 
 export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'repository',
-		alias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
-		name: 'Document Type Folder Repository',
-		api: () => import('./document-type-folder.repository.js'),
-	},
-	{
-		type: 'store',
-		alias: UMB_DOCUMENT_TYPE_FOLDER_STORE_ALIAS,
-		name: 'Document Type Store',
-		api: () => import('./document-type-folder.store.js'),
-	},
 	{
 		type: 'entityAction',
 		kind: 'folderUpdate',
@@ -35,5 +24,6 @@ export const manifests: Array<UmbExtensionManifest> = [
 			folderRepositoryAlias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
 		},
 	},
+	...repositoryManifests,
 	...workspaceManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/constants.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/constants.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/constants.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.server.data-source.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.server.data-source.ts
index 4c6093eeb8..4c088664be 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.server.data-source.ts
@@ -1,4 +1,4 @@
-import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../../entity.js';
 import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree';
 import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.store.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.store.context-token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.store.context-token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.store.context-token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.store.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/document-type-folder.store.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/index.ts
new file mode 100644
index 0000000000..4f07201dcf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/index.ts
@@ -0,0 +1 @@
+export * from './constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/manifests.ts
new file mode 100644
index 0000000000..d7eb1f332b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/repository/manifests.ts
@@ -0,0 +1,16 @@
+import { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS, UMB_DOCUMENT_TYPE_FOLDER_STORE_ALIAS } from './constants.js';
+
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'repository',
+		alias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
+		name: 'Document Type Folder Repository',
+		api: () => import('./document-type-folder.repository.js'),
+	},
+	{
+		type: 'store',
+		alias: UMB_DOCUMENT_TYPE_FOLDER_STORE_ALIAS,
+		name: 'Document Type Store',
+		api: () => import('./document-type-folder.store.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts
index 441f4479aa..20861a3515 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts
@@ -1,5 +1,5 @@
 import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../../entity.js';
-import type { UmbDocumentTypeFolderRepository } from '../document-type-folder.repository.js';
+import type { UmbDocumentTypeFolderRepository } from '../repository/index.js';
 import { UMB_DOCUMENT_TYPE_FOLDER_WORKSPACE_ALIAS } from './constants.js';
 import { UmbFolderWorkspaceEditorElement } from './folder-editor.element.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/workspace/index.ts
new file mode 100644
index 0000000000..e69de29bb2