diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index 58ab634d7bdde18cc1fda40fcf7e1beb8baf7769..11944356c6944e3fcd7faf4a6e1cbb030ddc90a0 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -22,9 +22,8 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { Environment, getEnvironmentFactory } from '@alfa-client/environment-shared';
-import { StateResource } from '@alfa-client/tech-shared';
 import { BuildInfoComponent } from '@alfa-client/common';
+import { Environment, getEnvironmentFactory } from '@alfa-client/environment-shared';
 import { StateResource, TechSharedModule } from '@alfa-client/tech-shared';
 import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
index b2b68278c1fb8964d4e2fbc3547cffcb07ca159f..cb9bf3ffd04a1caacde740c71fc98b9ead6a057e 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
@@ -25,6 +25,6 @@
 -->
 <ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
   @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
-    <admin-organisationseinheit-form-container data-test-id="organisations-einheit-form" />
+    <admin-organisations-einheit-form-container data-test-id="organisations-einheit-form" />
   }
 </ng-container>
\ No newline at end of file
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
index 684561a85ac1fc22e8f9e4fb2aec8e6960dec2d5..081e864d889b4390e5951d5ae3a757b687cde6ab 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
@@ -25,6 +25,7 @@ import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organi
 import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
 import { createStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { CommonModule } from '@angular/common';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -45,7 +46,7 @@ describe('OrganisationsEinheitFormPageComponent', () => {
     apiRootService = mock(ApiRootService);
 
     await TestBed.configureTestingModule({
-      imports: [TechSharedModule],
+      imports: [CommonModule, TechSharedModule],
       declarations: [OrganisationsEinheitFormPageComponent, MockComponent(OrganisationsEinheitFormContainerComponent)],
       providers: [{ provide: ApiRootService, useValue: apiRootService }],
     }).compileComponents();
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
index c6b911fd2bd0dbec75e9fd4a62eb0ac2813c428e..f1c8abdc407045cf77eb1b673b22fe82c31ff1c7 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
@@ -25,6 +25,6 @@
 -->
 <ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
   @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
-    <admin-organisationseinheit-container data-test-id="organisations-einheit-container" />
+    <admin-organisations-einheit-container data-test-id="organisations-einheit-container" />
   }
 </ng-container>
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
index 8dd6e2537e4e3d0ccf7e77088ec0575f2ae842ec..d6b708a413afe74806a4e040ec5c5affc7490678 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
@@ -21,11 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-settings';
+import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
 import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
 import { createStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
+import { CommonModule } from '@angular/common';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -46,7 +46,7 @@ describe('OrganisationsEinheitPageComponent', () => {
     apiRootService = mock(ApiRootService);
 
     await TestBed.configureTestingModule({
-      imports: [TechSharedModule],
+      imports: [CommonModule, TechSharedModule],
       declarations: [OrganisationsEinheitPageComponent, MockComponent(OrganisationsEinheitContainerComponent)],
       providers: [{ provide: ApiRootService, useValue: apiRootService }],
     }).compileComponents();
diff --git a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
index c99ec7b504dd53f1ab6098c0b1e4ead945de9127..1b1555bcacff75394b0aa8a882090913b38e84bf 100644
--- a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
@@ -21,10 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { PostfachContainerComponent } from '@admin-client/admin-settings';
+import { PostfachContainerComponent } from '@admin-client/postfach';
 import { getEnvironmentFactory } from '@alfa-client/environment-shared';
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { PostfachContainerComponent } from '@admin-client/postfach';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createEnvironment } from 'libs/environment-shared/test/environment';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
index 8c01a03c82a4c87c859ff6db3845b7767067b268..facb1f6d4f1b2493b43c881222f3bfde83e90890 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
@@ -21,10 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { UserAddFormComponent } from '@admin-client/admin-settings';
+import { UserAddFormComponent } from '@admin-client/user';
 import { getEnvironmentFactory } from '@alfa-client/environment-shared';
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { UserAddFormComponent } from '@admin-client/user';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createEnvironment } from 'libs/environment-shared/test/environment';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
index a5dd75169242f75b2950bd95dd457bea6a22635d..77b415071c8a7e4d5ce966bae33b30bd48d4f14c 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
@@ -21,10 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { UsersRolesComponent } from '@admin-client/admin-settings';
+import { UsersRolesComponent } from '@admin-client/user';
 import { getEnvironmentFactory } from '@alfa-client/environment-shared';
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { UsersRolesComponent } from '@admin-client/user';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createEnvironment } from 'libs/environment-shared/test/environment';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
index 59c700778bd2f16f1ffc5df8214e0d1a26395012..4c7f294dbde21fb4425692fc8cc967e669ecf75d 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitItemResource, AdminOrganisationsEinheitListResource } from '@admin-client/admin-settings';
 import { ConfigurationResource } from '@admin-client/configuration-shared';
 import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
 import { ListResourceServiceConfig, ResourceListService, ResourceRepository } from '@alfa-client/tech-shared';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
index 42e19e804cebdd297921db5f482f8f8c71e214c2..304671d285d6657bf817c2b504d7b0ce5979796f 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { ConfigurationResource } from '@admin-client/configuration-shared';
 import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
 import { OrganisationsEinheitListResourceService } from './organisations-einheit-list-resource.service';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
index 96a20c8289a49f8126b94bb4702110c250754231..36f737d58574c8765ae7f91c8e555663e561627d 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitListResource, AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { NavigationService } from '@alfa-client/navigation-shared';
 import { StateResource, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
index bd96a7fddd89b0c7006fdbf0db8cc482dd440e1c..dd246b5c64f0dbba4a7105e668599eee32fe03d1 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
@@ -21,11 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import {
-  AdminOrganisationsEinheitListResource,
-  AdminOrganisationsEinheitResource,
-  AdminOrganisationsEinheitSettings,
-} from '@admin-client/admin-settings';
 import { NavigationService } from '@alfa-client/navigation-shared';
 import { StateResource, createEmptyStateResource, isNotUndefined } from '@alfa-client/tech-shared';
 import { SnackBarService } from '@alfa-client/ui';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 8282af1ba3f4d5f93bd9db0b95e8debf9219777f..2760d6e214e65704bf2b8e0ae833cf46e79f8cdc 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitListResource, OrganisationsEinheitContainerComponent } from '@admin-client/admin-settings';
 import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
 import { StateResource, ToEmbeddedResourcesPipe, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, existsAsHtmlElement, getMockComponent, mock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
index 15f4b3279ba241eab2a527d60e632fb0d2375059..f7ce733a741f7c9c8a2162bca39ece86ad04b76f 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
@@ -21,8 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '@admin-client/admin-settings';
-import { ConvertForDataTestPipe, ToResourceUriPipe } from '@alfa-client/tech-shared';
 import {
   existsAsHtmlElement,
   getElementFromFixture,
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
index f2315cc3daf1fdb8072714a960be4d873c273a90..826556819ed09bee47196d4f0667a466d18fd3c0 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '@admin-client/admin-settings';
 import {
   AdminOrganisationsEinheitResource,
   AdminOrganisationsEinheitSyncResult,
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
index aeca645d1ef3db1a5214eff204f8408a72344f26..52ff5b34755d15192ffef6d9f8cf668706eea6e3 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource, OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-settings';
 import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
 import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
 import { StateResource, createStateResource } from '@alfa-client/tech-shared';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
index efcdbd8ddd555dbed715c6a8c1c1cb65b51fb140..b329e45f498f6602c7e98eabc78dbc10ef3ce18a 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
 import { createEmptyStateResource, createStateResource, ProblemDetail } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, Mock, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
index 2cc76d3b7975b22a6c5dc489a9281d7b4e809114..ac251ee802e66d5cb0894a34fd272129cc2ef66d 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { AdminOrganisationsEinheitResource } from '@admin-client/organisations-einheit-shared';
 import { StateResource, createEmptyStateResource, isNotNil } from '@alfa-client/tech-shared';
 import { CommonModule } from '@angular/common';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
index 636f555a48a87ec228dc85184f44702e7b9d98ac..d44e2084f08bb09746597c0630a1467eabf207e8 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { StateResource, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import { FormBuilder } from '@angular/forms';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
index 1b7731eb391c36e81df3a61b7f0a6e06ebd6fe55..0654a19ed8c4508e9dfaa74c6f28a02dfd10e1df 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
 import { AdminOrganisationsEinheitResource, OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
 import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
 import { Injectable } from '@angular/core';
diff --git a/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts b/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
index 06ff0160080ef9e4243d734505535f8cce0444d5..48043163dea114eba85fa881d9047ec90f8ef24a 100644
--- a/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
+++ b/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
@@ -21,12 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import {
-  ApiResourceService,
-  ResourceRepository,
-  ResourceServiceConfig,
-} from '@alfa-client/tech-shared';
-import { SettingsService } from '../admin-settings.service';
 import { SettingsService } from '@admin-client/settings-shared';
 import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
 import { PostfachLinkRel } from './postfach.linkrel';
diff --git a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
index 73df6c381615512aa2e6aca017e0b3efb9c0a311..d779cb50dc2173e7dee4dc929a7e11f5d259724d 100644
--- a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
+++ b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
@@ -21,20 +21,14 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import {
-  StateResource,
-  createEmptyStateResource,
-  createStateResource,
-} from '@alfa-client/tech-shared';
-import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
 import { Mock, mock } from '@alfa-client/test-utils';
 import { SnackBarService } from '@alfa-client/ui';
 import { Type } from '@angular/core';
 import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { cold } from 'jest-marbles';
+import { singleCold, singleHot } from 'libs/tech-shared/test/marbles';
 import { Observable, of } from 'rxjs';
-import { singleCold, singleHot } from '../../../../tech-shared/test/marbles';
 import { createPostfachResource, createPostfachSettingItem } from '../test/postfach';
 import { PostfachResourceService } from './postfach-resource.service';
 import { PostfachResource, PostfachSettingsItem } from './postfach.model';
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
index bd54907da7f72e5f29bc374277a6a3aaa774f2bb..7cf10044a062cd29edaff204e91432f302651c2b 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { StateResource, createStateResource } from '@alfa-client/tech-shared';
 import { createStateResource, StateResource } from '@alfa-client/tech-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
index 6e9e56a45f54e07ac1bc483594ef0c4369cfc423..9b24d56767a9f5de93f738638d976333cfa93af7 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
@@ -21,12 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import {
-  StateResource,
-  createEmptyStateResource,
-  createStateResource,
-} from '@alfa-client/tech-shared';
-import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import { PostfachResource } from '@admin-client/postfach-shared';
 import { StateResource, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, mock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
index 4f6ac59227be72a80b055c9b0791f0c3b9a2c807..5b78df34aa506c8180878416054cd11bb4164d14 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
@@ -21,21 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import {
-  createEmptyStateResource,
-  createStateResource,
-  StateResource,
-} from '@alfa-client/tech-shared';
-import { createFilledSettingsListResource } from '../../test/admin-settings';
-import { createPostfachResource } from '../../test/postfach/postfach';
-import { SettingListResource } from './admin-settings.model';
-import { getPostfachResource } from './admin-settings.util';
-import { PostfachResource } from './postfach/postfach.model';
 import { PostfachResource } from '@admin-client/postfach-shared';
+import { SettingListResource } from '@admin-client/settings-shared';
 import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { createPostfachResource } from '../../../postfach-shared/src/test/postfach';
+import { createPostfachResource } from 'libs/admin/postfach-shared/src/test/postfach';
 import { createFilledSettingsListResource } from '../../test/settings';
-import { SettingListResource } from './settings.model';
 import { getPostfachResource } from './settings.util';
 
 describe('get postfach resource', () => {
diff --git a/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
index 0a67c73f656a9fe38d64098c5963b6232beb2d12..228f1b0cfaec928f6c70ec566b92d5ae3250eb25 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
@@ -21,15 +21,14 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { fakeAsync, tick } from '@angular/core/testing';
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { faker } from '@faker-js/faker';
 import { cold } from 'jest-marbles';
+import * as resourceUtil from 'libs/tech-shared/src/lib/resource/resource.util';
 import { StateResource, createEmptyStateResource } from 'libs/tech-shared/src/lib/resource/resource.util';
 import { Dummy, createDummy } from 'libs/tech-shared/test/dummy';
 import { singleCold } from 'libs/tech-shared/test/marbles';
 import { Observable, of } from 'rxjs';
-import * as resourceUtil from 'libs/tech-shared/src/lib/resource/resource.util';
 import { KeycloakResourceService } from './keycloak.resource.service';
 
 describe('KeycloakResourceService', () => {
diff --git a/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
index f7408180675ab2ad9c36927831f15dfbcb4a4679..6b7a91ae4d511cfb4d41cd29aaab6cf23a212d87 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { createUser } from '../../../test/user/user';
 import { createUser } from '../../test/user';
 import { ToUserNamePipe } from './to-user-name.pipe';
 import { User } from './user.model';
diff --git a/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
index a78f75a348e727a848594ae8a54c49c8fe243034..78afbd546e6bd7f5113452e5611f7c305e1fa228 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
@@ -21,7 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { createUser } from '../../../test/user/user';
 import { createUser } from '../../test/user';
 import { User } from './user.model';
 import { sortUsersByLastName } from './user.util';