diff --git a/src/frontend/src/features/rooms/livekit/prefabs/Chat.tsx b/src/frontend/src/features/chat/components/Chat.tsx
similarity index 97%
rename from src/frontend/src/features/rooms/livekit/prefabs/Chat.tsx
rename to src/frontend/src/features/chat/components/Chat.tsx
index 59be9156..8cc37983 100644
--- a/src/frontend/src/features/rooms/livekit/prefabs/Chat.tsx
+++ b/src/frontend/src/features/chat/components/Chat.tsx
@@ -16,9 +16,8 @@ import { useTranslation } from 'react-i18next'
 import { useSnapshot } from 'valtio'
 import { chatStore } from '@/stores/chat'
 import { Div, Text } from '@/primitives'
-import { ChatInput } from '../components/chat/Input'
-import { ChatEntry } from '../components/chat/Entry'
-import { useSidePanel } from '../hooks/useSidePanel'
+import { ChatInput } from './Input'
+import { ChatEntry } from './Entry'
 import {
   type LocalParticipant,
   type RemoteParticipant,
@@ -26,6 +25,7 @@ import {
 } from 'livekit-client'
 import { css } from '@/styled-system/css'
 import { useRestoreFocus } from '@/hooks/useRestoreFocus'
+import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
 
 export interface ChatProps
   extends React.HTMLAttributes<HTMLDivElement>, ChatOptions {}
diff --git a/src/frontend/src/features/rooms/livekit/components/chat/Entry.tsx b/src/frontend/src/features/chat/components/Entry.tsx
similarity index 100%
rename from src/frontend/src/features/rooms/livekit/components/chat/Entry.tsx
rename to src/frontend/src/features/chat/components/Entry.tsx
diff --git a/src/frontend/src/features/rooms/livekit/components/chat/Input.tsx b/src/frontend/src/features/chat/components/Input.tsx
similarity index 100%
rename from src/frontend/src/features/rooms/livekit/components/chat/Input.tsx
rename to src/frontend/src/features/chat/components/Input.tsx
diff --git a/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx b/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
index 444aa927..716b453e 100644
--- a/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/SidePanel.tsx
@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next'
 import { ParticipantsList } from './controls/Participants/ParticipantsList'
 import { PanelId, useSidePanel } from '../hooks/useSidePanel'
 import React, { ReactNode, useCallback, useRef } from 'react'
-import { Chat } from '../prefabs/Chat'
+import { Chat } from '@/features/chat/components/Chat'
 import { Effects } from './effects/Effects'
 import { Admin } from './Admin'
 import { Tools } from './Tools'