diff --git a/src/Umbraco.Web.UI.Client/libs/tree/index.ts b/src/Umbraco.Web.UI.Client/libs/tree/index.ts
index 029ddbf0fd..a63531e505 100644
--- a/src/Umbraco.Web.UI.Client/libs/tree/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/tree/index.ts
@@ -1,4 +1,6 @@
 export * from './tree.context';
+export * from './tree-item-base.context';
+export * from './tree-item.context.interface';
 
 export interface UmbTreeRootModel {
 	type: string;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts
rename to src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree-item.context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts
rename to src/Umbraco.Web.UI.Client/libs/tree/tree-item.context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts
index 62db8e957c..4c61d2e624 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts
@@ -1,4 +1,4 @@
-import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context';
+import { UmbTreeItemContextBase } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts
index ec0c2f70c5..fc7017304c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts
@@ -3,8 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { repeat } from 'lit/directives/repeat.js';
-import { UmbTreeItemContext } from '../tree-item.context.interface';
-import { UMB_TREE_ITEM_CONTEXT_TOKEN } from './tree-item-base.context';
+import { UmbTreeItemContext, UMB_TREE_ITEM_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/tree';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
index 350d63ce47..448235c3b0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
@@ -1,5 +1,5 @@
-import { UmbTreeItemContextBase } from '../../../core/components/tree/tree-item-base/tree-item-base.context';
 import { urlFriendlyPathFromServerFilePath } from '../../utils';
+import { UmbTreeItemContextBase } from '@umbraco-cms/backoffice/tree';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';