diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section-tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section-tree.element.ts
index caa34cc1f1..c4d9055c67 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section-tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section-tree.element.ts
@@ -8,7 +8,7 @@ import { UmbDataTypeStore } from '../../../core/stores/data-type.store';
 import { map, Subscription, first } from 'rxjs';
 import { UmbDocumentTypeStore } from '../../../core/stores/document-type.store';
 import { createExtensionElement, UmbExtensionRegistry } from '../../../core/extension';
-import '../../tree/tree.element';
+import '../../tree/shared/tree.element';
 import { UmbSectionContext } from '../section.context';
 
 @customElement('umb-settings-section-tree')
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 fa6af47959..2b7c330533 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
@@ -7,7 +7,7 @@ import { UmbContextConsumerMixin } from '../../../core/context';
 import { UmbExtensionManifestTree, UmbExtensionRegistry } from '../../../core/extension';
 import { UmbSectionContext } from '../section.context';
 
-import '../../tree/tree.element';
+import '../../tree/shared/tree.element';
 
 @customElement('umb-section-trees')
 export class UmbSectionTrees extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/datatypes-tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/datatypes-tree.element.ts
index 6b8a179c6f..919ccb7c84 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/datatypes-tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/datatypes-tree.element.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
-import './tree-navigator.element';
-import './tree-item.element';
+import './shared/tree-navigator.element';
+import './shared/tree-item.element';
 
 @customElement('umb-datatype-tree')
 export class UmbDatatypeTree extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-type-tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-type-tree.element.ts
index 0e37af34a2..22c0e8fe24 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-type-tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/document-type-tree.element.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property } from 'lit/decorators.js';
-import './tree-navigator.element';
-import './tree-item.element';
+import './shared/tree-navigator.element';
+import './shared/tree-item.element';
 
 @customElement('umb-document-type-tree')
 export class UmbDocumentTypeTree extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts
index d7cf0a5f3c..607f0e10d2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.element.ts
@@ -2,8 +2,8 @@ import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
 
-import '../tree-navigator.element';
-import '../tree-item.element';
+import '../shared/tree-navigator.element';
+import '../shared/tree-item.element';
 
 @customElement('umb-tree-members')
 export class UmbTreeMembers extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts
index 3c5fc10ab3..a0bd70cb7a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbContextConsumerMixin } from '../../core/context';
-import { UmbTreeService } from './tree.service';
+import { UmbContextConsumerMixin } from '../../../core/context';
+import { UmbTreeService } from '../tree.service';
 import { UUIMenuItemEvent } from '@umbraco-ui/uui';
 
 @customElement('umb-tree-item')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-navigator.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts
index 1aaddd9a78..7e8ce5d31b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-navigator.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbContextProviderMixin } from '../../core/context';
-import { UmbTreeService } from './tree.service';
+import { UmbContextProviderMixin } from '../../../core/context';
+import { UmbTreeService } from '../tree.service';
 
 @customElement('umb-tree-navigator')
 export class UmbTreeNavigator extends UmbContextProviderMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-navigator.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree-navigator.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree.element.ts
index a6ee776437..5753800de4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree.element.ts
@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import { createExtensionElement, UmbExtensionManifestTree } from '../../core/extension';
+import { createExtensionElement, UmbExtensionManifestTree } from '../../../core/extension';
 import { UmbTreeNavigator } from './tree-navigator.element';
 
 @customElement('umb-tree')