diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-collection-header.element.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-header.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-collection-header.element.ts
index d2034339a4..13a3da0c03 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-header.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-collection-header.element.ts
@@ -1,4 +1,4 @@
-import { UmbUserGroupCollectionContext } from './user-group-collection.context.js';
+import { UmbUserGroupCollectionContext } from '../user-group-collection.context.js';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
@@ -26,8 +26,15 @@ export class UmbUserGroupCollectionHeaderElement extends UmbLitElement {
 
 	render() {
 		return html`
-			<uui-button @click=${this.#onCreate} label=${this.localize.term('actions_createGroup')} look="outline"></uui-button>
-			<uui-input @input=${this.#onSearch} label=${this.localize.term('general_search')} placeholder=${this.localize.term('visuallyHiddenTexts_userGroupSearchLabel')} id="input-search"></uui-input>
+			<uui-button
+				@click=${this.#onCreate}
+				label=${this.localize.term('actions_createGroup')}
+				look="outline"></uui-button>
+			<uui-input
+				@input=${this.#onSearch}
+				label=${this.localize.term('general_search')}
+				placeholder=${this.localize.term('visuallyHiddenTexts_userGroupSearchLabel')}
+				id="input-search"></uui-input>
 		`;
 	}
 	static styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-table-name-column-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-name-column-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-table-name-column-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-table-sections-column-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-sections-column-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/components/user-group-table-sections-column-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts
index 008728d42a..e046a8c76f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts
@@ -1,12 +1,12 @@
 import { UmbUserGroupCollectionContext } from './user-group-collection.context.js';
-import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
 import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
-import './user-group-table-name-column-layout.element.js';
-import './user-group-table-sections-column-layout.element.js';
+import './components/user-group-table-name-column-layout.element.js';
+import './components/user-group-table-sections-column-layout.element.js';
 import {
 	UmbTableColumn,
 	UmbTableConfig,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts
index 31886d123e..f114c45ac0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts
@@ -1,11 +1,11 @@
 import { UmbUserGroupCollectionContext } from './user-group-collection.context.js';
 import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
-import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 import './user-group-collection-view.element.js';
-import './user-group-collection-header.element.js';
+import './components/user-group-collection-header.element.js';
 
 @customElement('umb-user-group-collection')
 export class UmbUserCollectionElement extends UmbLitElement {