diff --git a/src/frontend/src/features/rooms/components/join/ToggleDevice.tsx b/src/frontend/src/features/rooms/components/join/ToggleDevice.tsx
index 9950c0aa..cc4861ba 100644
--- a/src/frontend/src/features/rooms/components/join/ToggleDevice.tsx
+++ b/src/frontend/src/features/rooms/components/join/ToggleDevice.tsx
@@ -1,5 +1,5 @@
 import { UseTrackToggleProps } from '@livekit/components-react'
-import { ToggleDevice as BaseToggleDevice } from '../../livekit/components/controls/ToggleDevice'
+import { ToggleDevice as BaseToggleDevice } from '../../livekit/components/controls/Device/ToggleDevice'
 import {
   TOGGLE_DEVICE_CONFIG,
   ToggleSource,
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Device/AudioDevicesControl.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Device/AudioDevicesControl.tsx
index efb8d3c5..f9a055c5 100644
--- a/src/frontend/src/features/rooms/livekit/components/controls/Device/AudioDevicesControl.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/controls/Device/AudioDevicesControl.tsx
@@ -4,7 +4,7 @@ import { Button, Popover } from '@/primitives'
 import { RiArrowUpSLine, RiMicLine, RiMicOffLine } from '@remixicon/react'
 import { Track } from 'livekit-client'
 
-import { ToggleDevice } from '@/features/rooms/livekit/components/controls/ToggleDevice.tsx'
+import { ToggleDevice } from './ToggleDevice'
 import { css } from '@/styled-system/css'
 import { usePersistentUserChoices } from '../../../hooks/usePersistentUserChoices'
 import { useCannotUseDevice } from '../../../hooks/useCannotUseDevice'
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/PermissionNeededButton.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Device/PermissionNeededButton.tsx
similarity index 100%
rename from src/frontend/src/features/rooms/livekit/components/controls/PermissionNeededButton.tsx
rename to src/frontend/src/features/rooms/livekit/components/controls/Device/PermissionNeededButton.tsx
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Device/ToggleDevice.tsx
similarity index 95%
rename from src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx
rename to src/frontend/src/features/rooms/livekit/components/controls/Device/ToggleDevice.tsx
index e8e9dd96..8b3467d0 100644
--- a/src/frontend/src/features/rooms/livekit/components/controls/ToggleDevice.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/controls/Device/ToggleDevice.tsx
@@ -14,8 +14,8 @@ import {
 import { ButtonRecipeProps } from '@/primitives/buttonRecipe'
 import { ToggleButtonProps } from '@/primitives/ToggleButton'
 import { openPermissionsDialog } from '@/stores/permissions'
-import { ToggleDeviceConfig } from '../../config/ToggleDeviceConfig'
-import { useCannotUseDevice } from '../../hooks/useCannotUseDevice'
+import { ToggleDeviceConfig } from '../../../config/ToggleDeviceConfig'
+import { useCannotUseDevice } from '../../../hooks/useCannotUseDevice'
 
 export type ToggleDeviceProps = {
   enabled: boolean
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx
index 5d325b62..892b21a9 100644
--- a/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx
@@ -4,7 +4,7 @@ import { Button, Popover } from '@/primitives'
 import { RiArrowUpSLine, RiVideoOffLine, RiVideoOnLine } from '@remixicon/react'
 import { Track, VideoCaptureOptions } from 'livekit-client'
 
-import { ToggleDevice } from '@/features/rooms/livekit/components/controls/ToggleDevice'
+import { ToggleDevice } from './ToggleDevice'
 import { css } from '@/styled-system/css'
 import { usePersistentUserChoices } from '../../../hooks/usePersistentUserChoices'
 import { useCannotUseDevice } from '../../../hooks/useCannotUseDevice'