diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98456b13f..d45ca4321 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,7 +353,7 @@ if(SUBSURFACE_MOBILE)
 		subsurface-mobile-helper.cpp
 	)
 	add_definitions(-DSUBSURFACE_MOBILE)
-	qt5_add_resources(MOBILE_RESOURCES qt-mobile/mobile-resources.qrc)
+	qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc)
 	if(ANDROID)
 		add_library(subsurface-mobile SHARED ${MOBILE_SRC} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})
 	else()
diff --git a/qt-mobile/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
similarity index 100%
rename from qt-mobile/DiveDetails.qml
rename to qt-mobile/qml/DiveDetails.qml
diff --git a/qt-mobile/DiveList.qml b/qt-mobile/qml/DiveList.qml
similarity index 100%
rename from qt-mobile/DiveList.qml
rename to qt-mobile/qml/DiveList.qml
diff --git a/qt-mobile/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml
similarity index 100%
rename from qt-mobile/DownloadFromDiveComputer.qml
rename to qt-mobile/qml/DownloadFromDiveComputer.qml
diff --git a/qt-mobile/Log.qml b/qt-mobile/qml/Log.qml
similarity index 100%
rename from qt-mobile/Log.qml
rename to qt-mobile/qml/Log.qml
diff --git a/qt-mobile/Preferences.qml b/qt-mobile/qml/Preferences.qml
similarity index 100%
rename from qt-mobile/Preferences.qml
rename to qt-mobile/qml/Preferences.qml
diff --git a/qt-mobile/TextButton.qml b/qt-mobile/qml/TextButton.qml
similarity index 100%
rename from qt-mobile/TextButton.qml
rename to qt-mobile/qml/TextButton.qml
diff --git a/qt-mobile/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml
similarity index 100%
rename from qt-mobile/ThemeTest.qml
rename to qt-mobile/qml/ThemeTest.qml
diff --git a/qt-mobile/TopBar.qml b/qt-mobile/qml/TopBar.qml
similarity index 100%
rename from qt-mobile/TopBar.qml
rename to qt-mobile/qml/TopBar.qml
diff --git a/qt-mobile/Label.qml b/qt-mobile/qml/components/Label.qml
similarity index 100%
rename from qt-mobile/Label.qml
rename to qt-mobile/qml/components/Label.qml
diff --git a/qt-mobile/main.qml b/qt-mobile/qml/main.qml
similarity index 100%
rename from qt-mobile/main.qml
rename to qt-mobile/qml/main.qml
diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc
similarity index 79%
rename from qt-mobile/mobile-resources.qrc
rename to qt-mobile/qml/mobile-resources.qrc
index e331288f8..42a89bd21 100644
--- a/qt-mobile/mobile-resources.qrc
+++ b/qt-mobile/qml/mobile-resources.qrc
@@ -9,8 +9,8 @@
         <file>Log.qml</file>
         <file>TopBar.qml</file>
         <file>ThemeTest.qml</file>
-        <file>Label.qml</file>
-        <file alias="subsurface-mobile-icon.png">../icons/subsurface-mobile-icon.png</file>
+        <file alias="Label.qml">components/Label.qml</file>
+        <file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
     </qresource>
     <qresource prefix="/qml/theme">
         <file alias="Theme.qml">theme/Theme.qml</file>
diff --git a/qt-mobile/theme/Theme.qml b/qt-mobile/qml/theme/Theme.qml
similarity index 100%
rename from qt-mobile/theme/Theme.qml
rename to qt-mobile/qml/theme/Theme.qml
diff --git a/qt-mobile/theme/Units.qml b/qt-mobile/qml/theme/Units.qml
similarity index 100%
rename from qt-mobile/theme/Units.qml
rename to qt-mobile/qml/theme/Units.qml
diff --git a/qt-mobile/theme/qmldir b/qt-mobile/qml/theme/qmldir
similarity index 100%
rename from qt-mobile/theme/qmldir
rename to qt-mobile/qml/theme/qmldir