diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
index 49941e525d4392644d90e722d437a3a4aaeeef12..c84a227e151ad5b440bc40f039757ea661dd55d4 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
@@ -5,12 +5,11 @@ import { MatIcon } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { mock } from '@goofy-client/test-utils';
-import { ButtonWithSpinnerComponent } from '@goofy-client/ui';
-import { TextEditorComponent } from 'libs/ui/src/lib/ui/text-editor/text-editor.component';
+import { ButtonWithSpinnerComponent, TextEditorComponent } from '@goofy-client/ui';
+import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { VorgangForwardFormComponent } from './vorgang-forward-form.component';
 import { VorgangForwardFormService } from './vorgang-forward.formservice';
-import { createVorgang, createVorgangResource, createVorgangWithEingang, createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 
 describe('VorgangForwardFormComponent', () => {
 	let component: VorgangForwardFormComponent;
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
index 26e20f30e631d16374f95228de924003ae71c0cc..3bb8c01eb728a2b56c50f82aacc49e40ba7c720c 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
@@ -4,8 +4,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { KommentarService } from '@goofy-client/kommentar-shared';
 import { mock } from '@goofy-client/test-utils';
-import { ButtonWithSpinnerComponent } from '@goofy-client/ui';
-import { TextAreaEditorComponent } from 'libs/ui/src/lib/ui/textarea-editor/textarea-editor.component';
+import { ButtonWithSpinnerComponent, TextAreaEditorComponent } from '@goofy-client/ui';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';
 import { KommentarFormComponent } from './kommentar-form.component';
diff --git a/goofy-client/libs/ui/src/index.ts b/goofy-client/libs/ui/src/index.ts
index 2770becc200a305f818a29a479d48968ae314642..3f2f1417176b00c6e5edee424ebeb63cb6c7addf 100644
--- a/goofy-client/libs/ui/src/index.ts
+++ b/goofy-client/libs/ui/src/index.ts
@@ -2,6 +2,9 @@ export * from './lib/icon/icon.service';
 export * from './lib/snackbar/snackbar.service';
 export * from './lib/ui/button-with-spinner/button-with-spinner.component';
 export * from './lib/ui/editor/autocomplete-editor/autocomplete-editor.component';
+export * from './lib/ui/editor/date-editor/date-editor.component';
+export * from './lib/ui/editor/text-editor/text-editor.component';
+export * from './lib/ui/editor/textarea-editor/textarea-editor.component';
 export * from './lib/ui/expansion-panel/expansion-panel.component';
 export * from './lib/ui/file-upload/file-upload.component';
 export * from './lib/ui/fixed-dialog/fixed-dialog.component';
@@ -9,3 +12,4 @@ export * from './lib/ui/icon-button-with-spinner/icon-button-with-spinner.compon
 export * from './lib/ui/spinner/spinner.component';
 export * from './lib/ui/subnavigation/subnavigation.component';
 export * from './lib/ui/ui.module';
+
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
index d802be2d5737a4b5811a99b5434303707d83bca4..a63ad706430dcbdef1526009087139ee4cec4a8c 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
@@ -8,7 +8,7 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
-import { ValidationErrorComponent } from '../validation-error/validation-error.component';
+import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
 import { DateEditorComponent } from './date-editor.component';
 
 describe('DateEditorComponent', () => {
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
index 694abfccf9ad9f11f64553de3df3bf513a247be2..0d0813c5538884d80fe8aacad01032570db946bd 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { FormControlEditorAbstractComponent } from '../editor/formcontrol-editor.abstract.component';
+import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
 	selector: 'goofy-client-date-editor',
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
index 1877503cae5e31f0b12186850bb1bdcdef01dbfe..aedef50d395e780ea719def013f2feceea1d59c6 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
@@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';
-import { ValidationErrorComponent } from '../validation-error/validation-error.component';
+import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
 import { TextEditorComponent } from './text-editor.component';
 
 describe('TextEditorComponent', () => {
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
index 587efb0c28028d4070b9c598e9204941309d3afb..5a28573773b46b0b65d81868a977dd412b67aee1 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { FormControlEditorAbstractComponent } from '../editor/formcontrol-editor.abstract.component';
+import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
 	selector: 'goofy-client-text-editor',
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
index 734893768625730046c44130eb283482ca0712f5..7bb85d1dc7cc92a6285408846fa3fafdf352b080 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
@@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';
-import { ValidationErrorComponent } from '../validation-error/validation-error.component';
+import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
 import { TextAreaEditorComponent } from './textarea-editor.component';
 
 describe('TextAreaEditorComponent', () => {
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
index cab3e8cb87ecda7500f7f2becd43eafbc40444b2..7472b557be9037249475f3cdd80f4f7577991a9d 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
@@ -1,13 +1,13 @@
-import { AfterViewInit, Component, Input, ViewChild } from '@angular/core';
-import { FormControlEditorAbstractComponent } from '../editor/formcontrol-editor.abstract.component';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
+import { AfterViewInit, Component, Input, ViewChild } from '@angular/core';
+import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
 	selector: 'goofy-client-textarea-editor',
 	templateUrl: './textarea-editor.component.html',
 	styleUrls: ['./textarea-editor.component.scss']
 })
-export class TextAreaEditorComponent extends FormControlEditorAbstractComponent implements AfterViewInit{
+export class TextAreaEditorComponent extends FormControlEditorAbstractComponent implements AfterViewInit {
 
 	@ViewChild('autosize') autosize: CdkTextareaAutosize;
 
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts
index 72dbe1ac976be82ceba1e94200ed9af3f6ddda45..882c320cb52358b023c1b77c715eaeb92998c3b3 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts
@@ -3,11 +3,8 @@ import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { mock, useFromMock } from '@goofy-client/test-utils';
-import { ButtonWithSpinnerComponent } from '@goofy-client/ui';
+import { ButtonWithSpinnerComponent, DateEditorComponent, TextAreaEditorComponent, TextEditorComponent } from '@goofy-client/ui';
 import { WiedervorlageResource, WiedervorlageService } from '@goofy-client/wiedervorlage-shared';
-import { DateEditorComponent } from 'libs/ui/src/lib/ui/date-editor/date-editor.component';
-import { TextEditorComponent } from 'libs/ui/src/lib/ui/text-editor/text-editor.component';
-import { TextAreaEditorComponent } from 'libs/ui/src/lib/ui/textarea-editor/textarea-editor.component';
 import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';