diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.html
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
similarity index 96%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
index 6b066bf109720fc66a914f64c86cfe26cdf7928b..eb07b93279f1fe6c1117ced655d9ed18a2090463 100644
--- a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
@@ -30,8 +30,8 @@ import { getUrl, Resource } from '@ngxp/rest';
 import { FileUploadButtonComponent, SpinnerIconComponent } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
-import { createFileList } from '../../../../../tech-shared/test/file';
-import { createDummyResource } from '../../../../../tech-shared/test/resource';
+import { createFileList } from '../../../../tech-shared/test/file';
+import { createDummyResource } from '../../../../tech-shared/test/resource';
 import { MultiFileUploadEditorComponent } from './multi-file-upload-editor.component';
 
 describe('MultiFileUploadEditorComponent', () => {
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
similarity index 96%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
index 1845ef59e0f670837f887258ef97027894285fbb..4a8b5683a078d328bd8cd6b86f8613852585a055 100644
--- a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
@@ -27,9 +27,9 @@ import { TechSharedModule } from '@alfa-client/tech-shared';
 import { Component, HostListener, inject, Input } from '@angular/core';
 import { ControlContainer, FormGroupDirective, ReactiveFormsModule } from '@angular/forms';
 import { getUrl, Resource } from '@ngxp/rest';
+import { FormControlEditorAbstractComponent } from '@ods/component';
 import { AttachmentIconComponent, FileUploadButtonComponent, SpinnerIconComponent } from '@ods/system';
 import { uniqueId } from 'lodash-es';
-import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
 
 @Component({
   selector: 'ods-multi-file-upload-editor',
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.html
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.html
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.html
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts
similarity index 92%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts
index a7676cc0126f1013b265eb17e97cf31dbe1608d5..8f66630ace6c8e4aa1f395829a3b9ee2bb9c9c6f 100644
--- a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.spec.ts
@@ -3,8 +3,8 @@ import { mock, Mock } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { expect } from '@jest/globals';
 import { MockComponent } from 'ng-mocks';
-import { createUploadFile } from '../../../../../binary-file-shared/test/binary-file';
-import { singleColdCompleted } from '../../../../../tech-shared/test/marbles';
+import { createUploadFile } from '../../../../binary-file-shared/test/binary-file';
+import { singleColdCompleted } from '../../../../tech-shared/test/marbles';
 import {
   MultiFileUploadListContainerComponent,
   MultiFileUploadListOrientation,
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.ts
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component.ts
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.html
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.html
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.html
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts
similarity index 94%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts
index 3be9b346679d37c756618f2d9251432148916098..0190b738556eb899d0cfcbff7fe769e0786b373a 100644
--- a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.spec.ts
@@ -13,11 +13,11 @@ import { AttachmentComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
 import {
   createBinaryFileResource,
+  createFile,
   createLoadingBinaryFileStateResource,
-} from '../../../../../../binary-file-shared/test/binary-file';
-import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
-import { createProblemDetail } from '../../../../../../tech-shared/test/error';
-import { createFile } from '../../../../../../tech-shared/test/file';
+} from '../../../../../binary-file-shared/test/binary-file';
+import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
+import { createProblemDetail } from '../../../../../tech-shared/test/error';
 import { MultiFileUploadListItemComponent } from './multi-file-upload-list-item.component';
 
 describe('MultiFileUploadListItemComponent', () => {
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.html
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.html
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.html
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts
similarity index 98%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts
index ff9ec37d3a76e19d61a05c1486e4b0b73b8e2db0..afa00d22e3c42be1baf54405bbc496e20cb5d7b0 100644
--- a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.spec.ts
@@ -13,8 +13,8 @@ import { expect } from '@jest/globals';
 import { getUrl } from '@ngxp/rest';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
-import { createBinaryFileResource, createUploadFile } from '../../../../../../binary-file-shared/test/binary-file';
-import { createProblemDetail } from '../../../../../../tech-shared/test/error';
+import { createBinaryFileResource, createUploadFile } from '../../../../../binary-file-shared/test/binary-file';
+import { createProblemDetail } from '../../../../../tech-shared/test/error';
 import { MultiFileUploadListOrientation } from '../multi-file-upload-list-container.component';
 import { MultiFileUploadListItemComponent } from '../multi-file-upload-list-item/multi-file-upload-list-item.component';
 import { _horizontalClasses, _verticalClasses, MultiFileUploadListComponent } from './multi-file-upload-list.component';
diff --git a/alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
similarity index 100%
rename from alfa-client/libs/design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
rename to alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
diff --git a/alfa-client/libs/kommentar/src/lib/kommentar.module.ts b/alfa-client/libs/kommentar/src/lib/kommentar.module.ts
index 10537ca0612c52d538269641346968f5058f460d..9c5bf2a3b4ec706b007afa7165a09113d53d562e 100644
--- a/alfa-client/libs/kommentar/src/lib/kommentar.module.ts
+++ b/alfa-client/libs/kommentar/src/lib/kommentar.module.ts
@@ -29,8 +29,8 @@ import { UserProfileModule } from '@alfa-client/user-profile';
 import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { MultiFileUploadEditorComponent } from '../../../design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component';
-import { MultiFileUploadListContainerComponent } from '../../../design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component';
+import { MultiFileUploadEditorComponent } from '../../../binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component';
+import { MultiFileUploadListContainerComponent } from '../../../binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-container.component';
 import { KommentarFormComponent } from './kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component';
 import { KommentarListInVorgangContainerComponent } from './kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component';
 import { KommentarListInVorgangComponent } from './kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-in-vorgang.component';