diff --git a/packages/extension/src/entrypoints/sidepanel/components/ConfigPanel.tsx b/packages/extension/src/components/ConfigPanel.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/ConfigPanel.tsx
rename to packages/extension/src/components/ConfigPanel.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/components/ErrorBoundary.tsx b/packages/extension/src/components/ErrorBoundary.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/ErrorBoundary.tsx
rename to packages/extension/src/components/ErrorBoundary.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/components/HistoryDetail.tsx b/packages/extension/src/components/HistoryDetail.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/HistoryDetail.tsx
rename to packages/extension/src/components/HistoryDetail.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/components/HistoryList.tsx b/packages/extension/src/components/HistoryList.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/HistoryList.tsx
rename to packages/extension/src/components/HistoryList.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/components/cards.tsx b/packages/extension/src/components/cards.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/cards.tsx
rename to packages/extension/src/components/cards.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/components/misc.tsx b/packages/extension/src/components/misc.tsx
similarity index 100%
rename from packages/extension/src/entrypoints/sidepanel/components/misc.tsx
rename to packages/extension/src/components/misc.tsx
diff --git a/packages/extension/src/entrypoints/sidepanel/App.tsx b/packages/extension/src/entrypoints/sidepanel/App.tsx
index e89b688..db02f53 100644
--- a/packages/extension/src/entrypoints/sidepanel/App.tsx
+++ b/packages/extension/src/entrypoints/sidepanel/App.tsx
@@ -1,6 +1,11 @@
 import { History, Send, Settings, Square } from 'lucide-react'
 import { useCallback, useEffect, useRef, useState } from 'react'
 
+import { ConfigPanel } from '@/components/ConfigPanel'
+import { HistoryDetail } from '@/components/HistoryDetail'
+import { HistoryList } from '@/components/HistoryList'
+import { ActivityCard, EventCard } from '@/components/cards'
+import { EmptyState, Logo, MotionOverlay, StatusDot } from '@/components/misc'
 import { Button } from '@/components/ui/button'
 import {
 	InputGroup,
@@ -11,11 +16,6 @@ import {
 import { saveSession } from '@/lib/db'
 
 import { useAgent } from '../../agent/useAgent'
-import { ConfigPanel } from './components/ConfigPanel'
-import { HistoryDetail } from './components/HistoryDetail'
-import { HistoryList } from './components/HistoryList'
-import { ActivityCard, EventCard } from './components/cards'
-import { EmptyState, Logo, MotionOverlay, StatusDot } from './components/misc'
 
 type View =
 	| { name: 'chat' }
diff --git a/packages/extension/src/entrypoints/sidepanel/main.tsx b/packages/extension/src/entrypoints/sidepanel/main.tsx
index 26e365d..05f158b 100644
--- a/packages/extension/src/entrypoints/sidepanel/main.tsx
+++ b/packages/extension/src/entrypoints/sidepanel/main.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 
+import { ErrorBoundary } from '@/components/ErrorBoundary'
+
 import App from './App'
-import { ErrorBoundary } from './components/ErrorBoundary'
 
 import '@/assets/index.css'