diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 43d54eff1..6353703b5 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -84,8 +84,6 @@ if (HAVE_QT)
         TimeSettings.qml
         ViewSettings.qml
         Weather.qml
-        AircraftList.qml
-        Scrollbar.qml
         )
 
     add_library(fglauncher QtLauncher.cxx
diff --git a/src/GUI/LauncherMainWindow.cxx b/src/GUI/LauncherMainWindow.cxx
index c2b9a7a8c..7252fa783 100644
--- a/src/GUI/LauncherMainWindow.cxx
+++ b/src/GUI/LauncherMainWindow.cxx
@@ -155,7 +155,7 @@ LauncherMainWindow::LauncherMainWindow() :
     m_ui->aircraftList->engine()->rootContext()->setContextProperty("_launcher", this);
     m_ui->aircraftList->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
 
-    m_ui->aircraftList->setSource(QUrl("qrc:///AircraftList.qml"));
+    m_ui->aircraftList->setSource(QUrl("qrc:///qml/AircraftList.qml"));
 
     connect(m_aircraftModel, &AircraftItemModel::aircraftInstallCompleted,
             this, &LauncherMainWindow::onAircraftInstalledCompleted);
diff --git a/src/GUI/AircraftCompactDelegate.qml b/src/GUI/qml/AircraftCompactDelegate.qml
similarity index 100%
rename from src/GUI/AircraftCompactDelegate.qml
rename to src/GUI/qml/AircraftCompactDelegate.qml
diff --git a/src/GUI/AircraftDetailsView.qml b/src/GUI/qml/AircraftDetailsView.qml
similarity index 100%
rename from src/GUI/AircraftDetailsView.qml
rename to src/GUI/qml/AircraftDetailsView.qml
diff --git a/src/GUI/AircraftDownloadPanel.qml b/src/GUI/qml/AircraftDownloadPanel.qml
similarity index 100%
rename from src/GUI/AircraftDownloadPanel.qml
rename to src/GUI/qml/AircraftDownloadPanel.qml
diff --git a/src/GUI/AircraftFullDelegate.qml b/src/GUI/qml/AircraftFullDelegate.qml
similarity index 100%
rename from src/GUI/AircraftFullDelegate.qml
rename to src/GUI/qml/AircraftFullDelegate.qml
diff --git a/src/GUI/AircraftList.qml b/src/GUI/qml/AircraftList.qml
similarity index 100%
rename from src/GUI/AircraftList.qml
rename to src/GUI/qml/AircraftList.qml
diff --git a/src/GUI/AircraftPreviewPanel.qml b/src/GUI/qml/AircraftPreviewPanel.qml
similarity index 100%
rename from src/GUI/AircraftPreviewPanel.qml
rename to src/GUI/qml/AircraftPreviewPanel.qml
diff --git a/src/GUI/AircraftRating.qml b/src/GUI/qml/AircraftRating.qml
similarity index 100%
rename from src/GUI/AircraftRating.qml
rename to src/GUI/qml/AircraftRating.qml
diff --git a/src/GUI/AircraftRatingsPanel.qml b/src/GUI/qml/AircraftRatingsPanel.qml
similarity index 100%
rename from src/GUI/AircraftRatingsPanel.qml
rename to src/GUI/qml/AircraftRatingsPanel.qml
diff --git a/src/GUI/AircraftVariantChoice.qml b/src/GUI/qml/AircraftVariantChoice.qml
similarity index 100%
rename from src/GUI/AircraftVariantChoice.qml
rename to src/GUI/qml/AircraftVariantChoice.qml
diff --git a/src/GUI/AircraftWarningPanel.qml b/src/GUI/qml/AircraftWarningPanel.qml
similarity index 100%
rename from src/GUI/AircraftWarningPanel.qml
rename to src/GUI/qml/AircraftWarningPanel.qml
diff --git a/src/GUI/ArrowButton.qml b/src/GUI/qml/ArrowButton.qml
similarity index 100%
rename from src/GUI/ArrowButton.qml
rename to src/GUI/qml/ArrowButton.qml
diff --git a/src/GUI/Button.qml b/src/GUI/qml/Button.qml
similarity index 100%
rename from src/GUI/Button.qml
rename to src/GUI/qml/Button.qml
diff --git a/src/GUI/Checkbox.qml b/src/GUI/qml/Checkbox.qml
similarity index 100%
rename from src/GUI/Checkbox.qml
rename to src/GUI/qml/Checkbox.qml
diff --git a/src/GUI/ClickableText.qml b/src/GUI/qml/ClickableText.qml
similarity index 100%
rename from src/GUI/ClickableText.qml
rename to src/GUI/qml/ClickableText.qml
diff --git a/src/GUI/ListHeaderBox.qml b/src/GUI/qml/ListHeaderBox.qml
similarity index 100%
rename from src/GUI/ListHeaderBox.qml
rename to src/GUI/qml/ListHeaderBox.qml
diff --git a/src/GUI/NoDefaultCatalogPanel.qml b/src/GUI/qml/NoDefaultCatalogPanel.qml
similarity index 100%
rename from src/GUI/NoDefaultCatalogPanel.qml
rename to src/GUI/qml/NoDefaultCatalogPanel.qml
diff --git a/src/GUI/PopupChoice.qml b/src/GUI/qml/PopupChoice.qml
similarity index 100%
rename from src/GUI/PopupChoice.qml
rename to src/GUI/qml/PopupChoice.qml
diff --git a/src/GUI/RatingSlider.qml b/src/GUI/qml/RatingSlider.qml
similarity index 100%
rename from src/GUI/RatingSlider.qml
rename to src/GUI/qml/RatingSlider.qml
diff --git a/src/GUI/Scrollbar.qml b/src/GUI/qml/Scrollbar.qml
similarity index 100%
rename from src/GUI/Scrollbar.qml
rename to src/GUI/qml/Scrollbar.qml
diff --git a/src/GUI/SearchButton.qml b/src/GUI/qml/SearchButton.qml
similarity index 100%
rename from src/GUI/SearchButton.qml
rename to src/GUI/qml/SearchButton.qml
diff --git a/src/GUI/Slider.qml b/src/GUI/qml/Slider.qml
similarity index 100%
rename from src/GUI/Slider.qml
rename to src/GUI/qml/Slider.qml
diff --git a/src/GUI/Style.qml b/src/GUI/qml/Style.qml
similarity index 100%
rename from src/GUI/Style.qml
rename to src/GUI/qml/Style.qml
diff --git a/src/GUI/TabButton.qml b/src/GUI/qml/TabButton.qml
similarity index 100%
rename from src/GUI/TabButton.qml
rename to src/GUI/qml/TabButton.qml
diff --git a/src/GUI/ToggleSwitch.qml b/src/GUI/qml/ToggleSwitch.qml
similarity index 100%
rename from src/GUI/ToggleSwitch.qml
rename to src/GUI/qml/ToggleSwitch.qml
diff --git a/src/GUI/UpdateAllPanel.qml b/src/GUI/qml/UpdateAllPanel.qml
similarity index 100%
rename from src/GUI/UpdateAllPanel.qml
rename to src/GUI/qml/UpdateAllPanel.qml
diff --git a/src/GUI/qmldir b/src/GUI/qml/qmldir
similarity index 100%
rename from src/GUI/qmldir
rename to src/GUI/qml/qmldir
diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc
index f0d93bd4b..327776167 100644
--- a/src/GUI/resources.qrc
+++ b/src/GUI/resources.qrc
@@ -28,34 +28,34 @@
         <file alias="toolbox-settings">toolbox-settings.png</file>
         <file alias="toolbox-summary">toolbox-summary.png</file>
         <file alias="toolbox-addons">toolbox-addons.png</file>
-        <file>AircraftList.qml</file>
-        <file>AircraftRating.qml</file>
-        <file>ArrowButton.qml</file>
-        <file>AircraftDownloadPanel.qml</file>
-        <file>Button.qml</file>
-        <file>AircraftWarningPanel.qml</file>
-        <file>Scrollbar.qml</file>
-        <file>AircraftDetailsView.qml</file>
-        <file>AircraftFullDelegate.qml</file>
-        <file>AircraftCompactDelegate.qml</file>
-        <file>SearchButton.qml</file>
-        <file>AircraftPreviewPanel.qml</file>
-        <file>TabButton.qml</file>
-        <file>Checkbox.qml</file>
-        <file>Slider.qml</file>
-        <file>ToggleSwitch.qml</file>
-        <file>RatingSlider.qml</file>
-        <file>PopupChoice.qml</file>
+        <file>qml/AircraftList.qml</file>
+        <file>qml/AircraftRating.qml</file>
+        <file>qml/ArrowButton.qml</file>
+        <file>qml/AircraftDownloadPanel.qml</file>
+        <file>qml/Button.qml</file>
+        <file>qml/AircraftWarningPanel.qml</file>
+        <file>qml/Scrollbar.qml</file>
+        <file>qml/AircraftDetailsView.qml</file>
+        <file>qml/AircraftFullDelegate.qml</file>
+        <file>qml/AircraftCompactDelegate.qml</file>
+        <file>qml/SearchButton.qml</file>
+        <file>qml/AircraftPreviewPanel.qml</file>
+        <file>qml/TabButton.qml</file>
+        <file>qml/Checkbox.qml</file>
+        <file>qml/Slider.qml</file>
+        <file>qml/ToggleSwitch.qml</file>
+        <file>qml/RatingSlider.qml</file>
+        <file>qml/PopupChoice.qml</file>
         <file alias="up-down-arrow">up-down-arrow.png</file>
-        <file>AircraftVariantChoice.qml</file>
+        <file>qml/AircraftVariantChoice.qml</file>
         <file alias="search-icon-small">search-icon-small.png</file>
-        <file>AircraftRatingsPanel.qml</file>
-        <file>NoDefaultCatalogPanel.qml</file>
-        <file>ListHeaderBox.qml</file>
-        <file>UpdateAllPanel.qml</file>
-        <file>Style.qml</file>
-        <file>qmldir</file>
-        <file>ClickableText.qml</file>
+        <file>qml/AircraftRatingsPanel.qml</file>
+        <file>qml/NoDefaultCatalogPanel.qml</file>
+        <file>qml/ListHeaderBox.qml</file>
+        <file>qml/UpdateAllPanel.qml</file>
+        <file>qml/Style.qml</file>
+        <file>qml/qmldir</file>
+        <file>qml/ClickableText.qml</file>
     </qresource>
     <qresource prefix="/preview">
         <file alias="close-icon">preview-close.png</file>