diff --git a/src/stories/components/button/button.stories.ts b/src/stories/components/button/button.stories.ts
index 38bf7970..b85f98f9 100644
--- a/src/stories/components/button/button.stories.ts
+++ b/src/stories/components/button/button.stories.ts
@@ -15,7 +15,7 @@ import { Badge, ButtonBadgeComponent } from './examples/button-badge.component';
 type ButtonArgs = ExtraButtonComponent & { onClick?: (event: MouseEvent) => void };
 
 const meta: Meta<ButtonArgs> = {
-  title: 'Components/Button',
+  title: 'Components/Button/Button',
   component: ExtraButtonComponent,
   tags: ['autodocs'],
   decorators: [
diff --git a/src/stories/components/message/message.stories.ts b/src/stories/components/message/message.stories.ts
index f19f5d68..74a3c58a 100644
--- a/src/stories/components/message/message.stories.ts
+++ b/src/stories/components/message/message.stories.ts
@@ -7,7 +7,7 @@ import { MessageWithContentComponent, WithContent } from './examples/message-wit
 type MessageArgs = ExtraMessageComponent;
 
 const meta: Meta<MessageArgs> = {
-  title: 'Components/Feedback/Message',
+  title: 'Components/Messages/Message',
   component: ExtraMessageComponent,
   tags: ['autodocs'],
   decorators: [
diff --git a/src/stories/components/tabs/tabs.stories.ts b/src/stories/components/tabs/tabs.stories.ts
index 9d76203c..ab8e4b5f 100644
--- a/src/stories/components/tabs/tabs.stories.ts
+++ b/src/stories/components/tabs/tabs.stories.ts
@@ -4,7 +4,7 @@ import { TabsWithBadgeComponent, WithBadge } from './examples/tabs-with-badge.co
 import { TabsWithDisabledComponent, WithDisabled } from './examples/tabs-with-disabled.component';
 
 const meta: Meta<ExtraTabsComponent> = {
-  title: 'Components/Menu/Tabs',
+  title: 'Components/Panel/Tabs',
   component: ExtraTabsComponent,
   tags: ['autodocs'],
   decorators: [
diff --git a/src/stories/components/toast/toast.stories.ts b/src/stories/components/toast/toast.stories.ts
index 9b22ddf9..5b4925a2 100644
--- a/src/stories/components/toast/toast.stories.ts
+++ b/src/stories/components/toast/toast.stories.ts
@@ -8,7 +8,7 @@ import { ToastWidthComponent, Width } from './examples/toast-width.component';
 import { Position, ToastPositionComponent } from './examples/toast-position.component';
 
 const meta: Meta<ExtraToastComponent> = {
-  title: 'Components/Feedback/Toast',
+  title: 'Components/Messages/Toast',
   component: ExtraToastComponent,
   tags: ['autodocs'],
   decorators: [