diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar.element.ts
index f59702cd93..a06e31f917 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { Subscription } from 'rxjs';
 import { UmbContextConsumerMixin } from '../../../core/context';
 import { UmbSectionContext } from '../section.context';
-import '../../tree/actions/actions.service';
+import '../../trees/actions/actions.service';
 
 @customElement('umb-section-sidebar')
 export class UmbSectionSidebar extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees.element.ts
index 58a2ae5adf..f112612a04 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees.element.ts
@@ -8,7 +8,7 @@ import { UmbExtensionRegistry } from '../../../core/extension';
 import { UmbSectionContext } from '../section.context';
 import type { ManifestTree } from '../../../core/models';
 
-import '../../tree/shared/tree.element';
+import '../../trees/shared/tree.element';
 
 @customElement('umb-section-trees')
 export class UmbSectionTrees extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action-list-page.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action-list-page.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action-list-page.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action-list-page.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action-page.service.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action-page.service.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action-page.service.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/actions.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/actions.service.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/actions.service.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/actions.service.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create-page-2.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create-page-2.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create-page-2.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create-page-2.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create-page.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create-page.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create-page.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create-page.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-create.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-create.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-delete.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-delete.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-delete.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-reload.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-reload.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action-reload.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action-reload.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/actions/tree-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/actions/tree-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-types/tree-document-types.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/document-types/tree-document-types.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-types/tree-document-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/document-types/tree-document-types.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/documents/tree-documents.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/documents/tree-documents.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/documents/tree-documents.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/documents/tree-documents.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/extensions/tree-extensions.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/extensions/tree-extensions.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/extensions/tree-extensions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/extensions/tree-extensions.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/media/tree-media.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/media/tree-media.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/media/tree-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/media/tree-media.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
index 8f2e2bc464..29a40378c0 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
@@ -8,7 +8,7 @@ export interface UmbModalContentPickerData {
 	selection: Array<string>;
 }
 
-import '../../../../../backoffice/tree/documents/tree-documents.element';
+import '../../../../../backoffice/trees/documents/tree-documents.element';
 
 @customElement('umb-modal-layout-content-picker')
 export class UmbModalLayoutContentPickerElement extends UmbModalLayoutElement<UmbModalContentPickerData> {
diff --git a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts
index 3cd22cdca0..3c839f5dbd 100644
--- a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts
@@ -245,7 +245,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.DataTypes',
 		name: 'Data Types Tree',
-		loader: () => import('./backoffice/tree/data-types/tree-data-types.element'),
+		loader: () => import('./backoffice/trees/data-types/tree-data-types.element'),
 		meta: {
 			weight: 1,
 			sections: ['Umb.Section.Settings'],
@@ -255,7 +255,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.DocumentTypes',
 		name: 'Document Types Tree',
-		loader: () => import('./backoffice/tree/document-types/tree-document-types.element'),
+		loader: () => import('./backoffice/trees/document-types/tree-document-types.element'),
 		meta: {
 			weight: 2,
 			sections: ['Umb.Section.Settings'],
@@ -277,7 +277,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.Members',
 		name: 'Members Tree',
-		loader: () => import('./backoffice/tree/members/tree-members.element'),
+		loader: () => import('./backoffice/trees/members/tree-members.element'),
 		meta: {
 			weight: 0,
 			sections: ['Umb.Section.Members'],
@@ -287,7 +287,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.MemberGroups',
 		name: 'Members Groups Tree',
-		loader: () => import('./backoffice/tree/member-groups/tree-member-groups.element'),
+		loader: () => import('./backoffice/trees/member-groups/tree-member-groups.element'),
 		meta: {
 			weight: 1,
 			sections: ['Umb.Section.Members'],
@@ -297,7 +297,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.Extensions',
 		name: 'Extensions Tree',
-		loader: () => import('./backoffice/tree/extensions/tree-extensions.element'),
+		loader: () => import('./backoffice/trees/extensions/tree-extensions.element'),
 		meta: {
 			weight: 3,
 			sections: ['Umb.Section.Settings'],
@@ -307,7 +307,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.Media',
 		name: 'Media Tree',
-		loader: () => import('./backoffice/tree/media/tree-media.element'),
+		loader: () => import('./backoffice/trees/media/tree-media.element'),
 		meta: {
 			weight: 100,
 			sections: ['Umb.Section.Media'],
@@ -317,7 +317,7 @@ export const internalManifests: Array<ManifestTypes & { loader: () => Promise<ob
 		type: 'tree',
 		alias: 'Umb.Tree.Content',
 		name: 'Content Tree',
-		loader: () => import('./backoffice/tree/documents/tree-documents.element'),
+		loader: () => import('./backoffice/trees/documents/tree-documents.element'),
 		meta: {
 			weight: 100,
 			sections: ['Umb.Section.Content'],