diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.element.ts
index 61837a12e1..1c826202cc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.element.ts
@@ -1,7 +1,7 @@
+import type { UmbContextDebuggerModalData } from './debug-modal.token.js';
 import { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import type { UmbContextDebuggerModalData } from '@umbraco-cms/backoffice/modal';
 
 @customElement('umb-context-debugger-modal')
 export default class UmbContextDebuggerModalElement extends UmbModalBaseElement<UmbContextDebuggerModalData> {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/debug-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.token.ts
similarity index 83%
rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/token/debug-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.token.ts
index 9e4c9060b5..391c76d90a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/debug-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/debug-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '../../modal/token/modal-token.js';
 import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit';
 
 export interface UmbContextDebuggerModalData {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/index.ts
new file mode 100644
index 0000000000..6ae52d2f38
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/index.ts
@@ -0,0 +1 @@
+export * from './debug-modal.token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/manifests.ts
new file mode 100644
index 0000000000..b87b948afa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug-modal/manifests.ts
@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.ContextDebugger',
+		name: 'Context Debugger Modal',
+		element: () => import('./debug-modal.element.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts
index dda8a9297c..418b07fbc9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts
@@ -1,7 +1,8 @@
+import { UMB_CONTEXT_DEBUGGER_MODAL } from './debug-modal/index.js';
 import { css, customElement, html, map, nothing, property, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { contextData, UmbContextDebugRequest } from '@umbraco-cms/backoffice/context-api';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_CONTEXT_DEBUGGER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { UmbDebugContextData, UmbDebugContextItemData } from '@umbraco-cms/backoffice/context-api';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/index.ts
index 3aae472235..a542c9a49e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/index.ts
@@ -1,3 +1,4 @@
-export * from './debug.element.js';
 export * from './context-debug.controller.js';
+export * from './debug-modal/index.js';
+export * from './debug.element.js';
 export * from './manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts
index 4cdc6cf2ce..b075c82b50 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts
@@ -1,8 +1,3 @@
-export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.ContextDebugger',
-		name: 'Context Debugger Modal',
-		element: () => import('./modals/debug/debug-modal.element.js'),
-	},
-];
+import { manifests as debugModalManifests } from './debug-modal/manifests.js';
+
+export const manifests: Array<UmbExtensionManifest> = [...debugModalManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
index a490c78672..142ec335f9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
@@ -1,6 +1,5 @@
 export * from './change-password-modal.token.js';
 export * from './confirm-modal.token.js';
-export * from './debug-modal.token.js';
 export * from './embedded-media-modal.token.js';
 export * from './entity-user-permission-settings-modal.token.js';
 export * from './item-picker-modal.token.js';