diff --git a/webapp/src/app/example/counter/counter.component.ts b/webapp/src/app/example/counter/counter.component.ts
index 0b3fb872..89dd6f4e 100644
--- a/webapp/src/app/example/counter/counter.component.ts
+++ b/webapp/src/app/example/counter/counter.component.ts
@@ -1,6 +1,6 @@
 import { Component, computed, effect, input, signal } from '@angular/core';
 import { counter } from './counter';
-import { AppButtonComponent } from 'app/ui/button/button/button.component';
+import { AppButtonComponent } from 'app/ui/button/button.component';
 
 interface CounterHistoryEntry {
   dec: number;
diff --git a/webapp/src/app/example/hello/hello.component.ts b/webapp/src/app/example/hello/hello.component.ts
index 12a35298..bec78d95 100644
--- a/webapp/src/app/example/hello/hello.component.ts
+++ b/webapp/src/app/example/hello/hello.component.ts
@@ -3,7 +3,7 @@ import { injectMutation, injectQuery, injectQueryClient } from '@tanstack/angula
 import { AngularQueryDevtools } from '@tanstack/angular-query-devtools-experimental';
 import { lastValueFrom } from 'rxjs';
 import { HelloService } from 'app/core/modules/openapi';
-import { AppButtonComponent } from 'app/ui/button/button/button.component';
+import { AppButtonComponent } from 'app/ui/button/button.component';
 
 @Component({
   selector: 'app-hello',
diff --git a/webapp/src/app/ui/button/button/button.component.html b/webapp/src/app/ui/button/button.component.html
similarity index 100%
rename from webapp/src/app/ui/button/button/button.component.html
rename to webapp/src/app/ui/button/button.component.html
diff --git a/webapp/src/app/ui/button/button/button.component.ts b/webapp/src/app/ui/button/button.component.ts
similarity index 100%
rename from webapp/src/app/ui/button/button/button.component.ts
rename to webapp/src/app/ui/button/button.component.ts
diff --git a/webapp/src/app/ui/button/button/button.stories.ts b/webapp/src/app/ui/button/button.stories.ts
similarity index 100%
rename from webapp/src/app/ui/button/button/button.stories.ts
rename to webapp/src/app/ui/button/button.stories.ts
diff --git a/webapp/src/app/ui/input/input.stories.ts b/webapp/src/app/ui/input/input.stories.ts
index 3ce17104..3d26d97b 100644
--- a/webapp/src/app/ui/input/input.stories.ts
+++ b/webapp/src/app/ui/input/input.stories.ts
@@ -1,7 +1,7 @@
 import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 import { AppInputComponent, args, argTypes } from './input.component';
 import { action } from '@storybook/addon-actions';
-import { AppButtonComponent } from '@app/ui/button/button/button.component';
+import { AppButtonComponent } from '@app/ui/button/button.component';
 import { AppLabelComponent } from '@app/ui/label/label.component';
 
 const meta: Meta<AppInputComponent> = {