diff --git a/src/Umbraco.Web.UI.Client/src/libs/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/index.ts
similarity index 74%
rename from src/Umbraco.Web.UI.Client/src/libs/tree/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/tree/index.ts
index a63531e505..56e1a53a48 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/tree/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/index.ts
@@ -1,6 +1,6 @@
 export * from './tree.context';
-export * from './tree-item-base.context';
-export * from './tree-item.context.interface';
+export * from './tree-item-base/tree-item-base.context';
+export * from './tree-item/tree-item.context.interface';
 
 export interface UmbTreeRootModel {
 	type: string;
diff --git a/src/Umbraco.Web.UI.Client/src/libs/tree/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree-item-base/tree-item-base.context.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/libs/tree/tree-item-base.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree-item-base/tree-item-base.context.ts
index 7340e7223d..371f9b0245 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/tree/tree-item-base.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree-item-base/tree-item-base.context.ts
@@ -1,5 +1,5 @@
 import { map } from 'rxjs';
-import { UmbTreeItemContext } from './tree-item.context.interface';
+import { UmbTreeItemContext } from '../tree-item/tree-item.context.interface';
 import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from 'src/libs/section';
 import type { UmbSectionContext, UmbSectionSidebarContext } from 'src/libs/section';
 import { UmbTreeContextBase } from 'src/libs/tree';
diff --git a/src/Umbraco.Web.UI.Client/src/libs/tree/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree-item/tree-item.context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/libs/tree/tree-item.context.interface.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree-item/tree-item.context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/libs/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/libs/tree/tree.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/tree/tree.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/libs/variant/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/variant/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/libs/variant/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/variant/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/libs/variant/variant-id.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/variant/variant-id.class.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/libs/variant/variant-id.class.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/components/variant/variant-id.class.ts