diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/tempData.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/tempData.ts
deleted file mode 100644
index 139597f9cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/tempData.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/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
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-invite.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts
index 8b781d3f0a..e51758ed27 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/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
@@ -2,7 +2,7 @@ import { css, html, LitElement, nothing } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbContextConsumerMixin } from '../../../../../core/context';
-import UmbSectionViewUsersElement from '../../../../sections/users/views/users/section-view-users.element';
+import UmbSectionViewUsersElement from './section-view-users.element';
 
 export type UsersViewType = 'list' | 'grid';
 @customElement('umb-editor-view-users-invite')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-overview.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
index 08701cff71..e27a9229ea 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
@@ -8,7 +8,7 @@ import './list-view-layouts/grid/editor-view-users-grid.element';
 import './editor-view-users-selection.element';
 import './editor-view-users-invite.element';
 import { IRoute } from 'router-slot';
-import UmbSectionViewUsersElement from '../../../../sections/users/views/users/section-view-users.element';
+import UmbSectionViewUsersElement from './section-view-users.element';
 import { UUIPopoverElement } from '@umbraco-ui/uui';
 import { isPathActive } from 'router-slot';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-selection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-selection.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts
index f375aa7744..a81e3e5f04 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/editor-view-users-selection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts
@@ -3,9 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbContextConsumerMixin } from '../../../../../core/context';
 import { Subscription } from 'rxjs';
-import UmbSectionViewUsersElement, {
-	UserItem,
-} from '../../../../sections/users/views/users/section-view-users.element';
+import UmbSectionViewUsersElement, { UserItem } from './section-view-users.element';
 
 @customElement('umb-editor-view-users-selection')
 export class UmbEditorViewUsersSelectionElement extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts
index 26c5eab443..3f532c60cd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts
@@ -5,7 +5,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import { Subscription } from 'rxjs';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbContextConsumerMixin } from '../../../../../../../core/context';
-import UmbSectionViewUsersElement from '../../../../../../sections/users/views/users/section-view-users.element';
+import UmbSectionViewUsersElement from '../../section-view-users.element';
 import { UmbUserStore } from '../../../../../../../core/stores/user/user.store';
 import type { UserEntity } from '../../../../../../../core/models';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts
index 362f4b7e08..f8088bdf48 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { UmbContextConsumerMixin } from '../../../../../../../core/context';
 import { repeat } from 'lit/directives/repeat.js';
 import { Subscription } from 'rxjs';
-import UmbSectionViewUsersElement from '../../../../../../sections/users/views/users/section-view-users.element';
+import UmbSectionViewUsersElement from '../../section-view-users.element';
 import { UmbUserStore } from '../../../../../../../core/stores/user/user.store';
 import type { UserEntity } from '../../../../../../../core/models';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
index cf60b7aa12..dd55c19657 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
@@ -6,10 +6,10 @@ import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { InterfaceColor, InterfaceLook } from '@umbraco-ui/uui-base/lib/types';
 import { IRoute, IRoutingInfo } from 'router-slot';
 import { v4 as uuidv4 } from 'uuid';
-import '../../../../editors/users/views/users/list-view-layouts/table/editor-view-users-table.element';
-import '../../../../editors/users/views/users/list-view-layouts/grid/editor-view-users-grid.element';
-import '../../../../editors/users/views/users/editor-view-users-selection.element';
-import '../../../../editors/users/views/users/editor-view-users-invite.element';
+import './list-view-layouts/table/editor-view-users-table.element';
+import './list-view-layouts/grid/editor-view-users-grid.element';
+import './editor-view-users-selection.element';
+import './editor-view-users-invite.element';
 
 import type { UserDetails, UserEntity } from '../../../../../core/models';
 import type { UmbEditorViewUsersUserDetailsElement } from '../../../../editors/users/views/users/editor-view-users-user-details.element';
@@ -22,11 +22,11 @@ export class UmbSectionViewUsersElement extends UmbContextProviderMixin(LitEleme
 	private _routes: IRoute[] = [
 		{
 			path: 'overview',
-			component: () => import('../../../../editors/users/views/users/editor-view-users-overview.element'),
+			component: () => import('./editor-view-users-overview.element'),
 		},
 		{
 			path: 'invite',
-			component: () => import('../../../../editors/users/views/users/editor-view-users-invite.element'),
+			component: () => import('./editor-view-users-invite.element'),
 		},
 		{
 			path: 'details/:key',