diff --git a/src/Umbraco.Web.UI.Client/libs/modal/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/index.ts
index 4dc9d1d107..3085b2f3fa 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/index.ts
@@ -1,4 +1,5 @@
 export * from './modal.context';
 export * from './modal-handler';
 export * from './layouts/modal-layout.element';
+export * from './layouts/modal-layout-picker-base';
 export * from './token/modal-token';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
index fcd7a13522..7063fe673e 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
@@ -5,7 +5,7 @@ import { repeat } from 'lit-html/directives/repeat.js';
 import { UUIMenuItemElement, UUIMenuItemEvent } from '@umbraco-ui/uui';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbLanguageRepository } from '../../repository/language.repository';
-import { UmbModalLayoutPickerBase } from '../../../../../../libs/modal/layouts/modal-layout-picker-base';
+import { UmbModalLayoutPickerBase } from '@umbraco-cms/modal';
 import { LanguageModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-language-picker-modal')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
index d9d370aaf0..741f9eacc0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
@@ -7,8 +7,8 @@ export interface UmbDebugModalData {
 	content: TemplateResult | string;
 }
 
-@customElement('umb-debug-modal-layout')
-export default class UmbDebugModalLayout extends UmbModalLayoutElement<UmbDebugModalData> {
+@customElement('umb-debug-modal')
+export default class UmbDebugModalElement extends UmbModalLayoutElement<UmbDebugModalData> {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -74,6 +74,6 @@ export default class UmbDebugModalLayout extends UmbModalLayoutElement<UmbDebugM
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-debug-modal-layout': UmbDebugModalLayout;
+		'umb-debug-modal': UmbDebugModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/index.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts
index 165e23d403..2c4fd36648 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbModalLayoutPickerBase } from '../../../../../libs/modal/layouts/modal-layout-picker-base';
+import { UmbModalLayoutPickerBase } from '@umbraco-cms/modal';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-api';
 import type { ManifestSection } from '@umbraco-cms/models';
 
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index 47d06f7946..6894309be4 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -55,9 +55,9 @@ export default {
 						'@umbraco-cms/utils': './libs/utils/index.ts',
 						'@umbraco-cms/test-utils': './libs/test-utils/index.ts',
 						'@umbraco-cms/resources': './libs/resources/index.ts',
-						'@umbraco-cms/repository': './libs/repository',
+						'@umbraco-cms/repository': './libs/repository/index.ts',
 						'@umbraco-cms/router': './libs/router/index.ts',
-						'@umbraco-cms/modal': './src/core/modal/index.ts',
+						'@umbraco-cms/modal': './libs/modal/index.ts',
 					},
 				},
 			},