diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
index 4f41e6642a..d823d2165a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
@@ -1,6 +1,6 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 
 /**
  * @export
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
index 15f5afac4d..a9290c2940 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts
@@ -1,4 +1,3 @@
-export * from './entity-tree-store.js';
 export * from './file-system-tree.store.js';
 export * from './item-store.interface.js';
 export * from './store-base.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/entity-tree-store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-store.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/core/store/entity-tree-store.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-store.ts
index e1e325090f..95e3bd6a02 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/entity-tree-store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-store.ts
@@ -1,4 +1,4 @@
-import { UmbStoreBase } from './store-base.js';
+import { UmbStoreBase } from '../store/store-base.js';
 import type { UmbTreeStore } from '@umbraco-cms/backoffice/tree';
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
index 7fcbac51cb..0f6a257b6b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
@@ -10,5 +10,6 @@ export * from './types.js';
 export * from './tree-repository.interface.js';
 export * from './tree-data-source.interface.js';
 export * from './tree-store.interface.js';
+export * from './entity-tree-store.js';
 
 export { UmbEntityTreeRepositoryBase } from './entity-tree.repository.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.tree.store.ts
index c2d19b876e..d05e19af5d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -20,5 +20,5 @@ export class UmbDictionaryTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_DICTIONARY_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDictionaryTreeStore>(
-	'UmbDictionaryTreeStore'
+	'UmbDictionaryTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.tree.store.ts
index 8f903b6402..07f07c4f20 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.tree.store.ts
@@ -1,9 +1,9 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export const UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentBlueprintTreeStore>(
-	'UmbDocumentBlueprintTreeStore'
+	'UmbDocumentBlueprintTreeStore',
 );
 
 /**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.tree.store.ts
index 3fe7e04e3d..420f62d9f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -21,5 +21,5 @@ export class UmbDocumentTypeTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentTypeTreeStore>(
-	'UmbDocumentTypeTreeStore'
+	'UmbDocumentTypeTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle.bin.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle.bin.tree.store.ts
index fa3f3290c3..423a4ad9b1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle.bin.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle.bin.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.tree.store.ts
index f24842be6a..b832f650fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.tree.store.ts
index 6556470752..b5b1bbf4e5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -20,5 +20,5 @@ export class UmbMediaTypeTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_MEDIA_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMediaTypeTreeStore>(
-	'UmbMediaTypeTreeStore'
+	'UmbMediaTypeTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.tree.store.ts
index 5924ae211b..eb8fcb20e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.tree.store.ts
@@ -1,7 +1,7 @@
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export const UMB_MEDIA_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMediaTreeStore>('UmbMediaTreeStore');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.tree.store.ts
index f2946c0a9f..52ad906621 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -20,5 +20,5 @@ export class UmbMemberGroupTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_MEMBER_GROUP_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMemberGroupTreeStore>(
-	'UmbMemberGroupTreeStore'
+	'UmbMemberGroupTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/member-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/member-type.tree.store.ts
index 06c9d08f33..3d7289a967 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/member-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/member-type.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -15,5 +15,5 @@ export class UmbMemberTypeTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_MEMBER_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMemberTypeTreeStore>(
-	'UmbMemberTypeTreeStore'
+	'UmbMemberTypeTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.tree.store.ts
index 7cf9d39911..647747ea5d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export const UMB_MEMBER_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMemberTreeStore>('UmbMemberTreeStore');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.tree.store.ts
index b5f8f68ce3..fd796dd6e2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.tree.store.ts
@@ -1,6 +1,6 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 
 /**
  * @export
@@ -21,5 +21,5 @@ export class UmbRelationTypeTreeStore extends UmbEntityTreeStore {
 }
 
 export const UMB_RELATION_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbRelationTypeTreeStore>(
-	'UmbRelationTypeTreeStore'
+	'UmbRelationTypeTreeStore',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.tree.store.ts
index 635ae820d0..b4effc9fa6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.tree.store.ts
@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/store';
+import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export const UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbTemplateTreeStore>('UmbTemplateTreeStore');