diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
index 7610332c4f..33f5166006 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
@@ -5,13 +5,13 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbUserGroupContext } from './user-group.context';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
-import '../../sections/users/picker-user.element';
-import '../../sections/users/picker-section.element';
+import '@umbraco-cms/sections/users/picker-user.element';
+import '@umbraco-cms/sections/users/picker-section.element';
 import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
-import { UmbUserGroupStore } from 'src/core/stores/user/user-group.store';
 import type { ManifestEditorAction, ManifestWithLoader, UserDetails, UserGroupDetails } from '@umbraco-cms/models';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
-import { UmbUserStore } from 'src/core/stores/user/user.store';
+import { UmbUserGroupStore } from '@umbraco-cms/stores/user/user-group.store';
+import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
 
 @customElement('umb-editor-user-group')
 export class UmbEditorUserGroupElement extends UmbContextProviderMixin(
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
index 6a44fb9841..1931a75c61 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
@@ -5,7 +5,6 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 
 import { repeat } from 'lit/directives/repeat.js';
-import { UmbUserStore } from '../../../core/stores/user/user.store';
 import { getTagLookAndColor } from '../../sections/users/user-extensions';
 import { UmbUserContext } from './user.context';
 import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api';
@@ -14,7 +13,8 @@ import type { ManifestEditorAction, ManifestWithLoader, UserDetails } from '@umb
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 
 import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element';
-import '../../sections/users/picker-user-group.element';
+import '@umbraco-cms/sections/users/picker-user-group.element';
+import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
 
 @customElement('umb-editor-user')
 export class UmbEditorUserElement extends UmbContextProviderMixin(
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/picker.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/picker.ts
index 3db3adf976..825e1a989f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/picker.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/picker.ts
@@ -1,13 +1,14 @@
 import { html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
 import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar';
-import { UmbModalService, UmbModalType } from '../../../core/services/modal';
+// import { UmbModalService, UmbModalType } from '../../../core/services/modal';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 
 //TODO: These should probably be imported dynamically.
 import './picker-layout-section.element';
 import './picker-layout-user-group.element';
 import './picker-layout-user.element';
+import { UmbModalService, UmbModalType } from '@umbraco-cms/services';
 
 export interface UmbPickerData {
 	multiple: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts
index 2186e2c0e3..02773427c0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts
@@ -1,22 +1,22 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbUserGroupStore } from '../../../../../core/stores/user/user-group.store';
-import type {
-	UmbTableElement,
+import {
 	UmbTableColumn,
 	UmbTableConfig,
 	UmbTableDeselectedEvent,
+	UmbTableElement,
 	UmbTableItem,
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
-} from '../../../../components/table';
+} from '@umbraco-cms/components/table';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import type { UserGroupDetails } from '@umbraco-cms/models';
 
 import './user-group-table-name-column-layout.element';
 import './user-group-table-sections-column-layout.element';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
+import { UmbUserGroupStore } from '@umbraco-cms/stores/user/user-group.store';
 
 @customElement('umb-editor-view-user-groups')
 export class UmbEditorViewUserGroupsElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.element.ts
index 3b64b0b9ed..982648f3ea 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-create.element.ts
@@ -7,8 +7,7 @@ import { UmbUserStore } from '../../../../../core/stores/user/user.store';
 import { UmbPickerUserGroupElement } from '../../picker-user-group.element';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import type { UserDetails } from '@umbraco-cms/models';
-import { UmbNotificationService } from 'src/core/services/notification';
-import { UmbNotificationDefaultData } from 'src/core/services/notification/layouts/default';
+import { UmbNotificationDefaultData, UmbNotificationService } from '@umbraco-cms/services';
 
 export type UsersViewType = 'list' | 'grid';
 @customElement('umb-editor-view-users-create')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts
index e623ae657b..bee280bef3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts
@@ -1,11 +1,11 @@
 import { css, html, nothing } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, query, state } from 'lit/decorators.js';
-import { UmbModalLayoutElement } from '../../../../../core/services/modal/layouts/modal-layout.element';
-import { UmbUserStore } from '../../../../../core/stores/user/user.store';
 import { UmbPickerUserGroupElement } from '../../picker-user-group.element';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import type { UserDetails } from '@umbraco-cms/models';
+import { UmbModalLayoutElement } from '@umbraco-cms/services';
+import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
 
 export type UsersViewType = 'list' | 'grid';
 @customElement('umb-editor-view-users-invite')
@@ -75,8 +75,6 @@ export class UmbEditorViewUsersInviteElement extends UmbContextConsumerMixin(Umb
 
 		const formData = new FormData(form);
 
-		console.log('formData', formData);
-
 		const name = formData.get('name') as string;
 		const email = formData.get('email') as string;
 		//TODO: How should we handle pickers forms?
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 82404b3db5..7b360952af 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -28,7 +28,10 @@
 			"@umbraco-cms/observable-api": ["src/core/observable-api"],
 			"@umbraco-cms/utils": ["src/core/utils"],
 			"@umbraco-cms/test-utils": ["src/core/test-utils"],
-			"@umbraco-cms/services": ["src/core/services"]
+			"@umbraco-cms/services": ["src/core/services"],
+			"@umbraco-cms/components/*": ["src/backoffice/components/*"],
+			"@umbraco-cms/stores/*": ["src/core/stores/*"],
+			"@umbraco-cms/sections/*": ["src/backoffice/sections/*"]
 		}
 	},
 	"include": ["src/**/*.ts", "e2e/**/*.ts"],