diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts
index bb743e457d..c4e61d4c70 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts
@@ -37,6 +37,7 @@ import './table/table.element';
 
 import './tree/tree.element';
 import './tree/entity-tree-item/entity-tree-item.element';
+import './tree/file-system-tree-item/file-system-tree-item.element';
 import './tree/tree-menu-item/tree-menu-item.element';
 
 import './variantable-property/variantable-property.element';
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/shared/components/tree/file-system-tree-item/file-system-tree-item.context.ts
similarity index 75%
rename from src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/file-system-tree-item/file-system-tree-item.context.ts
index 35f216062e..a51b41b87a 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/shared/components/tree/file-system-tree-item/file-system-tree-item.context.ts
@@ -1,7 +1,7 @@
-import { UmbTreeItemContextBase } from '../../../shared/components/tree/tree-item-base/tree-item-base.context';
-import { urlFriendlyPathFromServerFilePath } from '../../utils';
+import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context';
 import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
 import { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
+import { urlFriendlyPathFromServerPath } from 'src/backoffice/templating/utils';
 
 // TODO get unique method from an entity repository static method
 export class UmbFileSystemTreeItemContext extends UmbTreeItemContextBase<FileSystemTreeItemPresentationModel> {
@@ -10,6 +10,6 @@ export class UmbFileSystemTreeItemContext extends UmbTreeItemContextBase<FileSys
 	}
 
 	constructPath(pathname: string, entityType: string, path: string) {
-		return `section/${pathname}/workspace/${entityType}/edit/${urlFriendlyPathFromServerFilePath(path)}`;
+		return `section/${pathname}/workspace/${entityType}/edit/${urlFriendlyPathFromServerPath(path)}`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/file-system-tree-item/file-system-tree-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/file-system-tree-item/file-system-tree-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts
index b7cfcf7654..d0e94a4863 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts
@@ -14,7 +14,7 @@ import {
 } from '@umbraco-cms/backoffice/context-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import type { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
-import { urlFriendlyPathFromServerFilePath } from 'src/backoffice/templating/utils';
+import { urlFriendlyPathFromServerPath } from 'src/backoffice/templating/utils';
 
 // add type for unique function
 export type UmbTreeItemUniqueFunction<T extends TreeItemPresentationModel> = (x: T) => string | null | undefined;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/index.ts
deleted file mode 100644
index 23987fc391..0000000000
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-import './file-system-tree-item/file-system-tree-item.element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/index.ts
index 27ba7af32b..02854c3770 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/index.ts
@@ -4,8 +4,6 @@ import { manifests as stylesheetManifests } from './stylesheets/manifests';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import { ManifestTypes } from '@umbraco-cms/backoffice/extensions-registry';
 
-import './components';
-
 export const manifests = [...menuManifests, ...templateManifests, ...stylesheetManifests];
 
 const registerExtensions = (manifests: Array<ManifestTypes>) => {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.element.ts
index a0e2ba7e85..3479aff92c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.element.ts
@@ -2,10 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoutingInfo } from 'router-slot';
-import { serverFilePathFromUrlFriendlyPath } from '../../utils';
 import { UmbStylesheetWorkspaceEditElement } from './stylesheet-workspace-edit.element';
 import { UmbStylesheetWorkspaceContext } from './stylesheet-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
+import { serverPathFromUrlFriendlyPath } from '../../utils';
 
 @customElement('umb-stylesheet-workspace')
 export class UmbStylesheetWorkspaceElement extends UmbLitElement {
@@ -30,7 +30,7 @@ export class UmbStylesheetWorkspaceElement extends UmbLitElement {
 			component: () => this.#element,
 			setup: (component: HTMLElement, info: IRoutingInfo) => {
 				const path = info.match.params.path;
-				const serverPath = serverFilePathFromUrlFriendlyPath(path);
+				const serverPath = serverPathFromUrlFriendlyPath(path);
 				this.#workspaceContext.load(serverPath);
 			},
 		},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/utils.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/utils.ts
index 80214bb7fd..76636de368 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/utils.ts
@@ -1,5 +1,5 @@
 // TODO: we can try and make pretty urls if we want to
-export const urlFriendlyPathFromServerFilePath = (path: string) => encodeURIComponent(path).replace('.', '-');
+export const urlFriendlyPathFromServerPath = (path: string) => encodeURIComponent(path).replace('.', '-');
 
 // TODO: we can try and make pretty urls if we want to
-export const serverFilePathFromUrlFriendlyPath = (unique: string) => decodeURIComponent(unique.replace('-', '.'));
+export const serverPathFromUrlFriendlyPath = (unique: string) => decodeURIComponent(unique.replace('-', '.'));