diff --git a/build.rs b/build.rs
index 2fefd4d..fce6777 100644
--- a/build.rs
+++ b/build.rs
@@ -2,21 +2,21 @@ use cxx_qt_build::{CxxQtBuilder, QmlModule};
 
 fn main() {
     CxxQtBuilder::new_qml_module(QmlModule::new("clide.module").qml_files(&[
-        "qml/main.qml",
-        "qml/ClideAboutWindow.qml",
-        "qml/ClideTreeView.qml",
         "qml/ClideApplicationView.qml",
-        "qml/ClideExplorerView.qml",
-        "qml/ClideEditor.qml",
         "qml/ClideEditorView.qml",
-        "qml/ClideMenuBar.qml",
-        "qml/ClideLogger.qml",
-        "qml/Components/ClideScrollBar.qml",
-        "qml/Components/ClideHandle.qml",
-        "qml/Components/ClideMenu.qml",
-        "qml/Components/ClideMenuItem.qml",
+        "qml/ClideExplorerView.qml",
+        "qml/ClideTreeView.qml",
+        "qml/Components/ClideAboutWindow.qml",
         "qml/Components/ClideBreadCrumbs.qml",
+        "qml/Components/ClideEditor.qml",
+        "qml/Components/ClideHandle.qml",
+        "qml/Components/ClideLogger.qml",
+        "qml/Components/ClideMenu.qml",
+        "qml/Components/ClideMenuBar.qml",
+        "qml/Components/ClideMenuItem.qml",
+        "qml/Components/ClideScrollBar.qml",
         "qml/Logger/Logger.qml",
+        "qml/main.qml",
     ]))
     // Link Qt's Network library
     // - Qt Core is always linked
diff --git a/qml/ClideAboutWindow.qml b/qml/Components/ClideAboutWindow.qml
similarity index 100%
rename from qml/ClideAboutWindow.qml
rename to qml/Components/ClideAboutWindow.qml
diff --git a/qml/ClideEditor.qml b/qml/Components/ClideEditor.qml
similarity index 100%
rename from qml/ClideEditor.qml
rename to qml/Components/ClideEditor.qml
diff --git a/qml/ClideLogger.qml b/qml/Components/ClideLogger.qml
similarity index 100%
rename from qml/ClideLogger.qml
rename to qml/Components/ClideLogger.qml
diff --git a/qml/ClideMenuBar.qml b/qml/Components/ClideMenuBar.qml
similarity index 100%
rename from qml/ClideMenuBar.qml
rename to qml/Components/ClideMenuBar.qml
diff --git a/qml/Components/qmldir b/qml/Components/qmldir
index f071afa..97b6732 100644
--- a/qml/Components/qmldir
+++ b/qml/Components/qmldir
@@ -3,3 +3,7 @@ ClideHandle ClideHandle.qml
 ClideMenu ClideMenu.qml
 ClideMenuItem ClideMenuItem.qml
 ClideBreadCrumbs ClideBreadCrumbs.qml
+ClideAboutWindow ClideAboutWindow.qml
+ClideEditor ClideEditor.qml
+ClideLogger ClideLogger.qml
+ClideMenuBar ClideMenuBar.qml