diff --git a/app/w/components/toolbar-block/toolbar-block.tsx b/app/w/components/toolbar/components/toolbar-block/toolbar-block.tsx
similarity index 94%
rename from app/w/components/toolbar-block/toolbar-block.tsx
rename to app/w/components/toolbar/components/toolbar-block/toolbar-block.tsx
index 865f63fcf5..fe80719864 100644
--- a/app/w/components/toolbar-block/toolbar-block.tsx
+++ b/app/w/components/toolbar/components/toolbar-block/toolbar-block.tsx
@@ -1,4 +1,4 @@
-import type { BlockConfig } from '../../../../blocks/types'
+import type { BlockConfig } from '../../../../../../blocks/types'
 
 export type ToolbarBlockProps = {
   config: BlockConfig
diff --git a/app/w/components/toolbar/components/toolbar-tabs.tsx b/app/w/components/toolbar/components/toolbar-tabs/toolbar-tabs.tsx
similarity index 100%
rename from app/w/components/toolbar/components/toolbar-tabs.tsx
rename to app/w/components/toolbar/components/toolbar-tabs/toolbar-tabs.tsx
diff --git a/app/w/components/toolbar/toolbar.tsx b/app/w/components/toolbar/toolbar.tsx
index 1f3aac6fc5..70fbce9a0e 100644
--- a/app/w/components/toolbar/toolbar.tsx
+++ b/app/w/components/toolbar/toolbar.tsx
@@ -1,8 +1,8 @@
 'use client'
 
 import { useState } from 'react'
-import { ToolbarTabs } from './components/toolbar-tabs'
-import { ToolbarBlock } from '../toolbar-block/toolbar-block'
+import { ToolbarTabs } from './components/toolbar-tabs/toolbar-tabs'
+import { ToolbarBlock } from './components/toolbar-block/toolbar-block'
 import { getBlocksByCategory } from '../../../../blocks'
 import { BlockCategory } from '../../../../blocks/types'