diff --git a/goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.html
rename to goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
diff --git a/goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.scss b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.scss
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.scss
rename to goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.scss
diff --git a/goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.spec.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/date-editor/date-editor.component.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.html
rename to goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.html
diff --git a/goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.scss b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.scss
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.scss
rename to goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.scss
diff --git a/goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.spec.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/text-editor/text-editor.component.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.html b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.html
rename to goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.html
diff --git a/goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.scss b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.scss
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.scss
rename to goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.scss
diff --git a/goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.spec.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
similarity index 100%
rename from goofy-client/libs/ui/src/lib/ui/textarea-editor/textarea-editor.component.ts
rename to goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.ts
diff --git a/goofy-client/libs/ui/src/lib/ui/ui.module.ts b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
index d1af78f0c30dd62b953dcc7fe790958ed9bfbcf0..1ffaa47bf47cbd0ffd15f91a62ca5a22df8fd60e 100644
--- a/goofy-client/libs/ui/src/lib/ui/ui.module.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
@@ -20,8 +20,10 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { TechSharedModule } from '@goofy-client/tech-shared';
 import { SnackbarComponent } from '../snackbar/snackbar.component';
 import { ButtonWithSpinnerComponent } from './button-with-spinner/button-with-spinner.component';
-import { DateEditorComponent } from './date-editor/date-editor.component';
 import { AutocompleteEditorComponent } from './editor/autocomplete-editor/autocomplete-editor.component';
+import { DateEditorComponent } from './editor/date-editor/date-editor.component';
+import { TextEditorComponent } from './editor/text-editor/text-editor.component';
+import { TextAreaEditorComponent } from './editor/textarea-editor/textarea-editor.component';
 import { ExpansionPanelComponent } from './expansion-panel/expansion-panel.component';
 import { FileUploadComponent } from './file-upload/file-upload.component';
 import { FixedDialogComponent } from './fixed-dialog/fixed-dialog.component';
@@ -29,8 +31,6 @@ import { IconButtonWithSpinnerComponent } from './icon-button-with-spinner/icon-
 import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { SpinnerComponent } from './spinner/spinner.component';
 import { SubnavigationComponent } from './subnavigation/subnavigation.component';
-import { TextEditorComponent } from './text-editor/text-editor.component';
-import { TextAreaEditorComponent } from './textarea-editor/textarea-editor.component';
 import { ValidationErrorComponent } from './validation-error/validation-error.component';
 
 const components = [