diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/index.ts
index da84c98396..c8ff6ada84 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/index.ts
@@ -1,3 +1,3 @@
-export type { UmbModalContext, UmbModalRejectReason } from './modal.context.js';
+export type { UmbModalContext, UmbModalRejectReason, UmbModalContextClassArgs } from './modal.context.js';
 export { UMB_MODAL_CONTEXT } from './modal.context-token.js';
 export * from './modal-manager.context.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/index.ts
index ed8a43f8b0..59329387f8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/index.ts
@@ -1,8 +1,6 @@
 import './component/modal.element.js';
 
 export * from './context/index.js';
-export * from './route-registration/modal-route-registration.interface.js';
-export * from './route-registration/modal-route-registration.controller.js';
 export * from './token/index.js';
 export * from './types.js';
 export * from './component/modal-base.element.js';
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 7aeb5ac6ec..181854001c 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
@@ -6,3 +6,5 @@ export * from './router-slot-change.event.js';
 export * from './router-slot-init.event.js';
 export * from './router-slot.element.js';
 export * from './path-pattern.class.js';
+export * from './modal-registration/modal-route-registration.interface.js';
+export * from './modal-registration/modal-route-registration.controller.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.controller.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
index 87a7b863d2..727d92339b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts
@@ -1,12 +1,19 @@
-import type { UmbModalToken } from '../token/index.js';
-import type { UmbModalConfig, UmbModalContext, UmbModalManagerContext, UmbModalRouteRegistration } from '../index.js';
-import type { UmbModalContextClassArgs } from '../context/modal.context.js';
-import { type Params, type IRouterSlot, UMB_ROUTE_CONTEXT, encodeFolderName } from '@umbraco-cms/backoffice/router';
+import { UMB_ROUTE_CONTEXT } from '../route.context.js';
+import { encodeFolderName } from '../encode-folder-name.function.js';
+import type { UmbModalRouteRegistration } from './modal-route-registration.interface.js';
+import type {
+	UmbModalConfig,
+	UmbModalContext,
+	UmbModalContextClassArgs,
+	UmbModalManagerContext,
+	UmbModalToken,
+} from '@umbraco-cms/backoffice/modal';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 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';
 
 export type UmbModalRouteBuilder = (params: { [key: string]: string | number } | null) => string;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.interface.ts
similarity index 74%
rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.interface.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.interface.ts
index a1af2fbcf7..1f9b84f02c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/route-registration/modal-route-registration.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.interface.ts
@@ -1,7 +1,6 @@
-import type { UmbModalManagerContext } from '../context/modal-manager.context.js';
-import type { UmbModalContext, UmbModalRouteBuilder } from '../index.js';
-import type { UmbModalToken } from '../token/modal-token.js';
-import type { IRouterSlot, Params } from '@umbraco-cms/backoffice/router';
+import type { UmbModalRouteBuilder } from './modal-route-registration.controller.js';
+import type { IRouterSlot, Params } from '@umbraco-cms/backoffice/external/router-slot';
+import type { UmbModalContext, UmbModalManagerContext, UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbModalRouteRegistration<
 	UmbModalTokenData extends { [key: string]: any } = { [key: string]: any },