diff --git a/PrinterApplication.py b/PrinterApplication.py
index b835baa41b..6cfc41bd68 100644
--- a/PrinterApplication.py
+++ b/PrinterApplication.py
@@ -57,7 +57,7 @@ class PrinterApplication(QtApplication):
         self._plugin_registry.loadPlugins({ "type": "tool" })
 
         self._plugin_registry.loadPlugin('CuraEngineBackend')
-    
+
     def run(self):
         self.showSplashMessage('Setting up scene...')
 
@@ -95,7 +95,7 @@ class PrinterApplication(QtApplication):
 
         self.showSplashMessage('Loading interface...')
 
-        self.setMainQml(os.path.dirname(__file__) + "/Printer.qml")
+        self.setMainQml(os.path.dirname(__file__) + "/qml/Printer.qml")
         self.initializeEngine()
 
         self.getStorageDevice('LocalFileStorage').removableDrivesChanged.connect(self._removableDrivesChanged)
diff --git a/AddMachineWizard.qml b/qml/AddMachineWizard.qml
similarity index 100%
rename from AddMachineWizard.qml
rename to qml/AddMachineWizard.qml
diff --git a/DescriptionPane.qml b/qml/DescriptionPane.qml
similarity index 100%
rename from DescriptionPane.qml
rename to qml/DescriptionPane.qml
diff --git a/FilePane.qml b/qml/FilePane.qml
similarity index 100%
rename from FilePane.qml
rename to qml/FilePane.qml
diff --git a/OutputGCodeButton.qml b/qml/OutputGCodeButton.qml
similarity index 100%
rename from OutputGCodeButton.qml
rename to qml/OutputGCodeButton.qml
diff --git a/Printer.qml b/qml/Printer.qml
similarity index 100%
rename from Printer.qml
rename to qml/Printer.qml
diff --git a/PrinterActions.qml b/qml/PrinterActions.qml
similarity index 100%
rename from PrinterActions.qml
rename to qml/PrinterActions.qml
diff --git a/PrinterToolbar.qml b/qml/PrinterToolbar.qml
similarity index 100%
rename from PrinterToolbar.qml
rename to qml/PrinterToolbar.qml
diff --git a/SettingsPane.qml b/qml/SettingsPane.qml
similarity index 100%
rename from SettingsPane.qml
rename to qml/SettingsPane.qml
diff --git a/ViewPage.qml b/qml/ViewPage.qml
similarity index 100%
rename from ViewPage.qml
rename to qml/ViewPage.qml