diff --git a/src/components/FileSelector.jsx b/src/components/FileSelector/LocalFileSelector.jsx
similarity index 100%
rename from src/components/FileSelector.jsx
rename to src/components/FileSelector/LocalFileSelector.jsx
diff --git a/src/components/URLSelector.jsx b/src/components/FileSelector/TargetURLSelector.jsx
similarity index 100%
rename from src/components/URLSelector.jsx
rename to src/components/FileSelector/TargetURLSelector.jsx
diff --git a/src/components/player/InputBox.jsx b/src/components/Player/InputBox.jsx
similarity index 100%
rename from src/components/player/InputBox.jsx
rename to src/components/Player/InputBox.jsx
diff --git a/src/components/player/Player.jsx b/src/components/Player/Player.jsx
similarity index 100%
rename from src/components/player/Player.jsx
rename to src/components/Player/Player.jsx
diff --git a/src/components/player/TextBuffer.jsx b/src/components/Player/TextBuffer.jsx
similarity index 100%
rename from src/components/player/TextBuffer.jsx
rename to src/components/Player/TextBuffer.jsx
diff --git a/src/components/player/TextMessage.jsx b/src/components/Player/TextMessage.jsx
similarity index 100%
rename from src/components/player/TextMessage.jsx
rename to src/components/Player/TextMessage.jsx
diff --git a/src/components/player/UrlPlayer.jsx b/src/components/Player/UrlPlayer.jsx
similarity index 100%
rename from src/components/player/UrlPlayer.jsx
rename to src/components/Player/UrlPlayer.jsx
diff --git a/src/components/player/common/engines.js b/src/components/Player/common/engines.js
similarity index 100%
rename from src/components/player/common/engines.js
rename to src/components/Player/common/engines.js
diff --git a/src/components/player/common/if.js b/src/components/Player/common/if.js
similarity index 100%
rename from src/components/player/common/if.js
rename to src/components/Player/common/if.js
diff --git a/src/components/player/player.css b/src/components/Player/player.css
similarity index 100%
rename from src/components/player/player.css
rename to src/components/Player/player.css
diff --git a/src/components/ThemeSelector.jsx b/src/components/ThemeSelector/ThemeSelector.jsx
similarity index 100%
rename from src/components/ThemeSelector.jsx
rename to src/components/ThemeSelector/ThemeSelector.jsx
diff --git a/src/views/HomeView.jsx b/src/views/HomeView.jsx
index 8c646c8..eff123b 100644
--- a/src/views/HomeView.jsx
+++ b/src/views/HomeView.jsx
@@ -1,14 +1,16 @@
 import { h } from 'preact'
 import { useState } from 'preact/hooks'
-
 import { Link } from 'wouter-preact'
 
-import FileSelector from '~/src/components/FileSelector'
-import URLSelector from '~/src/components/URLSelector'
-import ThemeSelector from '~/src/components/ThemeSelector'
-
 import { buildPlayLinkHref } from '~/src/utils/utils.routing'
 
+import LocalFileSelector from
+  '~/src/components/FileSelector/LocalFileSelector'
+import TargetURLSelector from
+  '~/src/components/FileSelector/TargetURLSelector'
+import ThemeSelector from
+  '~/src/components/ThemeSelector/ThemeSelector'
+
 import '~/src/style/views/HomeView.css'
 
 const playButton = (name, url, theme) => (
@@ -100,7 +102,7 @@ export default function ({ themeEngine }) {
         <p>
           <label>
             Local file: <br />
-            <FileSelector {...{
+            <LocalFileSelector {...{
               setTargetName,
               setTargetUrl
             }} />
@@ -110,7 +112,7 @@ export default function ({ themeEngine }) {
         <p>
           <label>
             Direct link: <br />
-            <URLSelector {...{
+            <TargetURLSelector {...{
               setTargetName,
               setTargetUrl
             }} />
diff --git a/src/views/PlayerView.jsx b/src/views/PlayerView.jsx
index 3299ee6..c543d47 100644
--- a/src/views/PlayerView.jsx
+++ b/src/views/PlayerView.jsx
@@ -1,7 +1,7 @@
 import { h } from 'preact'
 import { useState, useEffect } from 'preact/hooks'
 
-import UrlPlayer from '~/src/components/player/UrlPlayer'
+import UrlPlayer from '~/src/components/Player/UrlPlayer'
 
 import '~/src/style/views/PlayerView.css'