diff --git a/src/qml/MainMenu.qml b/src/qml/MainMenu.qml
index c43c55b..cead35d 100644
--- a/src/qml/MainMenu.qml
+++ b/src/qml/MainMenu.qml
@@ -8,7 +8,6 @@ import "codes.js" as LanguageCodes
 
 MenuBar {
   id: menuBar
-  //width: parent.width
   height: mainWindow.virtualHeight / 32
   function anythingOpen() {
     for (var i = 0, len = menuBar.count; i < len; i++) {
diff --git a/src/qml/UIComponents/BackwardButton.qml b/src/qml/UIComponents/Controls/BackwardButton.qml
similarity index 100%
rename from src/qml/UIComponents/BackwardButton.qml
rename to src/qml/UIComponents/Controls/BackwardButton.qml
diff --git a/src/qml/UIComponents/ForwardButton.qml b/src/qml/UIComponents/Controls/ForwardButton.qml
similarity index 100%
rename from src/qml/UIComponents/ForwardButton.qml
rename to src/qml/UIComponents/Controls/ForwardButton.qml
diff --git a/src/qml/UIComponents/FullscreenButton.qml b/src/qml/UIComponents/Controls/FullscreenButton.qml
similarity index 100%
rename from src/qml/UIComponents/FullscreenButton.qml
rename to src/qml/UIComponents/Controls/FullscreenButton.qml
diff --git a/src/qml/UIComponents/PlayPauseButton.qml b/src/qml/UIComponents/Controls/PlayPauseButton.qml
similarity index 100%
rename from src/qml/UIComponents/PlayPauseButton.qml
rename to src/qml/UIComponents/Controls/PlayPauseButton.qml
diff --git a/src/qml/UIComponents/PlaylistNextButton.qml b/src/qml/UIComponents/Controls/PlaylistNextButton.qml
similarity index 100%
rename from src/qml/UIComponents/PlaylistNextButton.qml
rename to src/qml/UIComponents/Controls/PlaylistNextButton.qml
diff --git a/src/qml/UIComponents/PlaylistPrevButton.qml b/src/qml/UIComponents/Controls/PlaylistPrevButton.qml
similarity index 100%
rename from src/qml/UIComponents/PlaylistPrevButton.qml
rename to src/qml/UIComponents/Controls/PlaylistPrevButton.qml
diff --git a/src/qml/UIComponents/SettingsButton.qml b/src/qml/UIComponents/Controls/SettingsButton.qml
similarity index 100%
rename from src/qml/UIComponents/SettingsButton.qml
rename to src/qml/UIComponents/Controls/SettingsButton.qml
diff --git a/src/qml/UIComponents/SmoothButton.qml b/src/qml/UIComponents/Controls/SmoothButton.qml
similarity index 100%
rename from src/qml/UIComponents/SmoothButton.qml
rename to src/qml/UIComponents/Controls/SmoothButton.qml
diff --git a/src/qml/UIComponents/SpeedText.qml b/src/qml/UIComponents/Controls/SpeedText.qml
similarity index 100%
rename from src/qml/UIComponents/SpeedText.qml
rename to src/qml/UIComponents/Controls/SpeedText.qml
diff --git a/src/qml/UIComponents/TimeLabel.qml b/src/qml/UIComponents/Controls/TimeLabel.qml
similarity index 100%
rename from src/qml/UIComponents/TimeLabel.qml
rename to src/qml/UIComponents/Controls/TimeLabel.qml
diff --git a/src/qml/UIComponents/VerticalVolume.qml b/src/qml/UIComponents/Controls/VerticalVolume.qml
similarity index 100%
rename from src/qml/UIComponents/VerticalVolume.qml
rename to src/qml/UIComponents/Controls/VerticalVolume.qml
diff --git a/src/qml/UIComponents/VideoProgress.qml b/src/qml/UIComponents/Controls/VideoProgress.qml
similarity index 100%
rename from src/qml/UIComponents/VideoProgress.qml
rename to src/qml/UIComponents/Controls/VideoProgress.qml
diff --git a/src/qml/UIComponents/VolumeButton.qml b/src/qml/UIComponents/Controls/VolumeButton.qml
similarity index 100%
rename from src/qml/UIComponents/VolumeButton.qml
rename to src/qml/UIComponents/Controls/VolumeButton.qml
diff --git a/src/qml/UIComponents/VolumeSlider.qml b/src/qml/UIComponents/Controls/VolumeSlider.qml
similarity index 100%
rename from src/qml/UIComponents/VolumeSlider.qml
rename to src/qml/UIComponents/Controls/VolumeSlider.qml
diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
index 261e3fa..eff501e 100644
--- a/src/qml/qml.qrc
+++ b/src/qml/qml.qrc
@@ -10,20 +10,20 @@
         <file>NiconicoButtonLayout.qml</file>
         <file>RoosterTeethButtonLayout.qml</file>
         <file alias="MenuTitleBar.qml">UIComponents/MenuTitleBar.qml</file>
-        <file alias="SmoothButton.qml">UIComponents/SmoothButton.qml</file>
-        <file alias="VerticalVolume.qml">UIComponents/VerticalVolume.qml</file>
-        <file alias="SpeedText.qml">UIComponents/SpeedText.qml</file>
-        <file alias="ForwardButton.qml">UIComponents/ForwardButton.qml</file>
-        <file alias="BackwardButton.qml">UIComponents/BackwardButton.qml</file>
-        <file alias="PlaylistPrevButton.qml">UIComponents/PlaylistPrevButton.qml</file>
-        <file alias="PlayPauseButton.qml">UIComponents/PlayPauseButton.qml</file>
-        <file alias="VideoProgress.qml">UIComponents/VideoProgress.qml</file>
-        <file alias="VolumeButton.qml">UIComponents/VolumeButton.qml</file>
-        <file alias="VolumeSlider.qml">UIComponents/VolumeSlider.qml</file>
-        <file alias="TimeLabel.qml">UIComponents/TimeLabel.qml</file>
-        <file alias="SettingsButton.qml">UIComponents/SettingsButton.qml</file>
-        <file alias="FullscreenButton.qml">UIComponents/FullscreenButton.qml</file>
-        <file alias="PlaylistNextButton.qml">UIComponents/PlaylistNextButton.qml</file>
+        <file alias="SmoothButton.qml">UIComponents/Controls/SmoothButton.qml</file>
+        <file alias="VerticalVolume.qml">UIComponents/Controls/VerticalVolume.qml</file>
+        <file alias="SpeedText.qml">UIComponents/Controls/SpeedText.qml</file>
+        <file alias="ForwardButton.qml">UIComponents/Controls/ForwardButton.qml</file>
+        <file alias="BackwardButton.qml">UIComponents/Controls/BackwardButton.qml</file>
+        <file alias="PlaylistPrevButton.qml">UIComponents/Controls/PlaylistPrevButton.qml</file>
+        <file alias="PlayPauseButton.qml">UIComponents/Controls/PlayPauseButton.qml</file>
+        <file alias="VideoProgress.qml">UIComponents/Controls/VideoProgress.qml</file>
+        <file alias="VolumeButton.qml">UIComponents/Controls/VolumeButton.qml</file>
+        <file alias="VolumeSlider.qml">UIComponents/Controls/VolumeSlider.qml</file>
+        <file alias="TimeLabel.qml">UIComponents/Controls/TimeLabel.qml</file>
+        <file alias="SettingsButton.qml">UIComponents/Controls/SettingsButton.qml</file>
+        <file alias="FullscreenButton.qml">UIComponents/Controls/FullscreenButton.qml</file>
+        <file alias="PlaylistNextButton.qml">UIComponents/Controls/PlaylistNextButton.qml</file>
         <file alias="codes.js">Utils/codes.js</file>
         <file alias="Translator.qml">Utils/Translator.qml</file>
         <file alias="translations.js">Utils/translations.js</file>