From dae175cbbb5ccf528a917b2f644a1596ba6e27f6 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 09:08:29 +0200
Subject: [PATCH 01/16] fix date input styling

---
 .../components/log-viewer-date-range-selector.element.ts     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
index 0decf728c9..6b176d8fe4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
@@ -11,8 +11,6 @@ import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/
 
 @customElement('umb-log-viewer-date-range-selector')
 export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
-	
-
 	@state()
 	private _startDate = '';
 
@@ -95,7 +93,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
         </div>
         `;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
@@ -115,7 +113,6 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 				border: none;
 				background: none;
 				width: 100%;
-				height: 100%;
 				outline: none;
 				position: relative;
 				border-bottom: 2px solid transparent;

From 332a7d46472fbccdeb8dc84545e17ba8c7335810 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 12:39:10 +0200
Subject: [PATCH 02/16] fir error and level boxes style

---
 .../overview/log-overview-view.element.ts     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
index afeaf47ad0..2d01b009de 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
@@ -7,8 +7,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 //TODO: add a disabled attribute to the show more button when the total number of items is correctly returned from the endpoint
 @customElement('umb-log-viewer-overview-view')
 export class UmbLogViewerOverviewViewElement extends UmbLitElement {
-	
-
 	@state()
 	private _errorCount = 0;
 
@@ -58,12 +56,12 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 							href=${`section/settings/workspace/logviewer/search/?lq=${encodeURIComponent(
 								`@Level='Fatal' or @Level='Error' or Has(@Exception)`
 							)}`}>
-							<h1 id="error-count">${this._errorCount}</h1></uui-button
+							<h2 id="error-count">${this._errorCount}</h2></uui-button
 						>
 					</uui-box>
 
 					<uui-box id="level" headline="Log level">
-						<h1 id="log-lever"><umb-log-viewer-log-level-overview></umb-log-viewer-log-level-overview></h1>
+						<h2 id="log-level"><umb-log-viewer-log-level-overview></umb-log-viewer-log-level-overview></h2>
 					</uui-box>
 
 					<umb-log-viewer-log-types-chart id="types"></umb-log-viewer-log-types-chart>
@@ -81,7 +79,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 			</div>
 		`;
 	}
-	
+
 	static styles = [
 		css`
 			:host {
@@ -106,7 +104,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 				align-self: start;
 				display: grid;
 				grid-template-columns: repeat(2, 1fr);
-				grid-template-rows: repeat(4, 1fr);
+				grid-template-rows: repeat(4, max-content);
 				gap: 20px 20px;
 			}
 
@@ -116,15 +114,21 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 
 			#errors {
 				grid-area: 2 / 1 / 3 / 2;
+				--uui-box-default-padding: 0;
+			}
+
+			#errors > uui-button {
+				width: 100%;
 			}
 
 			#level {
 				grid-area: 2 / 2 / 3 / 3;
 			}
 
-			#log-lever {
+			#log-level {
 				color: var(--uui-color-positive);
 				text-align: center;
+				margin: 0;
 			}
 
 			#types {
@@ -152,9 +156,10 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 			}
 
 			#error-count {
-				font-size: 4rem;
+				font-size: 3rem;
 				text-align: center;
 				color: var(--uui-color-danger);
+				margin: 0;
 			}
 		`,
 	];

From 908fb4da87aa8c0602d8dea3d2c5478497b4dac5 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 13:15:56 +0200
Subject: [PATCH 03/16] fix blinking show logs

---
 .../logviewer/workspace/logviewer.context.ts  | 17 ++++---
 .../log-viewer-messages-list.element.ts       | 50 ++++++++++++-------
 .../views/search/log-search-view.element.ts   |  8 ++-
 3 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
