diff --git a/src/components/MediaDevicesSelector.vue b/src/components/MediaSettings/MediaDevicesSelector.vue
similarity index 97%
rename from src/components/MediaDevicesSelector.vue
rename to src/components/MediaSettings/MediaDevicesSelector.vue
index f1328be4ed9..e2ab86af623 100644
--- a/src/components/MediaDevicesSelector.vue
+++ b/src/components/MediaSettings/MediaDevicesSelector.vue
@@ -1,7 +1,7 @@
 <!--
-  - @copyright Copyright (c) 2020, Daniel Calviño Sánchez (danxuliu@gmail.com)
+  - @copyright Copyright (c) 2020 Daniel Calviño Sánchez (danxuliu@gmail.com)
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
index 4464869e006..790a5f7ba6f 100644
--- a/src/components/MediaSettings/MediaSettings.vue
+++ b/src/components/MediaSettings/MediaSettings.vue
@@ -221,10 +221,10 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
+import MediaDevicesSelector from './MediaDevicesSelector.vue'
 import VideoBackgroundEditor from './VideoBackgroundEditor.vue'
 import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 import VideoBackground from '../CallView/shared/VideoBackground.vue'
-import MediaDevicesSelector from '../MediaDevicesSelector.vue'
 import CallButton from '../TopBar/CallButton.vue'
 import VolumeIndicator from '../VolumeIndicator/VolumeIndicator.vue'
 
diff --git a/src/components/MediaDevicesPreview.vue b/src/components/SettingsDialog/MediaDevicesPreview.vue
similarity index 95%
rename from src/components/MediaDevicesPreview.vue
rename to src/components/SettingsDialog/MediaDevicesPreview.vue
index da785afe028..c4ea73ddd25 100644
--- a/src/components/MediaDevicesPreview.vue
+++ b/src/components/SettingsDialog/MediaDevicesPreview.vue
@@ -1,7 +1,7 @@
 <!--
-  - @copyright Copyright (c) 2020, Daniel Calviño Sánchez (danxuliu@gmail.com)
+  - @copyright Copyright (c) 2020 Daniel Calviño Sánchez (danxuliu@gmail.com)
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -86,10 +86,10 @@ import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
 import MicrophoneOff from 'vue-material-design-icons/MicrophoneOff.vue'
 import VideoOff from 'vue-material-design-icons/VideoOff.vue'
 
-import MediaDevicesSelector from './MediaDevicesSelector.vue'
-import VolumeIndicator from './VolumeIndicator/VolumeIndicator.vue'
+import MediaDevicesSelector from '../MediaSettings/MediaDevicesSelector.vue'
+import VolumeIndicator from '../VolumeIndicator/VolumeIndicator.vue'
 
-import { useDevices } from '../composables/useDevices.js'
+import { useDevices } from '../../composables/useDevices.js'
 
 export default {
 
diff --git a/src/components/SettingsDialog/SettingsDialog.vue b/src/components/SettingsDialog/SettingsDialog.vue
index 03b868718c5..725330f381a 100644
--- a/src/components/SettingsDialog/SettingsDialog.vue
+++ b/src/components/SettingsDialog/SettingsDialog.vue
@@ -191,7 +191,7 @@ import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSe
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
-import MediaDevicesPreview from '../MediaDevicesPreview.vue'
+import MediaDevicesPreview from './MediaDevicesPreview.vue'
 
 import { PRIVACY } from '../../constants.js'
 import BrowserStorage from '../../services/BrowserStorage.js'