diff --git a/src/Umbraco.Web.UI.Client/e2e/test.ts b/src/Umbraco.Web.UI.Client/e2e/test.ts
index cf17e0e9f3..9217e4cc4e 100644
--- a/src/Umbraco.Web.UI.Client/e2e/test.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/test.ts
@@ -2,7 +2,7 @@ import { expect, test as base } from '@playwright/test';
 import { createWorkerFixture } from 'playwright-msw';
 import type { MockServiceWorker } from 'playwright-msw';
 
-import { handlers } from '../src/shared/mocks/e2e-handlers';
+import { handlers } from '../src/mocks/e2e-handlers';
 
 const test = base.extend<{
 	worker: MockServiceWorker;
diff --git a/src/Umbraco.Web.UI.Client/index.ts b/src/Umbraco.Web.UI.Client/index.ts
index 30e91a9555..2f2d8d3312 100644
--- a/src/Umbraco.Web.UI.Client/index.ts
+++ b/src/Umbraco.Web.UI.Client/index.ts
@@ -1,5 +1,5 @@
 import { UmbAppElement } from './src/apps/app/app.element';
-import { startMockServiceWorker } from './src/shared/mocks';
+import { startMockServiceWorker } from './src/mocks';
 
 if (import.meta.env.VITE_UMBRACO_USE_MSW === 'on') {
 	startMockServiceWorker();
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/browser-handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/culture.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/culture.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/data-type.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/dictionary.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/dictionary.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/dictionary.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/document-blueprint.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-blueprint.data.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/document-blueprint.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/document-blueprint.data.ts
index 7a3258640c..fdb780f011 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/document-blueprint.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-blueprint.data.ts
@@ -1,4 +1,4 @@
-import type { DocumentBlueprintDetails } from '../../../packages/documents/document-blueprints/types';
+import type { DocumentBlueprintDetails } from '../../packages/documents/document-blueprints/types';
 import { UmbEntityData } from './entity.data';
 
 export const data: Array<DocumentBlueprintDetails> = [
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/document-type.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/document.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/document.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/entity-tree.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entity-tree.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/entity-tree.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/entity-tree.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/entity.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/entity.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/examine.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/examine.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/health-check.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/health-check.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/languages.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/languages.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/log-viewer.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/log-viewer.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/logs.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/logs.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/media-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type.data.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/media-type.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/media-type.data.ts
index d8aa9fa56b..aa1a80dfd3 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/media-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type.data.ts
@@ -1,4 +1,4 @@
-import type { MediaTypeDetails } from '../../../packages/media/media-types/types';
+import type { MediaTypeDetails } from '../../packages/media/media-types/types';
 import { UmbEntityData } from './entity.data';
 import { createFolderTreeItem } from './utils';
 import { FolderTreeItemResponseModel, PagedFolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/media.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media.data.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/media.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/media.data.ts
index 40a3d705d4..1aea7db893 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/media.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media.data.ts
@@ -1,4 +1,4 @@
-import type { MediaDetails } from '../../../packages/media/media';
+import type { MediaDetails } from '../../packages/media/media';
 import { UmbEntityTreeData } from './entity-tree.data';
 import { UmbEntityData } from './entity.data';
 import { createContentTreeItem } from './utils';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-group.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-group.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts
index daaf993973..c38a91b0f7 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-group.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts
@@ -1,4 +1,4 @@
-import type { MemberGroupDetails } from '../../../packages/members/member-groups/types';
+import type { MemberGroupDetails } from '../../packages/members/member-groups/types';
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
 import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-type.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts
index eec647ae53..7eacfcc486 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts
@@ -1,4 +1,4 @@
-import type { MemberTypeDetails } from '../../../packages/members/member-types/types';
+import type { MemberTypeDetails } from '../../packages/members/member-types/types';
 import { UmbData } from './data';
 import { createEntityTreeItem } from './utils';
 import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/member.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts
index 5c700c0306..bc576f6c18 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/member.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts
@@ -1,4 +1,4 @@
-import type { MemberDetails } from '../../../packages/members/members/types';
+import type { MemberDetails } from '../../packages/members/members/types';
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
 import type {
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/partial-views.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-views.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/partial-views.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/partial-views.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/relation-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/relation-type.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/relation-type.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/relation-type.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/stylesheet.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/stylesheet.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/template.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/template.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/template.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/user-groups.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user-groups.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/user-groups.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/user-groups.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/users.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/users.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/users.data.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/users.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/data/utils.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/data/utils.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/e2e-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/e2e-handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/e2e-handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/e2e-handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/config.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/config.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/config.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/config.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/culture.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/culture.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/culture.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/culture.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/copy.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/copy.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/detail.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/folder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/folder.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/folder.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/folder.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/index.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/index.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/item.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/item.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/item.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/item.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/move.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/move.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/slug.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/slug.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/slug.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/slug.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/tree.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/tree.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/data-type/tree.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/tree.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/dictionary.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/document-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/document-type.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/document.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/document.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/document.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/examine-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/examine-management.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/health-check.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/health-check.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/install.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/language.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/language.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/language.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/language.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/log-viewer.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/log-viewer.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/manifests.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/manifests.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts
index 76fa373847..74bc8f4c7f 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/manifests.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts
@@ -1,6 +1,6 @@
 const { rest } = window.MockServiceWorker;
 
-import type { PackageManifestResponse } from '../../../packages/packages/types';
+import type { PackageManifestResponse } from '../../packages/packages/types';
 import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 
 export const manifestDevelopmentHandler = rest.get(umbracoPath('/package/manifest'), (_req, res, ctx) => {
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/media-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/media-type.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/media.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/media.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/media.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member-group.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/member-group.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member-group.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/member-group.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/member-type.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member-type.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/member-type.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/member.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/member.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/member.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/modelsbuilder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/modelsbuilder.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/package.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/package.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/partial-views.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-views.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/partial-views.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-views.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/performance-profiling.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/performance-profiling.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/published-status.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/published-status.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/published-status.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/published-status.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/redirect-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/redirect-management.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/relation-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/relation-type.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/relation-type.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/relation-type.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/rte-embed.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/rte-embed.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/server.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/stylesheet.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/stylesheet.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/tag-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/tag-handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/telemetry.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/telemetry.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/template.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/template.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/template.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/template.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/tree-media.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tree-media.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/tree-media.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/tree-media.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/upgrade.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/upgrade.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/user-group.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/user-group.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/user.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user.handlers.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/handlers/user.handlers.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/user.handlers.ts
diff --git a/src/Umbraco.Web.UI.Client/src/shared/mocks/index.ts b/src/Umbraco.Web.UI.Client/src/mocks/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/shared/mocks/index.ts
rename to src/Umbraco.Web.UI.Client/src/mocks/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.stories.ts
index b4a173561f..4c6c664b67 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.stories.ts
@@ -2,7 +2,7 @@ import './document-type-workspace-editor.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { treeData } from '../../../../shared/mocks/data/document-type.data';
+import { treeData } from '../../../../mocks/data/document-type.data';
 import type { UmbDocumentTypeWorkspaceElement } from './document-type-workspace.element';
 
 export default {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.stories.ts
index 12b1a26e7e..123a30133f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.stories.ts
@@ -2,7 +2,7 @@ import './media-workspace.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { data as mediaNodes } from '../../../../shared/mocks/data/media.data';
+import { data as mediaNodes } from '../../../../mocks/data/media.data';
 import type { UmbMediaWorkspaceElement } from './media-workspace.element';
 
 export default {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.stories.ts
index d9f149e6d2..5d415ae7c3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.stories.ts
@@ -3,7 +3,7 @@ import './member-group-workspace.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import { data } from '../../../../shared/mocks/data/member-group.data';
+import { data } from '../../../../mocks/data/member-group.data';
 
 import type { UmbMemberGroupWorkspaceElement } from './member-group-workspace.element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts
index 48a82d2276..02a7129049 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { umbMemberData } from '../../../shared/mocks/data/member.data';
+import { umbMemberData } from '../../../mocks/data/member.data';
 import type { MemberDetails } from './types';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbArrayState, createObservablePart } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.stories.ts
index 969b0317a6..c7ee0b4133 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.stories.ts
@@ -3,7 +3,7 @@ import './member-workspace.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import { data } from '../../../../shared/mocks/data/member.data';
+import { data } from '../../../../mocks/data/member.data';
 
 import type { UmbMemberWorkspaceElement } from './member-workspace.element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.stories.ts
index 09323d2a4a..2eeae23a96 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.stories.ts
@@ -4,7 +4,7 @@ import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { data } from '../../../../shared/mocks/data/data-type.data';
+import { data } from '../../../../mocks/data/data-type.data';
 
 import type { UmbDataTypeWorkspaceElement } from './data-type-workspace.element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.stories.ts
index 7daa68ffe5..f4dbac2582 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.stories.ts
@@ -4,7 +4,7 @@ import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { data } from '../../../../shared/mocks/data/relation-type.data';
+import { data } from '../../../../mocks/data/relation-type.data';
 
 import type { UmbRelationTypeWorkspaceElement } from './relation-type-workspace.element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/translation/dictionary/workspace/dictionary-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/translation/dictionary/workspace/dictionary-workspace.stories.ts
index 6df82b9529..5a88809c60 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/translation/dictionary/workspace/dictionary-workspace.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/translation/dictionary/workspace/dictionary-workspace.stories.ts
@@ -2,7 +2,7 @@ import './dictionary-workspace.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { data } from '../../../../shared/mocks/data/dictionary.data';
+import { data } from '../../../../mocks/data/dictionary.data';
 import type { UmbWorkspaceDictionaryElement } from './dictionary-workspace.element';
 
 export default {