diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/embedded-media-modal.token.ts
similarity index 83%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/index.ts
rename to src/Umbraco.Web.UI.Client/libs/modal/token/embedded-media-modal.token.ts
index 94cde2a310..610b935d80 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/token/embedded-media-modal.token.ts
@@ -26,7 +26,7 @@ export type UmbEmbeddedMediaModalResult = {
 	selection: OEmbedResult;
 };
 
-export const UMB_EMBEDDED_MEDIA_MODAL_TOKEN = new UmbModalToken<UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult>(
+export const UMB_EMBEDDED_MEDIA_MODAL = new UmbModalToken<UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult>(
 	'Umb.Modal.EmbeddedMedia',
 	{
 		type: 'sidebar',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts
index 6df72714a6..1cbcbcf091 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts
@@ -3,7 +3,12 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
 import { when } from 'lit-html/directives/when.js';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
-import { OEmbedResult, OEmbedStatus, UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult } from '.';
+import {
+	OEmbedResult,
+	OEmbedStatus,
+	UmbEmbeddedMediaModalData,
+	UmbEmbeddedMediaModalResult,
+} from '../../../../../libs/modal/token/embedded-media-modal.token';
 import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.stories.ts
index 5eb102c153..068a9c5af0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.stories.ts
@@ -3,7 +3,7 @@ import './embedded-media-modal.element';
 
 import { Meta } from '@storybook/web-components';
 import { html } from 'lit';
-import { UmbEmbeddedMediaModalData } from '.';
+import { UmbEmbeddedMediaModalData } from '../../../../../libs/modal/token/embedded-media-modal.token';
 
 export default {
 	title: 'API/Modals/Layouts/Embedded Media',
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
index 3a8b1247e1..9d2adb5296 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
@@ -1,17 +1,17 @@
-import { rest } from "msw";
-import { OEmbedResult, OEmbedStatus } from "../../../backoffice/shared/modals/embedded-media";
-import { umbracoPath } from "@umbraco-cms/backoffice/utils";
+import { rest } from 'msw';
+import { OEmbedResult, OEmbedStatus } from '../../../../libs/modal/token/embedded-media-modal.token';
+import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 
 export const handlers = [
 	rest.get(umbracoPath('/rteembed'), (req, res, ctx) => {
 		const width = req.url.searchParams.get('width') ?? 360;
 		const height = req.url.searchParams.get('height') ?? 240;
 		const response: OEmbedResult = {
-			supportsDimensions: true,			
+			supportsDimensions: true,
 			markup: `<iframe width="${width}" height="${height}" src="https://www.youtube.com/embed/wJNbtYdr-Hg?feature=oembed" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen title="Sleep Token - The Summoning"></iframe>`,
-			oEmbedStatus: OEmbedStatus.Success,			
+			oEmbedStatus: OEmbedStatus.Success,
 		};
 
 		return res(ctx.status(200), ctx.json(response));
 	}),
-];
\ No newline at end of file
+];