diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.context.ts
index ebc04e5f3a..22dd41acf7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.context.ts
@@ -9,7 +9,7 @@ import {
 import { createExtensionClass } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository';
-import type { UmbCollectionFilterModel } from 'src/packages/core/collection';
+import type { UmbCollectionFilterModel } from '@umbraco-cms/backoffice/collection';
 
 // TODO: Clean up the need for store as Media has switched to use Repositories(repository).
 export class UmbCollectionContext<ItemType, FilterModelType extends UmbCollectionFilterModel> {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
index 96c5fbccd2..ab4c9a964c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts
@@ -4,7 +4,7 @@ import { customElement, state, property } from 'lit/decorators.js';
 import { map } from 'rxjs';
 import './collection-selection-actions.element';
 import './collection-toolbar.element';
-import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from 'src/packages/core/collection';
+import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
 import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
 import { ManifestCollectionView, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts
index 3f260a09a8..e739df7e71 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.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 { ifDefined } from 'lit/directives/if-defined.js';
-import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from 'src/packages/core/collection';
+import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection';
 import type { ManifestDashboardCollection } from '@umbraco-cms/backoffice/extension-registry';
 import type { FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
index fea9c6eb61..e29f2d57f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
@@ -1,5 +1,5 @@
 import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
-import { UmbId } from 'src/packages/core/id';
+import { UmbId } from '@umbraco-cms/backoffice/id';
 import {
 	DocumentTypePropertyTypeResponseModel,
 	PropertyTypeContainerResponseModelBaseModel,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/copy/copy.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/copy/copy.action.ts
index 187d1e71c5..31235bbcac 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/copy/copy.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/copy/copy.action.ts
@@ -1,4 +1,4 @@
-import { UmbEntityActionBase } from 'src/packages/core/entity-action';
+import { UmbEntityActionBase } from '../../entity-action';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbCopyEntityAction<T extends { copy(): Promise<void> }> extends UmbEntityActionBase<T> {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete-folder/delete-folder.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete-folder/delete-folder.action.ts
index 6c126b38f7..91f7faf685 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete-folder/delete-folder.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete-folder/delete-folder.action.ts
@@ -1,4 +1,4 @@
-import { UmbEntityActionBase } from 'src/packages/core/entity-action';
+import { UmbEntityActionBase } from '../../entity-action';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.ts
index ab2675256c..c8364b0950 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.ts
@@ -1,4 +1,4 @@
-import { UmbEntityActionBase } from 'src/packages/core/entity-action';
+import { UmbEntityActionBase } from '../../entity-action';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 // TODO: investigate what we need to finish the generic move action. We would need to open a picker, which requires a modal token,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/trash/trash.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/trash/trash.action.ts
index 4bb04a032b..36a5652779 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/trash/trash.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/trash/trash.action.ts
@@ -1,4 +1,4 @@
-import { UmbEntityActionBase } from 'src/packages/core/entity-action';
+import { UmbEntityActionBase } from '../../entity-action';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts
index 20046e667d..63bf3ec2a7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts
@@ -1,6 +1,6 @@
 import type { InterfaceColor, InterfaceLook } from '@umbraco-ui/uui-base/lib/types/index';
 import type { ManifestElement, ClassConstructor } from '@umbraco-cms/backoffice/extension-api';
-import { UmbWorkspaceAction } from 'src/packages/core/workspace';
+import { UmbWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
 
 export interface ManifestWorkspaceAction extends ManifestElement {
 	type: 'workspaceAction';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts
index dd2e1ed7ed..3d401647d7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts
@@ -1,9 +1,10 @@
 // TODO: Be aware here we import a class from src!
-import { UMB_ROUTE_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/router';
 import { UmbModalRouteRegistration } from './modal-route-registration';
+import { UmbModalToken } from './token';
+import { UmbModalConfig } from './modal.context';
+import { UMB_ROUTE_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/router';
 import type { UmbControllerHostElement, UmbControllerInterface } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
-import { UmbModalConfig, UmbModalToken } from 'src/packages/core/modal';
 
 export class UmbModalRouteRegistrationController<D extends object = object, R = any>
 	extends UmbModalRouteRegistration<D, R>