diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal-route-registration.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal-route-registration.ts
index f28b63ad91..49d7729b4f 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal-route-registration.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal-route-registration.ts
@@ -1,6 +1,6 @@
 // eslint-disable-next-line local-rules/no-external-imports
 import type { IRouterSlot } from 'router-slot/model';
-import { encodeFolderName } from '@umbraco-cms/internal/router';
+import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbModalHandler } from './modal-handler';
 import { UmbModalConfig, UmbModalContext } from './modal.context';
 import { UmbModalToken } from './token/modal-token';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/encode-folder-name.function.ts b/src/Umbraco.Web.UI.Client/libs/router/encode-folder-name.function.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/router/encode-folder-name.function.ts
rename to src/Umbraco.Web.UI.Client/libs/router/encode-folder-name.function.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/router/index.ts b/src/Umbraco.Web.UI.Client/libs/router/index.ts
index a8976a8650..52b78a5653 100644
--- a/src/Umbraco.Web.UI.Client/libs/router/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/router/index.ts
@@ -13,3 +13,4 @@ export * from 'router-slot/util';
 export * from './route.context';
 export * from './route.interface';
 export * from './generate-route-path-builder.function';
+export * from './encode-folder-name.function';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
index 7b449ee381..18bcca07ee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
@@ -5,7 +5,8 @@ import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context';
 import type { UmbDocumentTypeWorkspaceViewEditTabElement } from './document-type-workspace-view-edit-tab.element';
 import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type';
-import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent, encodeFolderName } from '@umbraco-cms/internal/router';
+import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router';
+import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts
index 93428aeec9..72bc770d60 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts
@@ -4,7 +4,8 @@ import { customElement, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentWorkspaceContext } from '../../document-workspace.context';
 import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type';
-import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent, encodeFolderName } from '@umbraco-cms/internal/router';
+import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router';
+import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/index.ts b/src/Umbraco.Web.UI.Client/src/shared/router/index.ts
index 7c78f66f25..fbbe29d96c 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/router/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/shared/router/index.ts
@@ -2,4 +2,3 @@ export * from './router-slot.element';
 export * from './router-slot-change.event';
 export * from './router-slot-init.event';
 export * from './variant-router-slot.element';
-export * from './encode-folder-name.function';