index 73c793e4dd..20a633fa60 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
@@ -73,6 +73,9 @@ export class UmbLogViewerWorkspaceContext {
 	#canShowLogs = new UmbBasicState<boolean | null>(null);
 	canShowLogs = createObservablePart(this.#canShowLogs, (data) => data);
 
+	#isLoadingLogs = new UmbBasicState<boolean | null>(null);
+	isLoadingLogs = createObservablePart(this.#isLoadingLogs, (data) => data);
+
 	#filterExpression = new UmbStringState<string>('');
 	filterExpression = createObservablePart(this.#filterExpression, (data) => data);
 
@@ -86,6 +89,8 @@ export class UmbLogViewerWorkspaceContext {
 	logs = createObservablePart(this.#logs, (data) => data?.items);
 	logsTotal = createObservablePart(this.#logs, (data) => data?.total);
 
+
+
 	#polling = new UmbObjectState<PoolingCOnfig>({ enabled: false, interval: 2000 });
 	polling = createObservablePart(this.#polling, (data) => data);
 
@@ -105,13 +110,7 @@ export class UmbLogViewerWorkspaceContext {
 		this.validateLogSize();
 	}
 
-	reset() {
-		this.#logs.next({ items: [], total: 0 });
-		this.setCurrentPage(1);
-	}
-
 	onChangeState = () => {
-		this.reset();
 
 		const searchQuery = query();
 		let sanitizedQuery = '';
@@ -266,6 +265,9 @@ export class UmbLogViewerWorkspaceContext {
 			return;
 		}
 
+		this.#isLoadingLogs.next(true);
+
+
 		const skip = (this.currentPage - 1) * 100;
 		const take = 100;
 
@@ -279,9 +281,10 @@ export class UmbLogViewerWorkspaceContext {
 		};
 
 		const { data } = await this.#repository.getLogs(options);
-
+		this.#isLoadingLogs.next(false);
 		if (data) {
 			this.#logs.next(data);
+
 		}
 	};
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
index c9c07dca5d..a69089577c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
@@ -8,8 +8,6 @@ import { DirectionModel, LogMessageResponseModel } from '@umbraco-cms/backoffice
 
 @customElement('umb-log-viewer-messages-list')
 export class UmbLogViewerMessagesListElement extends UmbLitElement {
-	
-
 	@query('#logs-scroll-container')
 	private _logsScrollContainer!: UUIScrollContainerElement;
 
@@ -22,6 +20,9 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 	@state()
 	private _logsTotal = 0;
 
+	@state()
+	private _isLoading = true;
+
 	#logViewerContext?: UmbLogViewerWorkspaceContext;
 
 	constructor() {
@@ -40,6 +41,10 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 			this._logs = logs ?? [];
 		});
 
+		this.observe(this.#logViewerContext.isLoadingLogs, (isLoading) => {
+			this._isLoading = isLoading === null ? this._isLoading : isLoading;
+		});
+
 		this.observe(this.#logViewerContext.logsTotal, (total) => {
 			this._logsTotal = total ?? 0;
 		});
@@ -74,6 +79,24 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 		</div>`;
 	}
 
+	#renderLogs() {
+		return html`${this._logs.length > 0
+			? html` ${this._logs.map(
+					(log) => html`<umb-log-viewer-message
+						.timestamp=${log.timestamp ?? ''}
+						.level=${log.level ?? ''}
+						.renderedMessage=${log.renderedMessage ?? ''}
+						.properties=${log.properties ?? []}
+						.exception=${log.exception ?? ''}
+						.messageTemplate=${log.messageTemplate ?? ''}></umb-log-viewer-message>`
+			  )}`
+			: html`<umb-empty-state size="small"
+					><span id="empty">
+						<uui-icon name="umb:search"></uui-icon>Sorry, we cannot find what you are looking for.
+					</span></umb-empty-state
+			  >`}`;
+	}
+
 	render() {
 		return html`<uui-box>
 			<p style="font-weight: bold;">Total items: ${this._logsTotal}</p>
@@ -90,25 +113,14 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 				<div id="machine">Machine name</div>
 				<div id="message">Message</div>
 			</div>
-			${this._logs.length > 0
-				? html` ${this._logs.map(
-						(log) => html`<umb-log-viewer-message
-							.timestamp=${log.timestamp ?? ''}
-							.level=${log.level ?? ''}
-							.renderedMessage=${log.renderedMessage ?? ''}
-							.properties=${log.properties ?? []}
-							.exception=${log.exception ?? ''}
-							.messageTemplate=${log.messageTemplate ?? ''}></umb-log-viewer-message>`
-				  )}`
-				: html`<umb-empty-state size="small"
-						><span id="empty">
-							<uui-icon name="umb:search"></uui-icon>Sorry, we cannot find what you are looking for.
-						</span></umb-empty-state
-				  >`}
-			${this._renderPagination()}
+			${this._isLoading
+				? html`<umb-empty-state size="small"
+						><span id="empty"> <uui-loader-circle></uui-loader-circle>Loading log messages... </span></umb-empty-state
+				  >`
+				: html`${this.#renderLogs()}${this._renderPagination()}`}
 		</uui-box>`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/log-search-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/log-search-view.element.ts
index 264981edab..7258faf17c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/log-search-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/log-search-view.element.ts
@@ -7,10 +7,8 @@ import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-a
 
 @customElement('umb-log-viewer-search-view')
 export class UmbLogViewerSearchViewElement extends UmbLitElement {
-	
-
 	@state()
-	private _canShowLogs = false;
+	private _canShowLogs = true;
 
 	#logViewerContext?: UmbLogViewerWorkspaceContext;
 
@@ -29,7 +27,7 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement {
 		if (!this.#logViewerContext) return;
 
 		this.#canShowLogsObserver = this.observe(this.#logViewerContext.canShowLogs, (canShowLogs) => {
-			this._canShowLogs = canShowLogs ?? false;
+			this._canShowLogs = canShowLogs ?? this._canShowLogs;
 		});
 	}
 
@@ -52,7 +50,7 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement {
 			</div>
 		`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`

From 1e8f4a08fb0d7755d0ea6973942a688679b035b3 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 13:30:43 +0200
Subject: [PATCH 04/16] remove unnecessary calls

---
 .../log-viewer-date-range-selector.element.ts       |  1 -
 .../logviewer-root-workspace.element.ts             |  1 -
 .../logviewer/workspace/logviewer.context.ts        | 13 +++----------
 .../components/log-viewer-messages-list.element.ts  |  1 -
 .../components/log-viewer-polling-button.element.ts |  1 -
 .../components/log-viewer-search-input.element.ts   |  1 -
 6 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
index 6b176d8fe4..10ca4d2af0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts
@@ -29,7 +29,6 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
 		this.addEventListener('input', this.#setDates);
 		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, (instance) => {
 			this.#logViewerContext = instance;
-			this.#logViewerContext?.getMessageTemplates(0, 10);
 			this.#observeStuff();
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts
index c4cb6d4dcf..7fb665c0f0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts
@@ -34,7 +34,6 @@ export class UmbLogViewerWorkspaceElement extends UmbLitElement {
 
 	constructor() {
 		super();
-		this.#logViewerContext.init();
 		this.provideContext(UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, this.#logViewerContext);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
index 20a633fa60..25d87cd4d6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
@@ -89,8 +89,6 @@ export class UmbLogViewerWorkspaceContext {
 	logs = createObservablePart(this.#logs, (data) => data?.items);
 	logsTotal = createObservablePart(this.#logs, (data) => data?.total);
 
-
-
 	#polling = new UmbObjectState<PoolingCOnfig>({ enabled: false, interval: 2000 });
 	polling = createObservablePart(this.#polling, (data) => data);
 
@@ -106,12 +104,7 @@ export class UmbLogViewerWorkspaceContext {
 		this.#repository = new UmbLogViewerRepository(this.#host);
 	}
 
-	async init() {
-		this.validateLogSize();
-	}
-
 	onChangeState = () => {
-
 		const searchQuery = query();
 		let sanitizedQuery = '';
 		if (searchQuery.lq) {
@@ -261,13 +254,14 @@ export class UmbLogViewerWorkspaceContext {
 	}
 
 	getLogs = async () => {
-		if (!this.#canShowLogs.getValue()) {
+		console.trace('getLogs');
+
+		if (this.#canShowLogs.getValue() === false) {
 			return;
 		}
 
 		this.#isLoadingLogs.next(true);
 
-
 		const skip = (this.currentPage - 1) * 100;
 		const take = 100;
 
@@ -284,7 +278,6 @@ export class UmbLogViewerWorkspaceContext {
 		this.#isLoadingLogs.next(false);
 		if (data) {
 			this.#logs.next(data);
-
 		}
 	};
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
index a69089577c..6bc5e0fba8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
@@ -30,7 +30,6 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, (instance) => {
 			this.#logViewerContext = instance;
 			this.#observeLogs();
-			this.#logViewerContext.getLogs();
 		});
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-polling-button.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-polling-button.element.ts
index 62cfe8b83f..7b019c0c64 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-polling-button.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-polling-button.element.ts
@@ -32,7 +32,6 @@ export class UmbLogViewerPollingButtonElement extends UmbLitElement {
 		this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, (instance) => {
 			this.#logViewerContext = instance;
 			this.#observePoolingConfig();
-			this.#logViewerContext.getLogs();
 		});
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
index 6a4fd30c3d..f73bc43a7c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -58,7 +58,6 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 			this.#logViewerContext = instance;
 			this.#observeStuff();
 			this.#logViewerContext?.getSavedSearches();
-			this.#logViewerContext.getLogs();
 		});
 
 		this.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (instance) => {

From 66443ff62eec2bce3de7a81429a7ceed019da14a Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 14:58:54 +0200
Subject: [PATCH 05/16] fixed saved searches deletion

---
 .../components/log-viewer-search-input.element.ts   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
index f73bc43a7c..8885f72a45 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -29,8 +29,6 @@ export const UMB_LOG_VIEWER_SAVE_SEARCH_MODAL = new UmbModalToken<UmbContextSave
 
 @customElement('umb-log-viewer-search-input')
 export class UmbLogViewerSearchInputElement extends UmbLitElement {
-	
-
 	@query('#saved-searches-popover')
 	private _savedSearchesPopover!: UUIPopoverElement;
 
@@ -133,9 +131,10 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 		this.#logViewerContext?.saveSearch(savedSearch);
 	}
 
-	#removeSearch(event: Event) {
-		const target = event.target as UUIButtonElement;
-		this.#logViewerContext?.removeSearch({ name: target.id });
+	#removeSearch(name: string) {
+		debugger;
+
+		this.#logViewerContext?.removeSearch({ name });
 	}
 
 	#openSaveSearchDialog() {
@@ -189,7 +188,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 									@click=${() => this.#setQueryFromSavedSearch(search.query ?? '')}>
 									<span class="saved-search-item-name">${search.name}</span>
 									<span class="saved-search-item-query">${search.query}</span></button
-								><uui-button label="Remove saved search" id="${search.name}" color="danger" @click=${this.#removeSearch}
+								><uui-button label="Remove saved search" color="danger" @click=${() => this.#removeSearch(search.name)}
 									><uui-icon name="umb:trash"></uui-icon
 								></uui-button>
 							</li>`
@@ -198,7 +197,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 			</uui-popover>
 		`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`

From 06d6a1f75ca4a9699d0e853bf919041ad1046e83 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:11:39 +0200
Subject: [PATCH 06/16] remove double call

---
 .../search/components/log-viewer-search-input.element.ts   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
index 8885f72a45..d0606afb7b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -122,7 +122,6 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	#clearQuery() {
 		this.inputQuery$.next('');
 		this.#logViewerContext?.setFilterExpression('');
-		this.#logViewerContext?.getLogs();
 	}
 
 	#modalHandler?: UmbModalHandler;
@@ -132,7 +131,6 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	}
 
 	#removeSearch(name: string) {
-		debugger;
 
 		this.#logViewerContext?.removeSearch({ name });
 	}
@@ -188,7 +186,10 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 									@click=${() => this.#setQueryFromSavedSearch(search.query ?? '')}>
 									<span class="saved-search-item-name">${search.name}</span>
 									<span class="saved-search-item-query">${search.query}</span></button
-								><uui-button label="Remove saved search" color="danger" @click=${() => this.#removeSearch(search.name)}
+								><uui-button
+									label="Remove saved search"
+									color="danger"
+									@click=${() => this.#removeSearch(search.name ?? '')}
 									><uui-icon name="umb:trash"></uui-icon
 								></uui-button>
 							</li>`

From 1dc686b7220a50cf0c2eb387e12ba3e9f0ed9e95 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:39:11 +0200
Subject: [PATCH 07/16] check for filter expression in the saved searches

---
 .../log-viewer-search-input.element.ts        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
index d0606afb7b..7d867c4c7e 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -44,6 +44,9 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	@state()
 	private _showLoader = false;
 
+	@state()
+	private _isQuerySaved = false;
+
 	private inputQuery$ = new Subject<string>();
 
 	#logViewerContext?: UmbLogViewerWorkspaceContext;
@@ -70,6 +73,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 			.subscribe((query) => {
 				this.#logViewerContext?.setFilterExpression(query);
 				this.#persist(query);
+				this._isQuerySaved = this._savedSearches.some((search) => search.query === query);
 				this._showLoader = false;
 			});
 	}
@@ -78,10 +82,12 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 		if (!this.#logViewerContext) return;
 		this.observe(this.#logViewerContext.savedSearches, (savedSearches) => {
 			this._savedSearches = savedSearches ?? [];
+			this._isQuerySaved = this._savedSearches.some((search) => search.query === this._inputQuery);
 		});
 
 		this.observe(this.#logViewerContext.filterExpression, (query) => {
 			this._inputQuery = query;
+			this._isQuerySaved = this._savedSearches.some((search) => search.query === query);
 		});
 	}
 
@@ -109,14 +115,14 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	}
 
 	#persist(filter: string) {
-		let q = getQuery();
+		let query = getQuery();
 
-		q = {
-			...q,
+		query = {
+			...query,
 			lq: filter,
 		};
 
-		window.history.pushState({}, '', `${path()}?${toQueryString(q)}`);
+		window.history.pushState({}, '', `${path()}?${toQueryString(query)}`);
 	}
 
 	#clearQuery() {
@@ -131,7 +137,6 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	}
 
 	#removeSearch(name: string) {
-
 		this.#logViewerContext?.removeSearch({ name });
 	}
 
@@ -140,6 +145,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 		this.#modalHandler?.onSubmit().then((savedSearch) => {
 			if (savedSearch) {
 				this.#saveSearch(savedSearch);
+				this._isQuerySaved = true;
 			}
 		});
 	}
@@ -160,9 +166,11 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 						  </div>`
 						: ''}
 					${this._inputQuery
-						? html`<uui-button compact slot="append" label="Save search" @click=${this.#openSaveSearchDialog}
-									><uui-icon name="umb:favorite"></uui-icon></uui-button
-								><uui-button compact slot="append" label="Clear" @click=${this.#clearQuery}
+						? html`${!this._isQuerySaved
+									? html`<uui-button compact slot="append" label="Save search" @click=${this.#openSaveSearchDialog}
+											><uui-icon name="umb:favorite"></uui-icon
+									  ></uui-button>`
+									: ''}<uui-button compact slot="append" label="Clear" @click=${this.#clearQuery}
 									><uui-icon name="umb:delete"></uui-icon
 								></uui-button>`
 						: html``}

From 64f0f88a938578782014348c3ead388b8aab5367 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:41:50 +0200
Subject: [PATCH 08/16] cleanup

---
 .../settings/logviewer/workspace/logviewer.context.ts           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
index 25d87cd4d6..0c64f49d75 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
@@ -254,8 +254,6 @@ export class UmbLogViewerWorkspaceContext {
 	}
 
 	getLogs = async () => {
-		console.trace('getLogs');
-
 		if (this.#canShowLogs.getValue() === false) {
 			return;
 		}

From afc973349667567493fe745c713ced811790a488 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:47:17 +0200
Subject: [PATCH 09/16] turn off loader if polling

---
 .../settings/logviewer/workspace/logviewer.context.ts         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
index 0c64f49d75..1c52da7239 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
@@ -258,7 +258,9 @@ export class UmbLogViewerWorkspaceContext {
 			return;
 		}
 
-		this.#isLoadingLogs.next(true);
+		const isPollingEnabled = this.#polling.getValue().enabled;
+
+		if (!isPollingEnabled) this.#isLoadingLogs.next(true);
 
 		const skip = (this.currentPage - 1) * 100;
 		const take = 100;

From fedf72009e5f3af8667d1da3c74ce37657b2c60a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 2 May 2023 21:47:33 +0200
Subject: [PATCH 10/16] rename shared folder to core

---
 .../src/backoffice/backoffice.element.ts            |   4 ++--
 .../backoffice-header-apps.element.ts               |   0
 .../backoffice-header-sections.element.ts           |   0
 .../backoffice-frame/backoffice-header.element.ts   |   0
 .../backoffice-frame/backoffice-main.element.ts     |   0
 .../backoffice-modal-container.element.ts           |   0
 .../backoffice-notification-container.element.ts    |   0
 .../backoffice-frame/backoffice.context.ts          |   0
 .../components/body-layout/body-layout.element.ts   |   0
 .../components/body-layout/body-layout.stories.ts   |   0
 .../button-with-dropdown.element.ts                 |   0
 .../button-with-dropdown.stories.ts                 |   0
 .../components/code-block/code-block.element.ts     |   0
 .../components/code-block/code-block.stories.ts     |   0
 .../code-editor/code-editor.controller.ts           |   0
 .../components/code-editor/code-editor.element.ts   |   0
 .../components/code-editor/code-editor.model.ts     |   0
 .../components/code-editor/code-editor.stories.ts   |   0
 .../components/code-editor/index.ts                 |   0
 .../components/code-editor/languageWorkers.ts       |   0
 .../components/code-editor/styles.ts                |   0
 .../code-editor/themes/code-editor.dark.theme.ts    |   0
 .../code-editor/themes/code-editor.hc-dark.theme.ts |   0
 .../themes/code-editor.hc-light.theme.ts            |   0
 .../code-editor/themes/code-editor.light.theme.ts   |   0
 .../components/code-editor/themes/index.ts          |   0
 .../collection-selection-actions.element.ts         |   0
 .../collection/collection-toolbar.element.ts        |   0
 .../components/collection/collection.element.ts     |   0
 .../dashboards/dashboard-collection.element.ts      |   0
 .../dashboards/dashboard-collection.stories.ts      |   0
 .../components/debug/debug.element.ts               |   0
 .../{shared => core}/components/debug/manifests.ts  |   0
 .../debug/modals/debug/debug-modal.element.ts       |   0
 .../components/debug/stories/debug.mdx              |   0
 .../components/debug/stories/umb-debug-dialog.jpg   | Bin
 .../components/debug/stories/umb-debug.jpg          | Bin
 .../components/dropdown/dropdown.element.ts         |   0
 .../components/empty-state/empty-state.element.ts   |   0
 .../components/empty-state/empty-state.stories.ts   |   0
 .../entity-action/entity-action-list.element.ts     |   0
 .../entity-action/entity-action.element.ts          |   0
 .../entity-bulk-action.element.ts                   |   0
 .../extension-slot/extension-slot.element.ts        |   0
 .../extension-slot/extension-slot.test.ts           |   0
 .../footer-layout/footer-layout.element.ts          |   0
 .../footer-layout/footer-layout.stories.ts          |   0
 .../header-app/header-app-button.element.ts         |   0
 .../components/header-app/header-app.stories.ts     |   0
 .../components/history/history-item.element.ts      |   0
 .../components/history/history-list.element.ts      |   0
 .../components/history/history-list.stories.ts      |   0
 .../backoffice/{shared => core}/components/index.ts |   2 +-
 .../input-checkbox-list.element.ts                  |   0
 .../input-checkbox-list.stories.ts                  |   0
 .../input-color-picker.element.ts                   |   0
 .../input-color-picker/input-color-picker.mdx       |   0
 .../input-color-picker.stories.ts                   |   0
 .../input-color-picker/input-color-picker.test.ts   |   0
 .../input-eye-dropper/input-eye-dropper.element.ts  |   0
 .../input-eye-dropper/input-eye-dropper.stories.ts  |   0
 .../input-eye-dropper/input-eye-dropper.test.ts     |   0
 .../components/input-list-base/input-list-base.ts   |   0
 .../input-multi-url-picker.element.ts               |   0
 .../input-multi-url-picker.stories.ts               |   0
 .../input-number-range.element.ts                   |   0
 .../input-number-range.stories.ts                   |   0
 .../input-number-range/input-number-range.test.ts   |   0
 .../input-radio-button-list.element.ts              |   0
 .../input-radio-button-list.stories.ts              |   0
 .../input-section/input-section.element.ts          |   0
 .../input-section/input-section.stories.ts          |   0
 .../components/input-section/input-section.test.ts  |   0
 .../components/input-slider/input-slider.element.ts |   0
 .../components/input-slider/input-slider.stories.ts |   0
 .../components/input-toggle/input-toggle.element.ts |   0
 .../components/input-toggle/input-toggle.stories.ts |   0
 .../input-upload-field.element.ts                   |   0
 .../input-upload-field.stories.ts                   |   0
 .../menu/menu-item-base/menu-item-base.element.ts   |   0
 .../components/menu/menu-item/menu-item.element.ts  |   0
 .../components/menu/menu.element.ts                 |   0
 .../property-type-based-property.element.ts         |   0
 .../ref-property-editor-ui.element.ts               |   0
 .../ref-property-editor-ui.stories.ts               |   0
 .../section/section-main/section-main.element.ts    |   0
 .../section/section-main/section-main.stories.ts    |   0
 .../section-sidebar-context-menu.element.ts         |   0
 .../section-sidebar-menu.element.ts                 |   0
 .../section-sidebar-menu.stories.ts                 |   0
 .../section-sidebar/section-sidebar.element.ts      |   0
 .../section-sidebar/section-sidebar.stories.ts      |   0
 .../section/section-views/section-views.element.ts  |   0
 .../components/section/section.element.ts           |   2 +-
 .../{shared => core}/components/table/index.ts      |   0
 .../components/table/table.element.ts               |   0
 .../components/table/table.stories.ts               |   0
 .../components/tooltip-menu/index.ts                |   0
 .../components/tooltip-menu/tooltip-menu.element.ts |   0
 .../components/tooltip-menu/tooltip-menu.stories.ts |   0
 .../context-menu/tree-context-menu-page.service.ts  |   0
 .../tree/context-menu/tree-context-menu.service.ts  |   0
 .../entity-tree-item/entity-tree-item.context.ts    |   0
 .../entity-tree-item/entity-tree-item.element.ts    |   0
 .../tree/tree-item-base/tree-item-base.context.ts   |   0
 .../tree/tree-item-base/tree-item-base.element.ts   |   0
 .../tree/tree-item-base/tree-item-base.stories.ts   |   0
 .../components/tree/tree-item.context.interface.ts  |   0
 .../components/tree/tree-item/tree-item.element.ts  |   0
 .../tree/tree-menu-item/tree-menu-item.element.ts   |   0
 .../components/tree/tree.context.ts                 |   0
 .../components/tree/tree.element.ts                 |   0
 .../components/tree/tree.stories.ts                 |   0
 .../variant-selector/variant-selector.element.ts    |   0
 .../variant-selector/variant-selector.stories.ts    |   0
 .../variantable-property.element.ts                 |   0
 .../variantable-property.stories.ts                 |   0
 .../workspace-property.context.ts                   |   0
 .../workspace-property.element.ts                   |   6 +++---
 .../workspace-property.stories.ts                   |   0
 .../workspace-action-menu.element.ts                |   0
 .../workspace-action/workspace-action.element.ts    |   0
 .../collection/workspace-view-collection.element.ts |   2 +-
 .../workspace-context/entity-manager-controller.ts  |   0
 ...kspace-invariantable-entity-context.interface.ts |   0
 .../workspace-split-view-manager.class.ts           |   0
 .../workspace-variable-entity-context.interface.ts  |   0
 .../workspace-editor/workspace-editor.element.ts    |   0
 .../workspace-editor/workspace-editor.stories.ts    |   0
 .../workspace-footer/workspace-footer.element.ts    |   0
 .../workspace-footer/workspace-footer.stories.ts    |   0
 .../workspace-property-layout.element.ts            |   0
 .../workspace-property-layout.stories.ts            |   0
 .../workspace-variant/workspace-variant.context.ts  |   0
 .../workspace-variant/workspace-variant.element.ts  |   0
 .../components/workspace/workspace.element.ts       |   0
 .../src/backoffice/{shared => core}/index.ts        |   0
 .../modals/confirm/confirm-modal.element.ts         |   0
 .../modals/confirm/confirm-modal.stories.ts         |   0
 .../embedded-media/embedded-media-modal.element.ts  |   0
 .../embedded-media/embedded-media-modal.stories.ts  |   0
 .../modals/folder/folder-modal.element.ts           |   0
 .../modals/icon-picker/icon-picker-modal.element.ts |   0
 .../modals/icon-picker/icon-picker-modal.stories.ts |   0
 .../modals/icon-picker/icon-picker-modal.test.ts    |   0
 .../modals/link-picker/link-picker-modal.element.ts |   0
 .../modals/link-picker/link-picker-modal.stories.ts |   0
 .../backoffice/{shared => core}/modals/manifests.ts |   0
 .../property-settings-modal.element.ts              |   0
 .../section-picker/section-picker-modal.element.ts  |   0
 .../modals/section-picker/section-picker.test.ts    |   0
 .../template-picker-modal.element.ts                |   0
 .../modals/template/template-modal.element.ts       |   0
 .../clear/property-action-clear.element.ts          |   0
 .../clear/property-action-clear.stories.ts          |   0
 .../copy/property-action-copy.element.ts            |   0
 .../copy/property-action-copy.stories.ts            |   0
 .../{shared => core}/property-actions/manifests.ts  |   0
 .../property-action-menu.context.ts                 |   0
 .../property-action-menu.element.ts                 |   0
 .../property-action/property-action.element.ts      |   0
 .../shared/property-action/property-action.model.ts |   0
 .../property-creator/property-creator.element.ts    |   0
 .../{shared => core}/property-editors/index.ts      |   0
 .../{shared => core}/property-editors/manifests.ts  |   0
 .../property-editors/modals/manifests.ts            |   0
 .../property-editor-ui-picker-modal.element.ts      |   0
 .../property-editor-ui-picker-modal.stories.ts      |   0
 .../property-editors/models/Umbraco.BlockGrid.ts    |   0
 .../property-editors/models/Umbraco.BlockList.ts    |   0
 .../property-editors/models/Umbraco.CheckboxList.ts |   0
 .../models/Umbraco.ColorPicker.EyeDropper.ts        |   0
 .../property-editors/models/Umbraco.ColorPicker.ts  |   0
 .../property-editors/models/Umbraco.DateTime.ts     |   0
 .../property-editors/models/Umbraco.Decimal.ts      |   0
 .../models/Umbraco.Dropdown.Flexible.ts             |   0
 .../property-editors/models/Umbraco.EmailAddress.ts |   0
 .../property-editors/models/Umbraco.ImageCropper.ts |   0
 .../property-editors/models/Umbraco.Integer.ts      |   0
 .../property-editors/models/Umbraco.JSON.ts         |   0
 .../property-editors/models/Umbraco.Label.ts        |   0
 .../property-editors/models/Umbraco.ListView.ts     |   0
 .../models/Umbraco.MarkdownEditor.ts                |   0
 .../property-editors/models/Umbraco.MediaPicker3.ts |   0
 .../models/Umbraco.MemberGroupPicker.ts             |   0
 .../property-editors/models/Umbraco.MemberPicker.ts |   0
 .../models/Umbraco.MultiNodeTreePicker.ts           |   0
 .../models/Umbraco.MultiUrlPicker.ts                |   0
 .../models/Umbraco.MultipleTextString.ts            |   0
 .../models/Umbraco.RadioButtonList.ts               |   0
 .../property-editors/models/Umbraco.Slider.ts       |   0
 .../property-editors/models/Umbraco.Tags.ts         |   0
 .../property-editors/models/Umbraco.TextArea.ts     |   0
 .../property-editors/models/Umbraco.TextBox.ts      |   0
 .../property-editors/models/Umbraco.TinyMCE.ts      |   0
 .../property-editors/models/Umbraco.TrueFalse.ts    |   0
 .../property-editors/models/Umbraco.UploadField.ts  |   0
 .../property-editors/models/Umbraco.UserPicker.ts   |   0
 .../property-editors/models/manifests.ts            |   0
 .../property-editor-config.element.ts               |   0
 .../property-editor-config.stories.ts               |   0
 .../config/block-configuration/manifests.ts         |   0
 ...tor-ui-block-grid-block-configuration.element.ts |   0
 ...tor-ui-block-grid-block-configuration.stories.ts |   0
 ...editor-ui-block-grid-block-configuration.test.ts |   0
 .../config/group-configuration/manifests.ts         |   0
 ...tor-ui-block-grid-group-configuration.element.ts |   0
 ...tor-ui-block-grid-group-configuration.stories.ts |   0
 ...editor-ui-block-grid-group-configuration.test.ts |   0
 .../config/stylesheet-picker/manifests.ts           |   0
 ...ditor-ui-block-grid-stylesheet-picker.element.ts |   0
 ...ditor-ui-block-grid-stylesheet-picker.stories.ts |   0
 ...y-editor-ui-block-grid-stylesheet-picker.test.ts |   0
 .../property-editors/uis/block-grid/manifests.ts    |   0
 ...perty-editor-ui-block-grid-inner-test.element.ts |   0
 .../property-editor-ui-block-grid.element.ts        |   6 +++---
 .../property-editor-ui-block-grid.stories.ts        |   0
 .../property-editor-ui-block-grid.test.ts           |   0
 .../config/block-configuration/manifests.ts         |   0
 ...tor-ui-block-list-block-configuration.element.ts |   0
 ...tor-ui-block-list-block-configuration.stories.ts |   0
 ...editor-ui-block-list-block-configuration.test.ts |   0
 .../property-editors/uis/block-list/manifests.ts    |   0
 .../property-editor-ui-block-list.element.ts        |   0
 .../property-editor-ui-block-list.stories.ts        |   0
 .../property-editor-ui-block-list.test.ts           |   0
 .../property-editors/uis/checkbox-list/manifests.ts |   0
 .../property-editor-ui-checkbox-list.element.ts     |   0
 .../property-editor-ui-checkbox-list.stories.ts     |   0
 .../property-editor-ui-checkbox-list.test.ts        |   0
 .../config/bulk-action-permissions/manifests.ts     |   0
 ...llection-view-bulk-action-permissions.element.ts |   0
 ...llection-view-bulk-action-permissions.stories.ts |   0
 ...-collection-view-bulk-action-permissions.test.ts |   0
 .../config/column-configuration/manifests.ts        |   0
 ...-collection-view-column-configuration.element.ts |   0
 ...-collection-view-column-configuration.stories.ts |   0
 ...-ui-collection-view-column-configuration.test.ts |   0
 .../config/layout-configuration/manifests.ts        |   0
 ...-collection-view-layout-configuration.element.ts |   0
 ...-collection-view-layout-configuration.stories.ts |   0
 ...-ui-collection-view-layout-configuration.test.ts |   0
 .../collection-view/config/order-by/manifests.ts    |   0
 ...ty-editor-ui-collection-view-order-by.element.ts |   0
 ...ty-editor-ui-collection-view-order-by.stories.ts |   0
 ...perty-editor-ui-collection-view-order-by.test.ts |   0
 .../uis/collection-view/manifests.ts                |   0
 .../property-editor-ui-collection-view.element.ts   |   0
 .../property-editor-ui-collection-view.stories.ts   |   0
 .../property-editor-ui-collection-view.test.ts      |   0
 .../property-editors/uis/color-picker/manifests.ts  |   0
 .../property-editor-ui-color-picker.element.ts      |   0
 .../property-editor-ui-color-picker.stories.ts      |   0
 .../property-editor-ui-color-picker.test.ts         |   0
 .../property-editors/uis/date-picker/manifests.ts   |   0
 .../property-editor-ui-date-picker.element.ts       |   0
 .../property-editor-ui-date-picker.stories.ts       |   0
 .../property-editor-ui-date-picker.test.ts          |   0
 .../property-editors/uis/dropdown/manifests.ts      |   0
 .../dropdown/property-editor-ui-dropdown.element.ts |   0
 .../dropdown/property-editor-ui-dropdown.stories.ts |   0
 .../dropdown/property-editor-ui-dropdown.test.ts    |   0
 .../property-editors/uis/eye-dropper/manifests.ts   |   0
 .../property-editor-ui-eye-dropper.element.ts       |   0
 .../property-editor-ui-eye-dropper.stories.ts       |   0
 .../property-editor-ui-eye-dropper.test.ts          |   0
 .../property-editors/uis/icon-picker/manifests.ts   |   0
 .../property-editor-ui-icon-picker.element.ts       |   0
 .../property-editor-ui-icon-picker.stories.ts       |   2 +-
 .../property-editor-ui-icon-picker.test.ts          |   0
 .../property-editors/uis/image-cropper/manifests.ts |   0
 .../property-editor-ui-image-cropper.element.ts     |   0
 .../property-editor-ui-image-cropper.stories.ts     |   0
 .../property-editor-ui-image-cropper.test.ts        |   0
 .../uis/image-crops-configuration/manifests.ts      |   0
 ...y-editor-ui-image-crops-configuration.element.ts |   0
 ...y-editor-ui-image-crops-configuration.stories.ts |   0
 ...erty-editor-ui-image-crops-configuration.test.ts |   0
 .../property-editors/uis/label/manifests.ts         |   0
 .../uis/label/property-editor-ui-label.element.ts   |   0
 .../uis/label/property-editor-ui-label.stories.ts   |   0
 .../uis/label/property-editor-ui-label.test.ts      |   0
 .../property-editors/uis/manifests.ts               |   0
 .../uis/markdown-editor/manifests.ts                |   0
 .../property-editor-ui-markdown-editor.element.ts   |   0
 .../property-editor-ui-markdown-editor.stories.ts   |   0
 .../property-editor-ui-markdown-editor.test.ts      |   0
 .../property-editors/uis/media-picker/manifests.ts  |   0
 .../property-editor-ui-media-picker.element.ts      |   0
 .../property-editor-ui-media-picker.stories.ts      |   0
 .../property-editor-ui-media-picker.test.ts         |   0
 .../uis/member-group-picker/manifests.ts            |   0
 ...roperty-editor-ui-member-group-picker.element.ts |   0
 ...roperty-editor-ui-member-group-picker.stories.ts |   0
 .../property-editor-ui-member-group-picker.test.ts  |   0
 .../property-editors/uis/member-picker/manifests.ts |   0
 .../property-editor-ui-member-picker.element.ts     |   0
 .../property-editor-ui-member-picker.stories.ts     |   0
 .../property-editor-ui-member-picker.test.ts        |   0
 .../uis/multi-url-picker/manifests.ts               |   0
 .../property-editor-ui-multi-url-picker.element.ts  |  11 ++++++-----
 .../property-editor-ui-multi-url-picker.stories.ts  |   0
 .../property-editor-ui-multi-url-picker.test.ts     |   0
 .../input-multiple-text-string-item.element.ts      |   0
 .../input-multiple-text-string.element.ts           |   0
 .../uis/multiple-text-string/manifests.ts           |   0
 ...operty-editor-ui-multiple-text-string.element.ts |   0
 ...operty-editor-ui-multiple-text-string.stories.ts |   0
 .../property-editor-ui-multiple-text-string.test.ts |   0
 .../property-editors/uis/number-range/manifests.ts  |   0
 .../property-editor-ui-number-range.element.ts      |   6 ++----
 .../property-editor-ui-number-range.stories.ts      |   0
 .../property-editor-ui-number-range.test.ts         |   0
 .../property-editors/uis/number/manifests.ts        |   0
 .../uis/number/property-editor-ui-number.element.ts |   0
 .../uis/number/property-editor-ui-number.stories.ts |   0
 .../uis/order-direction/manifests.ts                |   0
 .../property-editor-ui-order-direction.element.ts   |   0
 .../property-editor-ui-order-direction.stories.ts   |   0
 .../property-editor-ui-order-direction.test.ts      |   0
 .../property-editors/uis/overlay-size/manifests.ts  |   0
 .../property-editor-ui-overlay-size.element.ts      |   0
 .../property-editor-ui-overlay-size.stories.ts      |   0
 .../property-editor-ui-overlay-size.test.ts         |   0
 .../uis/radio-button-list/manifests.ts              |   0
 .../property-editor-ui-radio-button-list.element.ts |   0
 .../property-editor-ui-radio-button-list.stories.ts |   0
 .../property-editor-ui-radio-button-list.test.ts    |   0
 .../property-editors/uis/slider/manifests.ts        |   0
 .../uis/slider/property-editor-ui-slider.element.ts |   4 +---
 .../uis/slider/property-editor-ui-slider.stories.ts |   0
 .../uis/slider/property-editor-ui-slider.test.ts    |   0
 .../uis/tags/config/storage-type/manifests.ts       |   0
 .../property-editor-ui-tags-storage-type.element.ts |   0
 .../property-editor-ui-tags-storage-type.stories.ts |   0
 .../property-editor-ui-tags-storage-type.test.ts    |   0
 .../property-editors/uis/tags/manifests.ts          |   0
 .../uis/tags/property-editor-ui-tags.element.ts     |   0
 .../uis/tags/property-editor-ui-tags.stories.ts     |   0
 .../uis/tags/property-editor-ui-tags.test.ts        |   0
 .../property-editors/uis/text-box/manifests.ts      |   0
 .../text-box/property-editor-ui-text-box.element.ts |   0
 .../text-box/property-editor-ui-text-box.stories.ts |   0
 .../property-editors/uis/textarea/manifests.ts      |   0
 .../textarea/property-editor-ui-textarea.element.ts |   4 +---
 .../textarea/property-editor-ui-textarea.stories.ts |   0
 .../uis/tiny-mce/config/configuration/manifests.ts  |   0
 ...erty-editor-ui-tiny-mce-configuration.element.ts |   0
 ...erty-editor-ui-tiny-mce-configuration.stories.ts |   0
 ...roperty-editor-ui-tiny-mce-configuration.test.ts |   0
 .../property-editors/uis/tiny-mce/manifests.ts      |   0
 .../tiny-mce/property-editor-ui-tiny-mce.element.ts |   0
 .../tiny-mce/property-editor-ui-tiny-mce.stories.ts |   0
 .../tiny-mce/property-editor-ui-tiny-mce.test.ts    |   0
 .../property-editors/uis/toggle/manifests.ts        |   0
 .../uis/toggle/property-editor-ui-toggle.element.ts |   0
 .../uis/toggle/property-editor-ui-toggle.stories.ts |   0
 .../uis/toggle/property-editor-ui-toggle.test.ts    |   0
 .../uis/tree-picker/config/start-node/manifests.ts  |   0
 ...erty-editor-ui-tree-picker-start-node.element.ts |   0
 ...erty-editor-ui-tree-picker-start-node.stories.ts |   0
 ...roperty-editor-ui-tree-picker-start-node.test.ts |   0
 .../property-editors/uis/tree-picker/manifests.ts   |   0
 .../property-editor-ui-tree-picker.element.ts       |   0
 .../property-editor-ui-tree-picker.stories.ts       |   0
 .../property-editor-ui-tree-picker.test.ts          |   0
 .../property-editors/uis/upload-field/manifests.ts  |   0
 .../property-editor-ui-upload-field.element.ts      |   4 +---
 .../property-editor-ui-upload-field.stories.ts      |   0
 .../property-editor-ui-upload-field.test.ts         |   0
 .../property-editors/uis/user-picker/manifests.ts   |   0
 .../property-editor-ui-user-picker.element.ts       |   0
 .../property-editor-ui-user-picker.stories.ts       |   0
 .../property-editor-ui-user-picker.test.ts          |   0
 .../property-editors/uis/value-type/manifests.ts    |   0
 .../property-editor-ui-value-type.element.ts        |   0
 .../property-editor-ui-value-type.stories.ts        |   0
 .../property-editor-ui-value-type.test.ts           |   0
 .../backoffice/{shared => core}/umbraco-package.ts  |   0
 .../{shared => core}/variants/variant-id.class.ts   |   0
 .../document-type-workspace-view-design.element.ts  |   6 ++----
 .../document-table-actions-column-layout.element.ts |   6 ++----
 .../table/document-table-collection-view.element.ts |   2 +-
 .../document-picker-modal.element.ts                |   2 +-
 .../document-picker-modal.stories.ts                |   2 +-
 .../document-type-picker-modal.element.ts           |   2 +-
 .../document-type-picker-modal.stories.ts           |   2 +-
 .../tree/tree-item/document-tree-item.context.ts    |   2 +-
 .../workspace/document-workspace-editor.element.ts  |   6 +++---
 .../document-workspace-split-view.element.ts        |   4 ++--
 .../workspace/document-workspace.context.ts         |   6 +++---
 .../media-table-collection-view.element.ts          |   2 +-
 .../media-picker/media-picker-modal.element.ts      |   2 +-
 .../data-type-picker-modal.element.ts               |   2 +-
 .../data-type-details-workspace-view.element.ts     |   4 ++--
 .../language-root-workspace.element.ts              |   6 ++----
 ...workspace-view-relation-type-relation.element.ts |   2 +-
 .../file-system-tree-item.context.ts                |   2 +-
 .../file-system-tree-item.element.ts                |   6 ++----
 .../workspace/template-workspace.element.ts         |   4 +---
 .../dashboard-translation-dictionary.element.ts     |   6 ++----
 .../import/import-dictionary-modal.element.ts       |   2 +-
 .../input-user-group/input-user-group.element.ts    |   2 +-
 .../user-group-table-name-column-layout.element.ts  |   2 +-
 ...er-group-table-sections-column-layout.element.ts |   2 +-
 .../workspace/user-group-workspace-edit.element.ts  |   2 +-
 .../workspace/user-group-workspace.context.ts       |   2 +-
 .../workspace/workspace-view-user-groups.element.ts |   2 +-
 .../name/user-table-name-column-layout.element.ts   |   2 +-
 .../table/user-table-collection-view.element.ts     |   2 +-
 .../src/core/router/variant-router-slot.element.ts  |   2 +-
 411 files changed, 65 insertions(+), 84 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-header-apps.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-header-sections.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-header.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-main.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-modal-container.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice-notification-container.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/backoffice-frame/backoffice.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/body-layout/body-layout.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/body-layout/body-layout.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/button-with-dropdown/button-with-dropdown.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/button-with-dropdown/button-with-dropdown.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-block/code-block.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-block/code-block.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/code-editor.controller.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/code-editor.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/code-editor.model.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/code-editor.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/languageWorkers.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/styles.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/themes/code-editor.dark.theme.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/themes/code-editor.hc-dark.theme.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/themes/code-editor.hc-light.theme.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/themes/code-editor.light.theme.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/code-editor/themes/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/collection/collection-selection-actions.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/collection/collection-toolbar.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/collection/collection.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/collection/dashboards/dashboard-collection.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/collection/dashboards/dashboard-collection.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/debug.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/modals/debug/debug-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/stories/debug.mdx (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/stories/umb-debug-dialog.jpg (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/debug/stories/umb-debug.jpg (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/dropdown/dropdown.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/empty-state/empty-state.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/empty-state/empty-state.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/entity-action/entity-action-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/entity-action/entity-action.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/entity-bulk-action/entity-bulk-action.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/extension-slot/extension-slot.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/extension-slot/extension-slot.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/footer-layout/footer-layout.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/footer-layout/footer-layout.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/header-app/header-app-button.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/header-app/header-app.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/history/history-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/history/history-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/history/history-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/index.ts (97%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-checkbox-list/input-checkbox-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-checkbox-list/input-checkbox-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-color-picker/input-color-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-color-picker/input-color-picker.mdx (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-color-picker/input-color-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-color-picker/input-color-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-eye-dropper/input-eye-dropper.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-eye-dropper/input-eye-dropper.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-eye-dropper/input-eye-dropper.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-list-base/input-list-base.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-multi-url-picker/input-multi-url-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-multi-url-picker/input-multi-url-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-number-range/input-number-range.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-number-range/input-number-range.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-number-range/input-number-range.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-radio-button-list/input-radio-button-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-radio-button-list/input-radio-button-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-section/input-section.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-section/input-section.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-section/input-section.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-slider/input-slider.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-slider/input-slider.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-toggle/input-toggle.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-toggle/input-toggle.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-upload-field/input-upload-field.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/input-upload-field/input-upload-field.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/menu/menu-item-base/menu-item-base.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/menu/menu-item/menu-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/menu/menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/property-type-based-property/property-type-based-property.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/ref-property-editor-ui/ref-property-editor-ui.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-main/section-main.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-main/section-main.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-sidebar-menu/section-sidebar-menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-sidebar-menu/section-sidebar-menu.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-sidebar/section-sidebar.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-sidebar/section-sidebar.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section-views/section-views.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/section/section.element.ts (97%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/table/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/table/table.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/table/table.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tooltip-menu/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tooltip-menu/tooltip-menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tooltip-menu/tooltip-menu.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/context-menu/tree-context-menu-page.service.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/context-menu/tree-context-menu.service.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/entity-tree-item/entity-tree-item.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/entity-tree-item/entity-tree-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-item-base/tree-item-base.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-item-base/tree-item-base.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-item-base/tree-item-base.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-item.context.interface.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-item/tree-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree-menu-item/tree-menu-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/tree/tree.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/variant-selector/variant-selector.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/variant-selector/variant-selector.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/variantable-property/variantable-property.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/variantable-property/variantable-property.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace-property/workspace-property.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace-property/workspace-property.element.ts (96%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace-property/workspace-property.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-action-menu/workspace-action-menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-action/workspace-action.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts (95%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-context/entity-manager-controller.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-context/workspace-split-view-manager.class.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-editor/workspace-editor.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-editor/workspace-editor.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-footer/workspace-footer.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-footer/workspace-footer.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-property-layout/workspace-property-layout.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-property-layout/workspace-property-layout.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-variant/workspace-variant.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace-variant/workspace-variant.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/components/workspace/workspace.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/confirm/confirm-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/confirm/confirm-modal.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/embedded-media/embedded-media-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/embedded-media/embedded-media-modal.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/folder/folder-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/icon-picker/icon-picker-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/icon-picker/icon-picker-modal.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/icon-picker/icon-picker-modal.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/link-picker/link-picker-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/link-picker/link-picker-modal.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/property-settings/property-settings-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/section-picker/section-picker-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/section-picker/section-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/template-picker/template-picker-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/modals/template/template-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/clear/property-action-clear.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/clear/property-action-clear.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/copy/property-action-copy.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/copy/property-action-copy.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/shared/property-action-menu/property-action-menu.context.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/shared/property-action-menu/property-action-menu.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/shared/property-action/property-action.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-actions/shared/property-action/property-action.model.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-creator/property-creator.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/modals/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.BlockGrid.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.BlockList.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.CheckboxList.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.ColorPicker.EyeDropper.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.ColorPicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.DateTime.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Decimal.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Dropdown.Flexible.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.EmailAddress.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.ImageCropper.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Integer.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.JSON.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Label.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.ListView.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MarkdownEditor.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MediaPicker3.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MemberGroupPicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MemberPicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MultiNodeTreePicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MultiUrlPicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.MultipleTextString.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.RadioButtonList.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Slider.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.Tags.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.TextArea.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.TextBox.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.TinyMCE.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.TrueFalse.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.UploadField.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/Umbraco.UserPicker.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/models/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/shared/property-editor-config/property-editor-config.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/shared/property-editor-config/property-editor-config.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/block-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/group-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts (90%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/property-editor-ui-block-grid.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-grid/property-editor-ui-block-grid.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/config/block-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/property-editor-ui-block-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/property-editor-ui-block-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/block-list/property-editor-ui-block-list.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/checkbox-list/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/column-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/layout-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/order-by/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/property-editor-ui-collection-view.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/collection-view/property-editor-ui-collection-view.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/color-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/color-picker/property-editor-ui-color-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/color-picker/property-editor-ui-color-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/date-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/date-picker/property-editor-ui-date-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/date-picker/property-editor-ui-date-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/dropdown/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/dropdown/property-editor-ui-dropdown.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/dropdown/property-editor-ui-dropdown.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/eye-dropper/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/icon-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts (86%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/icon-picker/property-editor-ui-icon-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-cropper/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-cropper/property-editor-ui-image-cropper.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-cropper/property-editor-ui-image-cropper.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-crops-configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/label/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/label/property-editor-ui-label.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/label/property-editor-ui-label.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/label/property-editor-ui-label.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/markdown-editor/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/media-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/media-picker/property-editor-ui-media-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/media-picker/property-editor-ui-media-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-group-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-picker/property-editor-ui-member-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/member-picker/property-editor-ui-member-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multi-url-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts (88%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number-range/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number-range/property-editor-ui-number-range.element.ts (88%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number-range/property-editor-ui-number-range.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number-range/property-editor-ui-number-range.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number/property-editor-ui-number.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/number/property-editor-ui-number.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/order-direction/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/order-direction/property-editor-ui-order-direction.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/order-direction/property-editor-ui-order-direction.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/overlay-size/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/overlay-size/property-editor-ui-overlay-size.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/overlay-size/property-editor-ui-overlay-size.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/radio-button-list/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/slider/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/slider/property-editor-ui-slider.element.ts (96%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/slider/property-editor-ui-slider.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/slider/property-editor-ui-slider.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/config/storage-type/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/property-editor-ui-tags.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/property-editor-ui-tags.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tags/property-editor-ui-tags.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/text-box/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/text-box/property-editor-ui-text-box.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/text-box/property-editor-ui-text-box.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/textarea/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/textarea/property-editor-ui-textarea.element.ts (94%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/textarea/property-editor-ui-textarea.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/config/configuration/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/toggle/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/toggle/property-editor-ui-toggle.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/toggle/property-editor-ui-toggle.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/toggle/property-editor-ui-toggle.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/config/start-node/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/property-editor-ui-tree-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/tree-picker/property-editor-ui-tree-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/upload-field/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts (93%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/upload-field/property-editor-ui-upload-field.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/upload-field/property-editor-ui-upload-field.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/user-picker/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/user-picker/property-editor-ui-user-picker.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/user-picker/property-editor-ui-user-picker.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/value-type/manifests.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/value-type/property-editor-ui-value-type.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/value-type/property-editor-ui-value-type.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/property-editors/uis/value-type/property-editor-ui-value-type.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/umbraco-package.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => core}/variants/variant-id.class.ts (100%)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
index 1f8f5ff006..3e90e86cf2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -5,7 +5,7 @@ import { UmbStoreExtensionInitializer } from '../core/store-extension-initialize
 import {
 	UmbBackofficeContext,
 	UMB_BACKOFFICE_CONTEXT_TOKEN,
-} from './shared/components/backoffice-frame/backoffice.context';
+} from './core/components/backoffice-frame/backoffice.context';
 import { UmbExtensionInitializer } from './packages/repository/server-extension.controller';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
@@ -14,7 +14,7 @@ import { UmbEntryPointExtensionInitializer } from '@umbraco-cms/backoffice/exten
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 const CORE_PACKAGES = [
-	import('./shared/umbraco-package'),
+	import('./core/umbraco-package'),
 	import('./settings/umbraco-package'),
 	import('./documents/umbraco-package'),
 	import('./media/umbraco-package'),
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-apps.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header-apps.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-apps.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header-apps.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header-sections.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header-sections.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-main.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-main.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/body-layout/body-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/body-layout/body-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/body-layout/body-layout.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/body-layout/body-layout.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/button-with-dropdown/button-with-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/button-with-dropdown/button-with-dropdown.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/button-with-dropdown/button-with-dropdown.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/button-with-dropdown/button-with-dropdown.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/button-with-dropdown/button-with-dropdown.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/button-with-dropdown/button-with-dropdown.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/button-with-dropdown/button-with-dropdown.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/button-with-dropdown/button-with-dropdown.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-block/code-block.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-block/code-block.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-block/code-block.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-block/code-block.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-block/code-block.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-block/code-block.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-block/code-block.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-block/code-block.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.controller.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.controller.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.controller.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.controller.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.model.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.model.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.model.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/code-editor.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/languageWorkers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/languageWorkers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/languageWorkers.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/languageWorkers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/styles.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/styles.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/styles.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/styles.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.dark.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.dark.theme.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.dark.theme.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.dark.theme.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.hc-dark.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.hc-dark.theme.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.hc-dark.theme.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.hc-dark.theme.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.hc-light.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.hc-light.theme.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.hc-light.theme.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.hc-light.theme.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.light.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.light.theme.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/code-editor.light.theme.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/code-editor.light.theme.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/themes/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/code-editor/themes/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection-selection-actions.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection-selection-actions.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection-toolbar.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-toolbar.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection-toolbar.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/collection.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/dashboards/dashboard-collection.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/dashboards/dashboard-collection.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/dashboards/dashboard-collection.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/collection/dashboards/dashboard-collection.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/debug.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/debug.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/modals/debug/debug-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/modals/debug/debug-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/debug.mdx b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/debug.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/debug.mdx
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/debug.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/umb-debug-dialog.jpg b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/umb-debug-dialog.jpg
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/umb-debug-dialog.jpg
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/umb-debug-dialog.jpg
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/umb-debug.jpg b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/umb-debug.jpg
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/stories/umb-debug.jpg
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/debug/stories/umb-debug.jpg
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/dropdown/dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/dropdown/dropdown.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/dropdown/dropdown.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/dropdown/dropdown.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/empty-state/empty-state.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/empty-state/empty-state.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/empty-state/empty-state.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/empty-state/empty-state.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/empty-state/empty-state.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/empty-state/empty-state.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/empty-state/empty-state.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/empty-state/empty-state.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-action/entity-action-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-action/entity-action-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-action/entity-action-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-action/entity-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-action/entity-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-action/entity-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-action/entity-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-bulk-action/entity-bulk-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-bulk-action/entity-bulk-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-bulk-action/entity-bulk-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/entity-bulk-action/entity-bulk-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/extension-slot/extension-slot.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/extension-slot/extension-slot.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/extension-slot/extension-slot.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/extension-slot/extension-slot.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/footer-layout/footer-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/footer-layout/footer-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/footer-layout/footer-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/footer-layout/footer-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/footer-layout/footer-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/footer-layout/footer-layout.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/footer-layout/footer-layout.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/footer-layout/footer-layout.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/header-app/header-app-button.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/header-app/header-app-button.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/header-app/header-app-button.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/header-app/header-app-button.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/header-app/header-app.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/header-app/header-app.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/header-app/header-app.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/header-app/header-app.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/history/history-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/history/history-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
index 947a28c566..2d3bf3b939 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
@@ -54,7 +54,7 @@ import './workspace/workspace-editor/workspace-editor.element';
 import './workspace/workspace-footer/workspace-footer.element';
 import './workspace/workspace-action-menu/workspace-action-menu.element';
 
-import './variant-selector/variant-selector.element.ts';
+import './variant-selector/variant-selector.element';
 
 import './code-editor';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-checkbox-list/input-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-checkbox-list/input-checkbox-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-checkbox-list/input-checkbox-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-checkbox-list/input-checkbox-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-checkbox-list/input-checkbox-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-checkbox-list/input-checkbox-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-checkbox-list/input-checkbox-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-checkbox-list/input-checkbox-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.mdx b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.mdx
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-color-picker/input-color-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-color-picker/input-color-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-eye-dropper/input-eye-dropper.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-eye-dropper/input-eye-dropper.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-list-base/input-list-base.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-list-base/input-list-base.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-multi-url-picker/input-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-multi-url-picker/input-multi-url-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-multi-url-picker/input-multi-url-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-multi-url-picker/input-multi-url-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-number-range/input-number-range.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-radio-button-list/input-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-radio-button-list/input-radio-button-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-radio-button-list/input-radio-button-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-radio-button-list/input-radio-button-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-radio-button-list/input-radio-button-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-radio-button-list/input-radio-button-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-radio-button-list/input-radio-button-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-radio-button-list/input-radio-button-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-section/input-section.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-slider/input-slider.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-slider/input-slider.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-slider/input-slider.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-slider/input-slider.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-slider/input-slider.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-slider/input-slider.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-slider/input-slider.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-slider/input-slider.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-toggle/input-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-toggle/input-toggle.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-toggle/input-toggle.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-toggle/input-toggle.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-toggle/input-toggle.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-toggle/input-toggle.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-toggle/input-toggle.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-toggle/input-toggle.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-upload-field/input-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-upload-field/input-upload-field.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-upload-field/input-upload-field.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-upload-field/input-upload-field.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-upload-field/input-upload-field.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-upload-field/input-upload-field.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-upload-field/input-upload-field.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-upload-field/input-upload-field.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu-item-base/menu-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu-item-base/menu-item-base.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu-item-base/menu-item-base.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu-item-base/menu-item-base.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu-item/menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu-item/menu-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu-item/menu-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu-item/menu-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/menu/menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/menu/menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/ref-property-editor-ui/ref-property-editor-ui.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-main/section-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-main/section-main.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-main/section-main.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-main/section-main.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-main/section-main.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-main/section-main.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-main/section-main.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-main/section-main.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-menu/section-sidebar-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-menu/section-sidebar-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-menu/section-sidebar-menu.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar-menu/section-sidebar-menu.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar/section-sidebar.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar/section-sidebar.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar/section-sidebar.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-sidebar/section-sidebar.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-views/section-views.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section-views/section-views.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section.element.ts
index 9d614a4f34..131908e198 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/section/section.element.ts
@@ -48,7 +48,7 @@ export class UmbSectionDefaultElement extends UmbLitElement implements UmbSectio
 			},
 			{
 				path: '**',
-				component: () => import('../section/section-views/section-views.element'),
+				component: () => import('./section-views/section-views.element'),
 				setup: (element) => {
 					(element as UmbSectionViewsElement).sectionAlias = this.manifest?.alias;
 				},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/table.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/table.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/table.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/table.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/table.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/table/table.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/table/table.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/tooltip-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/tooltip-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/tooltip-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/tooltip-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/tooltip-menu.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/tooltip-menu.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tooltip-menu/tooltip-menu.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tooltip-menu/tooltip-menu.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/context-menu/tree-context-menu-page.service.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/context-menu/tree-context-menu-page.service.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/context-menu/tree-context-menu.service.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/context-menu/tree-context-menu.service.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/entity-tree-item/entity-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/entity-tree-item/entity-tree-item.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/entity-tree-item/entity-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/entity-tree-item/entity-tree-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item/tree-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item/tree-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-menu-item/tree-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-menu-item/tree-menu-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-menu-item/tree-menu-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-menu-item/tree-menu-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts
index a4b93f1b14..e65ed465b0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts
@@ -8,7 +8,7 @@ import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/back
 import type { ManifestPropertyEditorUI } from '@umbraco-cms/backoffice/extensions-registry';
 
 import '../../property-actions/shared/property-action-menu/property-action-menu.element';
-import '../../../../backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.element';
+import '../workspace/workspace-property-layout/workspace-property-layout.element';
 import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
@@ -111,7 +111,7 @@ export class UmbWorkspacePropertyElement extends UmbLitElement {
 	private _variantDifference?: string;
 
 	@state()
-	private _element?: ManifestPropertyEditorUI["ELEMENT_TYPE"];
+	private _element?: ManifestPropertyEditorUI['ELEMENT_TYPE'];
 
 	@state()
 	private _value?: unknown;
@@ -179,7 +179,7 @@ export class UmbWorkspacePropertyElement extends UmbLitElement {
 
 				oldValue?.removeEventListener('change', this._onPropertyEditorChange as any as EventListener);
 
-				this._element = el as ManifestPropertyEditorUI["ELEMENT_TYPE"];
+				this._element = el as ManifestPropertyEditorUI['ELEMENT_TYPE'];
 
 				this._valueObserver?.destroy();
 				this._configObserver?.destroy();
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-action-menu/workspace-action-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-action-menu/workspace-action-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-action-menu/workspace-action-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-action/workspace-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-action/workspace-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-action/workspace-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-action/workspace-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
index 00d1f82ac5..1301ebdd11 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
@@ -8,7 +8,7 @@ import type { FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backen
 import type { ManifestWorkspaceViewCollection } from '@umbraco-cms/backoffice/extensions-registry';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
 
-import '../../../../../../shared/components/collection/dashboards/dashboard-collection.element';
+import '../../../../collection/dashboards/dashboard-collection.element';
 
 @customElement('umb-workspace-view-collection')
 export class UmbWorkspaceViewCollectionElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/entity-manager-controller.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/entity-manager-controller.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-split-view-manager.class.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-split-view-manager.class.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-editor/workspace-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-editor/workspace-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-editor/workspace-editor.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-editor/workspace-editor.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-footer/workspace-footer.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-footer/workspace-footer.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-footer/workspace-footer.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-footer/workspace-footer.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-property-layout/workspace-property-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-property-layout/workspace-property-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-property-layout/workspace-property-layout.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-property-layout/workspace-property-layout.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/confirm/confirm-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/confirm/confirm-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/confirm/confirm-modal.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/confirm/confirm-modal.stories.ts
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/core/modals/embedded-media/embedded-media-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/embedded-media/embedded-media-modal.element.ts
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/core/modals/embedded-media/embedded-media-modal.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/embedded-media/embedded-media-modal.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/folder/folder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/folder/folder-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/folder/folder-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/folder/folder-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/icon-picker/icon-picker-modal.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/link-picker/link-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/link-picker/link-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/link-picker/link-picker-modal.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/link-picker/link-picker-modal.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/property-settings/property-settings-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/property-settings/property-settings-modal.element.ts
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/core/modals/section-picker/section-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/section-picker/section-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/section-picker/section-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/section-picker/section-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/template-picker/template-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/template-picker/template-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/modals/template/template-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/modals/template/template-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/clear/property-action-clear.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/clear/property-action-clear.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/clear/property-action-clear.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/clear/property-action-clear.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/copy/property-action-copy.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/copy/property-action-copy.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/copy/property-action-copy.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/copy/property-action-copy.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action-menu/property-action-menu.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action-menu/property-action-menu.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action-menu/property-action-menu.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action-menu/property-action-menu.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action/property-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action/property-action.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action/property-action.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action/property-action.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action/property-action.model.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action/property-action.model.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action/property-action.model.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-actions/shared/property-action/property-action.model.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-creator/property-creator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-creator/property-creator.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-creator/property-creator.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-creator/property-creator.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.BlockGrid.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.BlockGrid.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.BlockGrid.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.BlockGrid.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.BlockList.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.BlockList.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.BlockList.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.BlockList.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.CheckboxList.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.CheckboxList.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.CheckboxList.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.CheckboxList.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ColorPicker.EyeDropper.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ColorPicker.EyeDropper.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ColorPicker.EyeDropper.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ColorPicker.EyeDropper.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ColorPicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ColorPicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ColorPicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ColorPicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.DateTime.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.DateTime.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.DateTime.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.DateTime.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Decimal.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Decimal.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Decimal.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Decimal.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Dropdown.Flexible.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Dropdown.Flexible.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Dropdown.Flexible.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Dropdown.Flexible.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.EmailAddress.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.EmailAddress.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.EmailAddress.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.EmailAddress.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ImageCropper.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ImageCropper.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ImageCropper.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ImageCropper.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Integer.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Integer.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Integer.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Integer.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.JSON.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.JSON.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.JSON.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.JSON.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Label.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Label.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Label.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Label.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ListView.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ListView.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.ListView.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.ListView.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MarkdownEditor.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MarkdownEditor.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MarkdownEditor.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MarkdownEditor.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MediaPicker3.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MediaPicker3.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MediaPicker3.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MediaPicker3.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MemberGroupPicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MemberGroupPicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MemberGroupPicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MemberGroupPicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MemberPicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MemberPicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MemberPicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MemberPicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultiNodeTreePicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultiNodeTreePicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultiNodeTreePicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultiNodeTreePicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultiUrlPicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultiUrlPicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultiUrlPicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultiUrlPicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultipleTextString.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultipleTextString.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.MultipleTextString.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.MultipleTextString.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.RadioButtonList.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.RadioButtonList.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.RadioButtonList.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.RadioButtonList.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Slider.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Slider.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Slider.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Slider.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Tags.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Tags.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.Tags.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.Tags.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TextArea.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TextArea.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TextArea.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TextArea.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TextBox.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TextBox.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TextBox.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TextBox.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TinyMCE.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TinyMCE.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TinyMCE.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TinyMCE.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TrueFalse.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TrueFalse.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.TrueFalse.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.TrueFalse.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.UploadField.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.UploadField.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.UploadField.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.UploadField.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.UserPicker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.UserPicker.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/Umbraco.UserPicker.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/Umbraco.UserPicker.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/models/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/models/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts
index fdce8edb53..8668375a0b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts
@@ -1,9 +1,9 @@
 import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
-import { UmbVariantId } from '../../../../shared/variants/variant-id.class';
-import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../../../../shared/components/workspace/workspace-variant/workspace-variant.context';
-import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '../../../../shared/components/workspace-property/workspace-property.context';
+import { UmbVariantId } from '../../../variants/variant-id.class';
+import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../../../components/workspace/workspace-variant/workspace-variant.context';
+import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '../../../components/workspace-property/workspace-property.context';
 import type { UmbRoute } from '@umbraco-cms/backoffice/router';
 import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-list/property-editor-ui-block-list.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/collection-view/property-editor-ui-collection-view.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/color-picker/property-editor-ui-color-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/date-picker/property-editor-ui-date-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/dropdown/property-editor-ui-dropdown.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
similarity index 86%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
index 3c5d0856f7..81faef2692 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
@@ -1,7 +1,7 @@
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import type { UmbIconPickerModalElement } from '../../../../shared/modals/icon-picker/icon-picker-modal.element';
+import type { UmbIconPickerModalElement } from '../../../modals/icon-picker/icon-picker-modal.element';
 import type { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element';
 import './property-editor-ui-icon-picker.element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-cropper/property-editor-ui-image-cropper.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/label/property-editor-ui-label.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/media-picker/property-editor-ui-media-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/member-picker/property-editor-ui-member-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
index 24922b8934..b17bab751f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
@@ -2,8 +2,8 @@ import { html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
 import type { UUIModalSidebarSize } from '@umbraco-ui/uui';
-import { UmbInputMultiUrlPickerElement } from '../../../../shared/components/input-multi-url-picker/input-multi-url-picker.element';
-import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '../../../../shared/components/workspace-property/workspace-property.context';
+import { UmbInputMultiUrlPickerElement } from '../../../components/input-multi-url-picker/input-multi-url-picker.element';
+import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '../../../components/workspace-property/workspace-property.context';
 import { UmbLinkPickerLink } from '@umbraco-cms/backoffice/modal';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
@@ -13,9 +13,10 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
  * @element umb-property-editor-ui-multi-url-picker
  */
 @customElement('umb-property-editor-ui-multi-url-picker')
-export class UmbPropertyEditorUIMultiUrlPickerElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-
-
+export class UmbPropertyEditorUIMultiUrlPickerElement
+	extends UmbLitElement
+	implements UmbPropertyEditorExtensionElement
+{
 	@property({ type: Array })
 	value: UmbLinkPickerLink[] = [];
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.element.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.element.ts
index f62ee00637..d1ef1839a9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.element.ts
@@ -1,10 +1,10 @@
 import { html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import type { UmbInputNumberRangeElement } from '../../../../shared/components/input-number-range/input-number-range.element';
+import type { UmbInputNumberRangeElement } from '../../../components/input-number-range/input-number-range.element';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import '../../../../shared/components/input-number-range/input-number-range.element';
+import '../../../components/input-number-range/input-number-range.element';
 
 type ValueType = {
 	min?: number;
@@ -16,8 +16,6 @@ type ValueType = {
  */
 @customElement('umb-property-editor-ui-number-range')
 export class UmbPropertyEditorUINumberRangeElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-
-
 	@property({ type: Object })
 	private _value: ValueType = { min: undefined, max: undefined };
 	public get value() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number-range/property-editor-ui-number-range.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/property-editor-ui-number.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/property-editor-ui-number.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/property-editor-ui-number.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/number/property-editor-ui-number.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/order-direction/property-editor-ui-order-direction.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/overlay-size/property-editor-ui-overlay-size.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
index abeedaf49e..9df7f09588 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
@@ -1,7 +1,7 @@
 import { html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import UmbInputSliderElement from '../../../../shared/components/input-slider/input-slider.element';
+import UmbInputSliderElement from '../../../components/input-slider/input-slider.element';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
@@ -11,8 +11,6 @@ import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backe
  */
 @customElement('umb-property-editor-ui-slider')
 export class UmbPropertyEditorUISliderElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-
-
 	@property()
 	value: {
 		to?: number;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/slider/property-editor-ui-slider.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tags/property-editor-ui-tags.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/property-editor-ui-text-box.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/text-box/property-editor-ui-text-box.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
index b253800cfd..e4d52b1f6a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
@@ -5,14 +5,12 @@ import { UUITextareaElement } from '@umbraco-ui/uui';
 import {
 	UmbWorkspacePropertyContext,
 	UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN,
-} from '../../../../shared/components/workspace-property/workspace-property.context';
+} from '../../../components/workspace-property/workspace-property.context';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-property-editor-ui-textarea')
 export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-
-
 	@property()
 	value = '';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/property-editor-ui-textarea.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/textarea/property-editor-ui-textarea.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/toggle/property-editor-ui-toggle.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/tree-picker/property-editor-ui-tree-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts
index 86900c1680..7d88a22bde 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts
@@ -1,7 +1,7 @@
 import { html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbInputUploadFieldElement } from '../../../../shared/components/input-upload-field/input-upload-field.element';
+import { UmbInputUploadFieldElement } from '../../../components/input-upload-field/input-upload-field.element';
 import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -11,8 +11,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
  */
 @customElement('umb-property-editor-ui-upload-field')
 export class UmbPropertyEditorUIUploadFieldElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-
-
 	@property()
 	value = '';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/upload-field/property-editor-ui-upload-field.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/user-picker/property-editor-ui-user-picker.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/value-type/property-editor-ui-value-type.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/umbraco-package.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/umbraco-package.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/umbraco-package.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/variants/variant-id.class.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/variants/variant-id.class.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/variants/variant-id.class.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/variants/variant-id.class.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts
index cfe39a03f7..780f1c03c7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts
@@ -4,13 +4,11 @@ import { customElement, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import '../../../../../shared/property-creator/property-creator.element.ts';
+import '../../../../../core/property-creator/property-creator.element';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-document-type-workspace-view-design')
 export class UmbDocumentTypeWorkspaceViewDesignElement extends UmbLitElement {
-	
-
 	private _workspaceContext?: UmbDocumentTypeWorkspaceContext;
 
 	@state()
@@ -96,7 +94,7 @@ export class UmbDocumentTypeWorkspaceViewDesignElement extends UmbLitElement {
 			</uui-button>
 		</uui-tab-group>`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts
index 452be79d1b..b280bd69ba 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts
@@ -1,14 +1,12 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { customElement, property, state } from 'lit/decorators.js';
-import type { UmbTableColumn, UmbTableItem } from '../../../../../../shared/components/table';
+import type { UmbTableColumn, UmbTableItem } from '../../../../../../core/components/table';
 import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events';
 
 // TODO: this could be done more generic, but for now we just need it for the document table
 @customElement('umb-document-table-actions-column-layout')
 export class UmbDocumentTableActionColumnLayoutElement extends LitElement {
-	
-
 	@property({ type: Object, attribute: false })
 	column!: UmbTableColumn;
 
@@ -56,7 +54,7 @@ export class UmbDocumentTableActionColumnLayoutElement extends LitElement {
 			</div>
 		`;
 	}
-	
+
 	static styles = [
 		css`
 			#action-menu-popover {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
index e47a509665..333f14c85c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
@@ -10,7 +10,7 @@ import {
 	UmbTableItem,
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
-} from '../../../../../shared/components/table';
+} from '../../../../../core/components/table';
 import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
index 268169db65..1b2683e71a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import type { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
+import type { UmbTreeElement } from '../../../../core/components/tree/tree.element';
 import { UmbDocumentPickerModalData, UmbDocumentPickerModalResult } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.stories.ts
index ec43ba460e..293c44f6d5 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.stories.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/components/body-layout/body-layout.element';
+import '../../../../core/components/body-layout/body-layout.element';
 import './document-picker-modal.element';
 
 import { Meta, Story } from '@storybook/web-components';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts
index aca2946ea2..69b5da52eb 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import type { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
+import type { UmbTreeElement } from '../../../../core/components/tree/tree.element';
 import { UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.stories.ts
index 367cc06ff3..f946b89fad 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.stories.ts
@@ -1,4 +1,4 @@
-import '../../../../shared/components/body-layout/body-layout.element';
+import '../../../../core/components/body-layout/body-layout.element';
 import './document-type-picker-modal.element';
 
 import { Meta, Story } from '@storybook/web-components';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts
index 4fcde2bd4f..d64d42b88a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts
@@ -1,4 +1,4 @@
-import { UmbTreeItemContextBase } from '../../../../shared/components/tree/tree-item-base/tree-item-base.context';
+import { UmbTreeItemContextBase } from '../../../../core/components/tree/tree-item-base/tree-item-base.context';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts
index 952a1ea2ee..a02284b560 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts
@@ -1,14 +1,14 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbVariantId } from '../../../shared/variants/variant-id.class';
-import { ActiveVariant } from '../../../shared/components/workspace/workspace-context/workspace-split-view-manager.class';
+import { UmbVariantId } from '../../../core/variants/variant-id.class';
+import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class';
 import { UmbDocumentWorkspaceContext } from './document-workspace.context';
 import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split-view.element';
 import type { UmbRoute } from '@umbraco-cms/backoffice/router';
 import type { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import '../../../shared/components/workspace/workspace-variant/workspace-variant.element';
+import '../../../core/components/workspace/workspace-variant/workspace-variant.element';
 import { VariantModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts
index 0d14660b1e..6b4bedb89d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts
@@ -2,10 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, nothing } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
-import { ActiveVariant } from '../../../shared/components/workspace/workspace-context/workspace-split-view-manager.class';
+import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class';
 import { UmbDocumentWorkspaceContext } from './document-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import '../../../shared/components/workspace/workspace-variant/workspace-variant.element';
+import '../../../core/components/workspace/workspace-variant/workspace-variant.element';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-document-workspace-split-view')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
index f49171eded..5ed036afbf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
@@ -1,9 +1,9 @@
 import { UmbContentTypePropertyStructureManager } from '@umbraco-cms/backoffice/content-type';
 import { UmbDocumentRepository } from '../repository/document.repository';
 import { UmbDocumentTypeRepository } from '../../document-types/repository/document-type.repository';
-import { UmbWorkspaceVariableEntityContextInterface } from '../../../shared/components/workspace/workspace-context/workspace-variable-entity-context.interface';
-import { UmbVariantId } from '../../../shared/variants/variant-id.class';
-import { UmbWorkspaceSplitViewManager } from '../../../shared/components/workspace/workspace-context/workspace-split-view-manager.class';
+import { UmbWorkspaceVariableEntityContextInterface } from '../../../core/components/workspace/workspace-context/workspace-variable-entity-context.interface';
+import { UmbVariantId } from '../../../core/variants/variant-id.class';
+import { UmbWorkspaceSplitViewManager } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class';
 import { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
 import type { CreateDocumentRequestModel, DocumentResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts
index f51dd0cfbb..d9b4aaa890 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts
@@ -9,7 +9,7 @@ import type {
 	UmbTableItem,
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
-} from '../../../shared/components/table';
+} from '../../../core/components/table';
 import type { MediaDetails } from '../';
 import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
index a2f4d1ba4c..51c6822108 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
+import { UmbTreeElement } from '../../../../core/components/tree/tree.element';
 import { UmbMediaPickerModalData, UmbMediaPickerModalResult } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/modal/data-type-picker/data-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/modal/data-type-picker/data-type-picker-modal.element.ts
index 1f3f620f78..e900eb8bb6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/modal/data-type-picker/data-type-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/modal/data-type-picker/data-type-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
-import type { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
+import type { UmbTreeElement } from '../../../../core/components/tree/tree.element';
 import {
 	UmbDataTypePickerModalData,
 	UmbDataTypePickerModalResult,
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts
index 76a331a977..3c6694c4c8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts
@@ -12,8 +12,8 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import type { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 
-import '../../../../../shared/property-editors/shared/property-editor-config/property-editor-config.element';
-import '../../../../../shared/components/ref-property-editor-ui/ref-property-editor-ui.element';
+import '../../../../../core/property-editors/shared/property-editor-config/property-editor-config.element';
+import '../../../../../core/components/ref-property-editor-ui/ref-property-editor-ui.element';
 import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
 
 @customElement('umb-data-type-details-workspace-view')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
index 493a5130e4..56783b7722 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.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 { UmbTableColumn, UmbTableConfig, UmbTableItem } from '../../../../shared/components/table';
+import { UmbTableColumn, UmbTableConfig, UmbTableItem } from '../../../../core/components/table';
 import { UmbLanguageRepository } from '../../repository/language.repository';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
@@ -11,8 +11,6 @@ import './components/language-root-table-name-column-layout.element';
 
 @customElement('umb-language-root-workspace')
 export class UmbLanguageRootWorkspaceElement extends UmbLitElement {
-	
-
 	@state()
 	private _tableConfig: UmbTableConfig = {
 		allowSelection: false,
@@ -122,7 +120,7 @@ export class UmbLanguageRootWorkspaceElement extends UmbLitElement {
 			</umb-body-layout>
 		`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts
index 49308207c1..893e5f042b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts
@@ -1,7 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbTableColumn, UmbTableConfig } from '../../../../../shared/components/table';
+import { UmbTableColumn, UmbTableConfig } from '../../../../../core/components/table';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { RelationResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extensions-registry';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
index 8427d1929c..350d63ce47 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts
@@ -1,4 +1,4 @@
-import { UmbTreeItemContextBase } from '../../../shared/components/tree/tree-item-base/tree-item-base.context';
+import { UmbTreeItemContextBase } from '../../../core/components/tree/tree-item-base/tree-item-base.context';
 import { urlFriendlyPathFromServerFilePath } from '../../utils';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts
index 1f44e92dee..12b5ee577b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts
@@ -1,7 +1,7 @@
 import { css, html, nothing } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property } from 'lit/decorators.js';
-import { UmbTreeItemElement } from '../../../../backoffice/shared/components/tree/tree-item/tree-item.element';
+import { UmbTreeItemElement } from '../../../core/components/tree/tree-item/tree-item.element';
 import { UmbFileSystemTreeItemContext } from './file-system-tree-item.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { ManifestKind } from '@umbraco-cms/backoffice/extensions-registry';
@@ -23,8 +23,6 @@ umbExtensionsRegistry.register(manifest);
 
 @customElement('umb-file-system-tree-item')
 export class UmbFileSystemTreeItemElement extends UmbLitElement implements UmbTreeItemElement {
-	
-
 	private _item?: FileSystemTreeItemPresentationModel;
 	@property({ type: Object, attribute: false })
 	public get item() {
@@ -41,7 +39,7 @@ export class UmbFileSystemTreeItemElement extends UmbLitElement implements UmbTr
 		if (!this.item) return nothing;
 		return html`<umb-tree-item-base></umb-tree-item-base>`;
 	}
-	
+
 	static styles = [UUITextStyles, css``];
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts
index 5e40f48595..d4290d7117 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts
@@ -2,14 +2,12 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html } from 'lit';
 import { customElement, query, state } from 'lit/decorators.js';
 import { UUIInputElement } from '@umbraco-ui/uui';
-import { UmbCodeEditorElement } from '../../../shared/components/code-editor/code-editor.element';
+import { UmbCodeEditorElement } from '../../../core/components/code-editor/code-editor.element';
 import { UmbTemplateWorkspaceContext } from './template-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-template-workspace')
 export class UmbTemplateWorkspaceElement extends UmbLitElement {
-
-
 	public load(entityId: string) {
 		this.#templateWorkspaceContext.load(entityId);
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
index 88f3db2a2d..c3a4767d42 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
-import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '../../../../backoffice/shared/components/table';
+import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '../../../core/components/table';
 import { UmbDictionaryRepository } from '../../dictionary/repository/dictionary.repository';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DictionaryOverviewResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
@@ -11,8 +11,6 @@ import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-ap
 
 @customElement('umb-dashboard-translation-dictionary')
 export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
-	
-
 	@state()
 	private _tableConfig: UmbTableConfig = {
 		allowSelection: false,
@@ -166,7 +164,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 				() => html`<umb-empty-state>There were no dictionary items found.</umb-empty-state>`
 			)}`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts
index 0184e40f49..1c3a2532e3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, query, state } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
 import { repeat } from 'lit/directives/repeat.js';
-import { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
+import { UmbTreeElement } from '../../../../core/components/tree/tree.element';
 import { UmbDictionaryRepository } from '../../repository/dictionary.repository';
 import { UmbImportDictionaryModalData, UmbImportDictionaryModalResult } from '@umbraco-cms/backoffice/modal';
 import { DictionaryItemResponseModel, ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/components/input-user-group/input-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/components/input-user-group/input-user-group.element.ts
index 1be3bf4334..69598dbae1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/components/input-user-group/input-user-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/components/input-user-group/input-user-group.element.ts
@@ -1,7 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html, nothing } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbInputListBaseElement } from '../../../../shared/components/input-list-base/input-list-base';
+import { UmbInputListBaseElement } from '../../../../core/components/input-list-base/input-list-base';
 import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../../repository/user-group.store';
 import type { UserGroupEntity } from '../../types';
 import { UMB_USER_GROUP_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts
index d4cd1361c5..8f07cc172c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { UmbTableItem } from '../../../shared/components/table';
+import { UmbTableItem } from '../../../core/components/table';
 
 @customElement('umb-user-group-table-name-column-layout')
 export class UmbUserGroupTableNameColumnLayoutElement extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts
index fc84192558..d793c485dc 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts
@@ -1,6 +1,6 @@
 import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbTableItem } from '../../../shared/components/table';
+import { UmbTableItem } from '../../../core/components/table';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts
index d1de9a921c..79fc4ff43d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts
@@ -9,7 +9,7 @@ import { UmbUserGroupWorkspaceContext } from './user-group-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 import '../../users/components/user-input/user-input.element';
-import '../../../shared/components/input-section/input-section.element';
+import '../../../core/components/input-section/input-section.element';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-user-group-workspace-edit')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.context.ts
index 92dad94830..09c69fad5b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.context.ts
@@ -1,4 +1,4 @@
-import { UmbEntityWorkspaceManager } from '../../../shared/components/workspace/workspace-context/entity-manager-controller';
+import { UmbEntityWorkspaceManager } from '../../../core/components/workspace/workspace-context/entity-manager-controller';
 import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../repository/user-group.store';
 import { UmbUserGroupRepository } from '../repository/user-group.repository';
 import type { UserGroupDetails } from '../types';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts
index 74b879f4a2..6b160c3867 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts
@@ -9,7 +9,7 @@ import {
 	UmbTableItem,
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
-} from '../../../shared/components/table';
+} from '../../../core/components/table';
 import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../repository/user-group.store';
 import type { UserGroupDetails } from '../types';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts
index d88058e1d4..d4e419b9d5 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import type { UmbTableColumn, UmbTableItem } from '../../../../../../../shared/components/table/table.element';
+import type { UmbTableColumn, UmbTableItem } from '../../../../../../../core/components/table/table.element';
 
 @customElement('umb-user-table-name-column-layout')
 export class UmbUserTableNameColumnLayoutElement extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts
index 4be59d080d..98f52f0702 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts
@@ -9,7 +9,7 @@ import {
 	UmbTableSelectedEvent,
 	UmbTableConfig,
 	UmbTableOrderedEvent,
-} from '../../../../../shared/components/table/table.element';
+} from '../../../../../core/components/table/table.element';
 import {
 	UmbUserGroupStore,
 	UMB_USER_GROUP_STORE_CONTEXT_TOKEN,
diff --git a/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts
index c5e125fee7..bfb18b3e48 100644
--- a/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts
@@ -1,5 +1,5 @@
 import { customElement, property } from 'lit/decorators.js';
-import { UmbVariantId } from '../../backoffice/shared/variants/variant-id.class';
+import { UmbVariantId } from '../../backoffice/core/variants/variant-id.class';
 import { UmbRouterSlotElement } from './router-slot.element';
 import { UmbRoute } from '@umbraco-cms/backoffice/router';
 

From 064e46bd7001267fbfcf02e0f364b0ea6e7f80ee Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 3 May 2023 10:12:10 +0200
Subject: [PATCH 11/16] fix import after merge

---
 .../users/users/collection/user-collection-header.element.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts
index 31fa821e5e..9727552b83 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts
@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { UUIBooleanInputEvent, UUICheckboxElement, UUIRadioGroupElement, UUIRadioGroupEvent } from '@umbraco-ui/uui';
-import { UmbDropdownElement } from '../../../shared/components/dropdown/dropdown.element';
+import { UmbDropdownElement } from '../../../core/components/dropdown/dropdown.element';
 import { UmbUserCollectionContext } from './user-collection.context';
 import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
 import {

From 83ab5e9a3107ef67499efd41612fcf3ef48f494c Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 3 May 2023 10:17:04 +0200
Subject: [PATCH 12/16] change button to menu item

---
 .../log-viewer-saved-searches-overview.element.ts  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
index dc9221a549..b093239de7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
@@ -8,8 +8,6 @@ import { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api
 //TODO: implement the saved searches pagination when the API total bug is fixed
 @customElement('umb-log-viewer-saved-searches-overview')
 export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
-	
-
 	@state()
 	private _savedSearches: SavedLogSearchResponseModel[] = [];
 
@@ -33,12 +31,12 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 
 	#renderSearchItem = (searchListItem: SavedLogSearchResponseModel) => {
 		return html` <li>
-			<uui-button
+			<uui-menu-item
 				label="${searchListItem.name ?? ''}"
 				title="${searchListItem.name ?? ''}"
 				href=${`section/settings/workspace/logviewer/search/?lq=${encodeURIComponent(searchListItem.query ?? '')}`}>
-				<uui-icon name="umb:search"></uui-icon>${searchListItem.name}
-			</uui-button>
+				<uui-icon slot="icon" name="umb:search"></uui-icon>${searchListItem.name}
+			</uui-menu-item>
 		</li>`;
 	};
 
@@ -49,7 +47,7 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 			</ul>
 		</uui-box>`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
@@ -75,6 +73,10 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 			li uui-icon {
 				margin-right: 1em;
 			}
+
+			uui-menu-item {
+				width: 100%;
+			}
 		`,
 	];
 }

From 7bcc9de6bbcc103c00645b64736b32e118d4f224 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Wed, 3 May 2023 10:44:41 +0200
Subject: [PATCH 13/16] add break word top message

---
 .../views/search/components/log-viewer-message.element.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
index ff96a79e5f..3841324b7a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
@@ -9,8 +9,6 @@ import { query as getQuery, toQueryString } from '@umbraco-cms/backoffice/router
 //TODO: check how to display EventId field in the message properties
 @customElement('umb-log-viewer-message')
 export class UmbLogViewerMessageElement extends UmbLitElement {
-	
-
 	@query('details')
 	details!: HTMLDetailsElement;
 
@@ -141,7 +139,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
 						<umb-log-viewer-level-tag .level=${this.level ? this.level : 'Information'}></umb-log-viewer-level-tag>
 					</div>
 					<div id="machine">${this.properties.find((property) => property.name === 'MachineName')?.value}</div>
-					<div id="message">${this.renderedMessage}</div>
+					<div id="message"><uui-scroll-container>${this.renderedMessage}</uui-scroll-container></div>
 				</summary>
 				${this.exception ? html`<pre id="exception">${this.exception}</pre>` : ''}
 				<ul id="properties-list">
@@ -195,7 +193,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
 			</details>
 		`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`
@@ -251,6 +249,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
 
 			#message {
 				flex: 6 0 14ch;
+				word-break: break-all;
 			}
 
 			.property-name,

From 5bff72c12cec6a744cfea71528a34ae714eebf45 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 3 May 2023 11:26:17 +0200
Subject: [PATCH 14/16] create storybook folder outside of src and move "Guide"
 mdx stories

---
 src/Umbraco.Web.UI.Client/.storybook/main.ts                    | 2 +-
 src/Umbraco.Web.UI.Client/.storybook/preview.js                 | 2 +-
 .../{src => storybook}/stories/context-api.mdx                  | 0
 .../{src => storybook}/stories/extending/entity-actions.mdx     | 0
 .../{src => storybook}/stories/extending/header-apps.mdx        | 0
 .../{src => storybook}/stories/extending/intro.mdx              | 0
 .../{src => storybook}/stories/extending/menu.mdx               | 0
 .../{src => storybook}/stories/extending/modals/intro.mdx       | 0
 .../{src => storybook}/stories/extending/property-editors.mdx   | 0
 .../{src => storybook}/stories/extending/registration.mdx       | 0
 .../{src => storybook}/stories/extending/repositories.mdx       | 0
 .../{src => storybook}/stories/extending/sections/intro.mdx     | 0
 .../{src => storybook}/stories/extending/sections/sidebar.mdx   | 0
 .../{src => storybook}/stories/extending/sections/views.mdx     | 0
 .../{src => storybook}/stories/extending/tree.mdx               | 0
 .../{src => storybook}/stories/extending/workspaces/actions.mdx | 0
 .../{src => storybook}/stories/extending/workspaces/context.mdx | 0
 .../{src => storybook}/stories/extending/workspaces/intro.mdx   | 0
 .../{src => storybook}/stories/extending/workspaces/views.mdx   | 0
 .../{src => storybook}/stories/getting-started.mdx              | 0
 src/Umbraco.Web.UI.Client/{src => storybook}/stories/store.mdx  | 0
 .../{src => storybook}/stories/umb-element.mdx                  | 0
 22 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/context-api.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/entity-actions.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/header-apps.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/intro.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/menu.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/modals/intro.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/property-editors.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/registration.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/repositories.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/sections/intro.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/sections/sidebar.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/sections/views.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/tree.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/workspaces/actions.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/workspaces/context.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/workspaces/intro.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/extending/workspaces/views.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/getting-started.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/store.mdx (100%)
 rename src/Umbraco.Web.UI.Client/{src => storybook}/stories/umb-element.mdx (100%)

diff --git a/src/Umbraco.Web.UI.Client/.storybook/main.ts b/src/Umbraco.Web.UI.Client/.storybook/main.ts
index 58d9e365e4..9fe61fc676 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/main.ts
+++ b/src/Umbraco.Web.UI.Client/.storybook/main.ts
@@ -1,7 +1,7 @@
 import { StorybookConfig } from '@storybook/web-components-vite';
 
 const config: StorybookConfig = {
-	stories: ['../@(src|libs|apps)/**/*.mdx', '../@(src|libs|apps)/**/*.stories.@(js|jsx|ts|tsx)'],
+	stories: ['../@(src|libs|apps|storybook)/**/*.mdx', '../@(src|libs|apps|storybook)/**/*.stories.@(js|jsx|ts|tsx)'],
 	addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-a11y'],
 	framework: {
 		name: '@storybook/web-components-vite',
diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js
index e55d5c7558..abb33a59ec 100644
--- a/src/Umbraco.Web.UI.Client/.storybook/preview.js
+++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js
@@ -24,7 +24,7 @@ import { umbExtensionsRegistry } from '../libs/extensions-api';
 
 import '../src/core/context-provider/context-provider.element';
 import '../src/core/controller-host/controller-host-test.element';
-import '../src/backoffice/shared/components';
+import '../src/backoffice/core/components';
 
 import { manifests as documentManifests } from '../src/backoffice/documents';
 
diff --git a/src/Umbraco.Web.UI.Client/src/stories/context-api.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/context-api.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/context-api.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/context-api.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/entity-actions.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/entity-actions.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/header-apps.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/header-apps.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/header-apps.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/header-apps.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/menu.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/menu.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/menu.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/menu.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/modals/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/modals/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/modals/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/modals/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/property-editors.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/property-editors.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/registration.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/registration.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/registration.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/registration.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/repositories.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/repositories.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/repositories.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/repositories.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/sidebar.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/sidebar.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/sidebar.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/sidebar.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/sections/views.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/views.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/sections/views.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/sections/views.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/tree.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/tree.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/tree.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/tree.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/actions.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/actions.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/actions.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/actions.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/context.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/context.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/context.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/context.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/intro.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/intro.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/intro.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/intro.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/views.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/views.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/extending/workspaces/views.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/extending/workspaces/views.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/getting-started.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/getting-started.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/getting-started.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/getting-started.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/store.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/store.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/store.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/store.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/stories/umb-element.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/umb-element.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/stories/umb-element.mdx
rename to src/Umbraco.Web.UI.Client/storybook/stories/umb-element.mdx

From 085943facd56f717812a28dbbee21eb80993899f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 3 May 2023 11:48:31 +0200
Subject: [PATCH 15/16] add storybook utils folder for elements only used in
 storybook

---
 .../src/installer/shared/utils.story-helpers.ts                 | 2 +-
 .../utils}/context-provider/context-provider.element.test.ts    | 0
 .../utils}/context-provider/context-provider.element.ts         | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename src/Umbraco.Web.UI.Client/{src/core => storybook/utils}/context-provider/context-provider.element.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/{src/core => storybook/utils}/context-provider/context-provider.element.ts (100%)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
index f131df752a..06bd40723d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts
@@ -1,6 +1,6 @@
 import { html } from 'lit';
 import { UmbInstallerContext } from '../installer.context';
-import '../../core/context-provider/context-provider.element';
+import '../../../storybook/utils/context-provider/context-provider.element';
 
 export const installerContextProvider = (story: any, installerContext = new UmbInstallerContext()) => html`
 	<umb-context-provider
diff --git a/src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.test.ts b/src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.test.ts
rename to src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.ts b/src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/context-provider/context-provider.element.ts
rename to src/Umbraco.Web.UI.Client/storybook/utils/context-provider/context-provider.element.ts

From 24b02e03a9b3acf4ac4e203000a9b5e29c31cb0d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Thu, 4 May 2023 08:37:24 +0200
Subject: [PATCH 16/16] Chore: Notification / Modal imports (#695)

* move notification default elements into core + import from package index

* This context is already provided from the core package

* append notification element from core entry point

* modal context is already provided

* remove unused modal import

* append modal container from core package

* move the z-index style
---
 src/Umbraco.Web.UI.Client/.vscode/settings.json    |  1 +
 src/Umbraco.Web.UI.Client/src/app.ts               |  2 --
 .../src/backoffice/backoffice.element.ts           | 10 +---------
 .../backoffice-modal-container.element.ts          |  5 ++---
 .../backoffice-notification-container.element.ts   |  4 +---
 .../src/backoffice/core/index.ts                   | 14 +++++++++++++-
 .../src/backoffice/core/notification/index.ts      |  1 +
 .../core/notification/layouts/default/index.ts     |  0
 .../default/notification-layout-default.element.ts |  0
 .../default/notification-layout-default.stories.ts |  0
 .../default/notification-layout-default.test.ts    |  0
 .../core/notification/stories/notification.mdx     |  0
 .../notification/stories/notification.stories.ts   |  0
 .../story-notification-default-example.element.ts  |  0
 14 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/core/notification/index.ts
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/layouts/default/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/layouts/default/notification-layout-default.element.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/layouts/default/notification-layout-default.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/layouts/default/notification-layout-default.test.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/stories/notification.mdx (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/stories/notification.stories.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/{ => backoffice}/core/notification/stories/story-notification-default-example.element.ts (100%)

diff --git a/src/Umbraco.Web.UI.Client/.vscode/settings.json b/src/Umbraco.Web.UI.Client/.vscode/settings.json
index 387d52b0f6..200408d1cb 100644
--- a/src/Umbraco.Web.UI.Client/.vscode/settings.json
+++ b/src/Umbraco.Web.UI.Client/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
 	"cssVariables.lookupFiles": ["node_modules/@umbraco-ui/uui-css/dist/custom-properties.css"],
 	"cSpell.words": [
+		"Backoffice",
 		"combobox",
 		"Elementable",
 		"templating",
diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index 6449a08b26..be6f2b76cc 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -5,8 +5,6 @@ import 'element-internals-polyfill';
 
 import './core/router/router-slot.element';
 import './core/router/variant-router-slot.element';
-import './core/notification/layouts/default';
-import './core/modal/modal-element.element';
 
 import { UUIIconRegistryEssential } from '@umbraco-ui/uui';
 import { css, html } from 'lit';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
index 3e90e86cf2..d607346ee5 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -8,8 +8,6 @@ import {
 } from './core/components/backoffice-frame/backoffice.context';
 import { UmbExtensionInitializer } from './packages/repository/server-extension.controller';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
-import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
-import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
 import { UmbEntryPointExtensionInitializer } from '@umbraco-cms/backoffice/extensions-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
@@ -31,8 +29,6 @@ const CORE_PACKAGES = [
 export class UmbBackofficeElement extends UmbLitElement {
 	constructor() {
 		super();
-		this.provideContext(UMB_MODAL_CONTEXT_TOKEN, new UmbModalContext(this));
-		this.provideContext(UMB_NOTIFICATION_CONTEXT_TOKEN, new UmbNotificationContext());
 		this.provideContext(UMB_BACKOFFICE_CONTEXT_TOKEN, new UmbBackofficeContext());
 		new UmbEntryPointExtensionInitializer(this, umbExtensionsRegistry);
 		new UmbStoreExtensionInitializer(this);
@@ -43,8 +39,7 @@ export class UmbBackofficeElement extends UmbLitElement {
 		return html`
 			<umb-backoffice-header></umb-backoffice-header>
 			<umb-backoffice-main></umb-backoffice-main>
-			<umb-backoffice-notification-container></umb-backoffice-notification-container>
-			<umb-backoffice-modal-container></umb-backoffice-modal-container>
+			<slot></slot>
 		`;
 	}
 
@@ -60,9 +55,6 @@ export class UmbBackofficeElement extends UmbLitElement {
 				font-size: 14px;
 				box-sizing: border-box;
 			}
-			umb-backoffice-modal-container {
-				z-index: 1000;
-			}
 		`,
 	];
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts
index f30ca54206..2d430b65f0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-modal-container.element.ts
@@ -7,8 +7,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-backoffice-modal-container')
 export class UmbBackofficeModalContainerElement extends UmbLitElement {
-	
-
 	@state()
 	private _modals?: UmbModalHandler[];
 
@@ -38,12 +36,13 @@ export class UmbBackofficeModalContainerElement extends UmbLitElement {
 			</uui-modal-container>
 		`;
 	}
-	
+
 	static styles: CSSResultGroup = [
 		UUITextStyles,
 		css`
 			:host {
 				position: absolute;
+				z-index: 1000;
 			}
 		`,
 	];
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts
index f3666c8f16..1125764ee2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-notification-container.element.ts
@@ -11,8 +11,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-backoffice-notification-container')
 export class UmbBackofficeNotificationContainerElement extends UmbLitElement {
-	
-
 	@state()
 	private _notifications?: UmbNotificationHandler[];
 
@@ -48,7 +46,7 @@ export class UmbBackofficeNotificationContainerElement extends UmbLitElement {
 			</uui-toast-notification-container>
 		`;
 	}
-	
+
 	static styles: CSSResultGroup = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts
index a04af35230..2350ed6611 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts
@@ -2,11 +2,17 @@ import { manifests as componentManifests } from './components';
 import { manifests as propertyActionManifests } from './property-actions/manifests';
 import { manifests as propertyEditorManifests } from './property-editors/manifests';
 import { manifests as modalManifests } from './modals/manifests';
+
+import { UmbBackofficeNotificationContainerElement } from './components/backoffice-frame/backoffice-notification-container.element';
+import { UmbBackofficeModalContainerElement } from './components/backoffice-frame/backoffice-modal-container.element';
+
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
 import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api';
 import type { UmbEntrypointOnInit } from '@umbraco-cms/backoffice/extensions-api';
 
+import './notification';
+
 export const manifests = [
 	...componentManifests,
 	...propertyActionManifests,
@@ -17,6 +23,12 @@ export const manifests = [
 export const onInit: UmbEntrypointOnInit = (host, extensionRegistry) => {
 	extensionRegistry.registerMany(manifests);
 
-	new UmbContextProviderController(host, UMB_MODAL_CONTEXT_TOKEN, new UmbModalContext(host));
+	const notificationContainerElement = new UmbBackofficeNotificationContainerElement();
+	host.appendChild(notificationContainerElement);
+
+	const modalContainerElement = new UmbBackofficeModalContainerElement();
+	host.appendChild(modalContainerElement);
+
 	new UmbContextProviderController(host, UMB_NOTIFICATION_CONTEXT_TOKEN, new UmbNotificationContext());
+	new UmbContextProviderController(host, UMB_MODAL_CONTEXT_TOKEN, new UmbModalContext(host));
 };
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/index.ts
new file mode 100644
index 0000000000..294bdcf5c3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/index.ts
@@ -0,0 +1 @@
+import './layouts/default';
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/index.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/layouts/default/notification-layout-default.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/stories/notification.mdx b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/notification.mdx
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/stories/notification.mdx
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/notification.mdx
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/stories/notification.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/notification.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/stories/notification.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/notification.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/stories/story-notification-default-example.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/story-notification-default-example.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/core/notification/stories/story-notification-default-example.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/core/notification/stories/story-notification-default-example.element.ts