diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/dashboard-examine-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/dashboard-examine-management.element.ts
index 2aff6d2598..f3b68b97a1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/dashboard-examine-management.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/dashboard-examine-management.element.ts
@@ -1,4 +1,4 @@
-import { html, LitElement, css } from 'lit';
+import { html, LitElement, css, nothing } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoute, IRoutingInfo, path } from 'router-slot';
 
@@ -59,7 +59,7 @@ export class UmbDashboardExamineManagementElement extends UmbContextConsumerMixi
 	render() {
 		return html` ${this.backbutton
 				? html` <a href="/section/settings/dashboard/examine-management/"> &larr; Back to overview </a> `
-				: ``}
+				: nothing}
 			<router-slot @changestate="${this._onRouteChange}" .routes=${this._routes}></router-slot>`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-settings.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-settings.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-settings.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-settings.element.ts
index eca7095f0b..24e84c728e 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-settings.element.ts
@@ -1,7 +1,7 @@
 import { html, css } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbModalLayoutElement } from '../modal-layout.element';
+import { UmbModalLayoutElement } from '@umbraco-cms/services';
 
 export interface UmbModalFieldsSettingsData {
 	name: string;
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-viewer.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
index de7e701314..8fe77cde9b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/fields-viewer/fields-viewer.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
@@ -1,7 +1,7 @@
-import { html, TemplateResult, css } from 'lit';
+import { html, css } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
-import { UmbModalLayoutElement } from '../modal-layout.element';
+import { UmbModalLayoutElement } from '@umbraco-cms/services';
 import { SearchResultsModel } from 'src/backoffice/dashboards/examine-management/examine-extension';
 
 @customElement('umb-modal-layout-fields-viewer')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
index 0a3e1d0d50..188c5f0a73 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
@@ -4,9 +4,8 @@ import { customElement, state, property } from 'lit/decorators.js';
 
 import { UUIButtonState } from '@umbraco-ui/uui-button';
 
-import { UmbModalService } from '../../../../core/services/modal';
-import { UmbNotificationService } from '../../../../core/services/notification';
-import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default';
+import { UmbModalService, UmbNotificationService, UmbNotificationDefaultData } from '@umbraco-cms/services';
+
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import './section-view-examine-searchers';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts
index a4aafcf9c1..d98024df55 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts
@@ -2,9 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 
-import { UmbModalService } from '../../../../core/services/modal';
-import { UmbNotificationService } from '../../../../core/services/notification';
-import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default';
+import { UmbModalService, UmbNotificationService, UmbNotificationDefaultData } from '@umbraco-cms/services';
 
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import { ApiError, ProblemDetails, Searcher, Index, SearchResource } from '@umbraco-cms/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts
index 2851f3d17f..a5ec5bcf44 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts
@@ -2,16 +2,14 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, LitElement } from 'lit';
 import { customElement, state, query, property } from 'lit/decorators.js';
 
-import { UmbModalService } from '../../../../core/services/modal';
-import { UmbNotificationService } from '../../../../core/services/notification';
-import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default';
+import { UmbModalService, UmbNotificationService, UmbNotificationDefaultData } from '@umbraco-cms/services';
 
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 
 import { ApiError, ProblemDetails, SearchResult, SearchResource, Field } from '@umbraco-cms/backend-api';
 
-import '../../../../core/services/modal/layouts/fields-viewer/fields-viewer.element';
-import '../../../../core/services/modal/layouts/fields-viewer/fields-settings.element';
+import './modal-views/fields-viewer.element';
+import './modal-views/fields-settings.element';
 
 interface ExposedSearchResultField {
 	name?: string | null;
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/index.ts b/src/Umbraco.Web.UI.Client/src/core/services/index.ts
index 6f51f1de22..9a44d0ea7a 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/index.ts
@@ -2,6 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export { UmbModalService } from './modal';
+export * from './modal';
 export { UmbNotificationService } from './notification';
 export type { UmbNotificationDefaultData } from './notification/layouts/default';
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts
index 7cd0d81ba6..7595eda631 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts
@@ -1,2 +1,3 @@
 export * from './modal.service';
 export * from './modal-handler';
+export * from './layouts/modal-layout.element';
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 16a1c718f0..26285c6e00 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -32,7 +32,7 @@
       "@umbraco-cms/observable-api": ["src/core/observable-api"],
       "@umbraco-cms/utils": ["src/core/utils"],
       "@umbraco-cms/test-utils": ["src/core/test-utils"],
-      "@umbraco-cms/services": ["/src/core/services"]
+      "@umbraco-cms/services": ["src/core/services"]
     },
   },
   "include": [