diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 117e400441f35a9a21750521457c1c7537a808d0..e3b231848785cf80bd379be9748b58e9dbd4fdd1 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -5,9 +5,9 @@ export * from './lib/bescheid-status-text/bescheid-status-text.component';
 export * from './lib/bescheid-wrapper/bescheid-wrapper.component';
 export * from './lib/button-card/button-card.component';
 export * from './lib/button/button.component';
-export * from './lib/checkbox/checkbox.component';
-export * from './lib/fieldset/fieldset.component';
+export * from './lib/form/checkbox/checkbox.component';
 export * from './lib/form/error-message/error-message.component';
+export * from './lib/form/fieldset/fieldset.component';
 export * from './lib/form/file-upload-button/file-upload-button.component';
 export * from './lib/form/radio-button-card/radio-button-card.component';
 export * from './lib/form/text-input/text-input.component';
diff --git a/alfa-client/libs/design-system/src/lib/checkbox/checkbox.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.spec.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/checkbox/checkbox.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.spec.ts
diff --git a/alfa-client/libs/design-system/src/lib/checkbox/checkbox.component.ts b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/checkbox/checkbox.component.ts
rename to alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts
diff --git a/alfa-client/libs/design-system/src/lib/checkbox/checbox.stories.ts b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/checkbox/checbox.stories.ts
rename to alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts
diff --git a/alfa-client/libs/design-system/src/lib/fieldset/fieldset.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.component.spec.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/fieldset/fieldset.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.component.spec.ts
diff --git a/alfa-client/libs/design-system/src/lib/fieldset/fieldset.component.ts b/alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.component.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/fieldset/fieldset.component.ts
rename to alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.component.ts
diff --git a/alfa-client/libs/design-system/src/lib/fieldset/fieldset.stories.ts b/alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.stories.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/fieldset/fieldset.stories.ts
rename to alfa-client/libs/design-system/src/lib/form/fieldset/fieldset.stories.ts