diff --git a/apps/app/src/stories/v2/AppSidebar.stories.ts b/apps/app/src/components-v2/layout/AppSidebar.stories.ts
similarity index 95%
rename from apps/app/src/stories/v2/AppSidebar.stories.ts
rename to apps/app/src/components-v2/layout/AppSidebar.stories.ts
index 366122a4..c5ffe438 100644
--- a/apps/app/src/stories/v2/AppSidebar.stories.ts
+++ b/apps/app/src/components-v2/layout/AppSidebar.stories.ts
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
-import { navFixture, orgA, userFixture, withPinia } from './_helpers'
+import { navFixture, orgA, userFixture, withPinia } from '@/stories/v2/_helpers'
 import AppSidebar from '@/components-v2/layout/AppSidebar.vue'
 import { useAuthStore } from '@/stores/useAuthStore'
 import { useShellUiStore } from '@/stores/useShellUiStore'
diff --git a/apps/app/src/stories/v2/AppTopbar.stories.ts b/apps/app/src/components-v2/layout/AppTopbar.stories.ts
similarity index 96%
rename from apps/app/src/stories/v2/AppTopbar.stories.ts
rename to apps/app/src/components-v2/layout/AppTopbar.stories.ts
index 0f1b5b89..65d7d914 100644
--- a/apps/app/src/stories/v2/AppTopbar.stories.ts
+++ b/apps/app/src/components-v2/layout/AppTopbar.stories.ts
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
-import { orgA, userFixture, withPinia } from './_helpers'
+import { orgA, userFixture, withPinia } from '@/stories/v2/_helpers'
 import AppTopbar from '@/components-v2/layout/AppTopbar.vue'
 import { useAuthStore } from '@/stores/useAuthStore'
 import { useShellUiStore } from '@/stores/useShellUiStore'
diff --git a/apps/app/src/stories/v2/RightDrawer.stories.ts b/apps/app/src/components-v2/layout/RightDrawer.stories.ts
similarity index 97%
rename from apps/app/src/stories/v2/RightDrawer.stories.ts
rename to apps/app/src/components-v2/layout/RightDrawer.stories.ts
index 94c32e3f..deee767d 100644
--- a/apps/app/src/stories/v2/RightDrawer.stories.ts
+++ b/apps/app/src/components-v2/layout/RightDrawer.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { defineComponent } from 'vue'
-import { withPinia } from './_helpers'
+import { withPinia } from '@/stories/v2/_helpers'
 import RightDrawer from '@/components-v2/layout/RightDrawer.vue'
 import { registerDrawerComponent } from '@/composables/drawerRegistry'
 import { useShellUiStore } from '@/stores/useShellUiStore'
diff --git a/apps/app/src/stories/v2/SidebarNav.stories.ts b/apps/app/src/components-v2/layout/SidebarNav.stories.ts
similarity index 97%
rename from apps/app/src/stories/v2/SidebarNav.stories.ts
rename to apps/app/src/components-v2/layout/SidebarNav.stories.ts
index a63f5715..c44d619f 100644
--- a/apps/app/src/stories/v2/SidebarNav.stories.ts
+++ b/apps/app/src/components-v2/layout/SidebarNav.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { useRouter } from 'vue-router'
-import { navFixture } from './_helpers'
+import { navFixture } from '@/stories/v2/_helpers'
 import SidebarNav from '@/components-v2/layout/SidebarNav.vue'
 
 /**
diff --git a/apps/app/src/stories/v2/WorkspaceSwitcher.stories.ts b/apps/app/src/components-v2/layout/WorkspaceSwitcher.stories.ts
similarity index 95%
rename from apps/app/src/stories/v2/WorkspaceSwitcher.stories.ts
rename to apps/app/src/components-v2/layout/WorkspaceSwitcher.stories.ts
index a351da4a..14fa21a8 100644
--- a/apps/app/src/stories/v2/WorkspaceSwitcher.stories.ts
+++ b/apps/app/src/components-v2/layout/WorkspaceSwitcher.stories.ts
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
-import { orgA, orgB, orgC, userFixture, withPinia } from './_helpers'
+import { orgA, orgB, orgC, userFixture, withPinia } from '@/stories/v2/_helpers'
 import WorkspaceSwitcher from '@/components-v2/layout/WorkspaceSwitcher.vue'
 import { useAuthStore } from '@/stores/useAuthStore'
 
diff --git a/apps/app/src/stories/v2/AppDialog.stories.ts b/apps/app/src/components-v2/shared/AppDialog.stories.ts
similarity index 100%
rename from apps/app/src/stories/v2/AppDialog.stories.ts
rename to apps/app/src/components-v2/shared/AppDialog.stories.ts