diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
index 73587fb136..37cfc028dd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
@@ -1,5 +1,4 @@
-export * from './components/not-found/route-not-found.element.js';
-export * from './components/router-slot/index.js';
+export * from './route/index.js';
 export * from './contexts/index.js';
 export * from './encode-folder-name.function.js';
 export * from './modal-registration/modal-route-registration.controller.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
index 81477fb309..0c516e374d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
@@ -1,4 +1,3 @@
-import { UMB_ROUTE_CONTEXT, UMB_ROUTE_PATH_ADDENDUM_CONTEXT } from '../index.js';
 import { encodeFolderName } from '../encode-folder-name.function.js';
 import type { UmbModalRouteRegistration } from './modal-route-registration.interface.js';
 import type {
@@ -13,6 +12,8 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import type { UmbDeepPartialObject } from '@umbraco-cms/backoffice/utils';
 import type { IRouterSlot, Params } from '@umbraco-cms/backoffice/external/router-slot';
+import { UMB_ROUTE_PATH_ADDENDUM_CONTEXT } from '../contexts/route-path-addendum.context-token.js';
+import { UMB_ROUTE_CONTEXT } from '../route/route.context.js';
 
 export type UmbModalRouteBuilder = (params: { [key: string]: string | number } | null) => string;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/index.ts
similarity index 79%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/index.ts
index ed32035358..1c30607927 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/index.ts
@@ -1,3 +1,4 @@
+export * from './not-found/route-not-found.element.js';
 export * from './route.context.js';
 export * from './router-slot-change.event.js';
 export * from './router-slot-init.event.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/not-found/route-not-found.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/not-found/route-not-found.element.ts
index fc9a835cc9..522228a482 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/not-found/route-not-found.element.ts
@@ -5,7 +5,6 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 /**
  * A fallback view to be used in Workspace Views, maybe this can be upgraded at a later point.
  */
-// TODO: Rename and move this file to a more generic place.
 @customElement('umb-route-not-found')
 export class UmbRouteNotFoundElement extends UmbLitElement {
 	override render() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/route.context.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/route.context.ts
index ea40a677f8..15a5a48162 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/route.context.ts
@@ -1,5 +1,3 @@
-import { umbGenerateRoutePathBuilder } from '../../generate-route-path-builder.function.js';
-import type { UmbModalRouteRegistration } from '../../modal-registration/modal-route-registration.interface.js';
 import type { UmbRoute } from './route.interface.js';
 import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
@@ -7,6 +5,8 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UmbStringState, mergeObservables } from '@umbraco-cms/backoffice/observable-api';
+import type { UmbModalRouteRegistration } from '../modal-registration/modal-route-registration.interface.js';
+import { umbGenerateRoutePathBuilder } from '../generate-route-path-builder.function.js';
 
 const EmptyDiv = document.createElement('div');
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/route.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.interface.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/route.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-change.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot-change.event.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-change.event.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot-change.event.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-init.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot-init.event.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-init.event.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot-init.event.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot.element.ts
index 291e8cd119..fb4154e46a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot.element.ts
@@ -1,5 +1,4 @@
 import '@umbraco-cms/backoffice/external/router-slot';
-import { UmbRoutePathAddendumResetContext } from '../../contexts/route-path-addendum-reset.context.js';
 import { UmbRouterSlotInitEvent } from './router-slot-init.event.js';
 import { UmbRouterSlotChangeEvent } from './router-slot-change.event.js';
 import type { UmbRoute } from './route.interface.js';
@@ -7,6 +6,7 @@ import { UmbRouteContext } from './route.context.js';
 import { css, html, type PropertyValueMap, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot';
+import { UmbRoutePathAddendumResetContext } from '../contexts/route-path-addendum-reset.context.js';
 
 /**
  *  @element umb-router-slot