254 files changed, 572 insertions, 582 deletions

diff --git a/.gitignore b/.gitignore
index 35af50390..2c3c7d774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,4 @@ Subsurface.app
 .DS_Store
 !android/**/*.xml
 build*
-qt-mobile/qml/mobilecomponents
+mobile-widgets/qml/kirigami
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea6f17e66..cc7db1329 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,10 +115,6 @@ include_directories(.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_BINARY_DIR}
 	${CMAKE_BINARY_DIR}/desktop-widgets
-	desktop-widgets/
-	qt-models
-	desktop-widgets/profile
-	subsurface-core/
 )
 
 # Project Target specific configuration should go here,
@@ -212,7 +208,7 @@ qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc)
 
 # include translations
 add_subdirectory(translations)
-add_subdirectory(subsurface-core)
+add_subdirectory(core)
 add_subdirectory(qt-models)
 add_subdirectory(profile-widget)
 
@@ -227,12 +223,12 @@ endif()
 # create the executables
 if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
 	set(MOBILE_SRC
-		qt-mobile/qmlmanager.cpp
-		qt-mobile/qmlprofile.cpp
+		mobile-widgets/qmlmanager.cpp
+		mobile-widgets/qmlprofile.cpp
 		subsurface-mobile-main.cpp
 		subsurface-mobile-helper.cpp
 	)
-	qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc)
+	qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
 	# When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable.
 	if(ANDROID)
 		add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})
diff --git a/subsurface-core/CMakeLists.txt b/core/CMakeLists.txt
index d9b1d3421..d9b1d3421 100644
--- a/subsurface-core/CMakeLists.txt
+++ b/core/CMakeLists.txt
diff --git a/subsurface-core/android.cpp b/core/android.cpp
index 3631b07a1..3631b07a1 100644
--- a/subsurface-core/android.cpp
+++ b/core/android.cpp
diff --git a/subsurface-core/checkcloudconnection.cpp b/core/checkcloudconnection.cpp
index f29d971ba..f29d971ba 100644
--- a/subsurface-core/checkcloudconnection.cpp
+++ b/core/checkcloudconnection.cpp
diff --git a/subsurface-core/checkcloudconnection.h b/core/checkcloudconnection.h
index 58a412797..58a412797 100644
--- a/subsurface-core/checkcloudconnection.h
+++ b/core/checkcloudconnection.h
diff --git a/subsurface-core/cloudstorage.cpp b/core/cloudstorage.cpp
index 575191891..575191891 100644
--- a/subsurface-core/cloudstorage.cpp
+++ b/core/cloudstorage.cpp
diff --git a/subsurface-core/cloudstorage.h b/core/cloudstorage.h
index 6addb739d..6addb739d 100644
--- a/subsurface-core/cloudstorage.h
+++ b/core/cloudstorage.h
diff --git a/subsurface-core/cochran.c b/core/cochran.c
index b42ed8233..b42ed8233 100644
--- a/subsurface-core/cochran.c
+++ b/core/cochran.c
diff --git a/subsurface-core/cochran.h b/core/cochran.h
index 97d4361c8..97d4361c8 100644
--- a/subsurface-core/cochran.h
+++ b/core/cochran.h
diff --git a/subsurface-core/color.cpp b/core/color.cpp
index cf6f43916..cf6f43916 100644
--- a/subsurface-core/color.cpp
+++ b/core/color.cpp
diff --git a/subsurface-core/color.h b/core/color.h
index 57ad77242..57ad77242 100644
--- a/subsurface-core/color.h
+++ b/core/color.h
diff --git a/subsurface-core/compressibility.r b/core/compressibility.r
index 66310f3aa..66310f3aa 100644
--- a/subsurface-core/compressibility.r
+++ b/core/compressibility.r
diff --git a/subsurface-core/configuredivecomputer.cpp b/core/configuredivecomputer.cpp
index 2457ffe82..2457ffe82 100644
--- a/subsurface-core/configuredivecomputer.cpp
+++ b/core/configuredivecomputer.cpp
diff --git a/subsurface-core/configuredivecomputer.h b/core/configuredivecomputer.h
index f14eeeca3..f14eeeca3 100644
--- a/subsurface-core/configuredivecomputer.h
+++ b/core/configuredivecomputer.h
diff --git a/subsurface-core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp
index b229fc808..b229fc808 100644
--- a/subsurface-core/configuredivecomputerthreads.cpp
+++ b/core/configuredivecomputerthreads.cpp
diff --git a/subsurface-core/configuredivecomputerthreads.h b/core/configuredivecomputerthreads.h
index 8817d848a..8817d848a 100644
--- a/subsurface-core/configuredivecomputerthreads.h
+++ b/core/configuredivecomputerthreads.h
diff --git a/subsurface-core/datatrak.c b/core/datatrak.c
index 204ebd9b3..204ebd9b3 100644
--- a/subsurface-core/datatrak.c
+++ b/core/datatrak.c
diff --git a/subsurface-core/datatrak.h b/core/datatrak.h
index 3a37e0465..3a37e0465 100644
--- a/subsurface-core/datatrak.h
+++ b/core/datatrak.h
diff --git a/subsurface-core/deco.c b/core/deco.c
index 3cd8c4a16..af3e06126 100644
--- a/subsurface-core/deco.c
+++ b/core/deco.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "dive.h"
 #include <assert.h>
-#include <planner.h>
+#include "core/planner.h"
 
 #define cube(x) (x * x * x)
 
diff --git a/subsurface-core/deco.h b/core/deco.h
index fd3b94a9f..fd3b94a9f 100644
--- a/subsurface-core/deco.h
+++ b/core/deco.h
diff --git a/subsurface-core/device.c b/core/device.c
index 6c4452f78..6c4452f78 100644
--- a/subsurface-core/device.c
+++ b/core/device.c
diff --git a/subsurface-core/device.h b/core/device.h
index 8a00b96d3..8a00b96d3 100644
--- a/subsurface-core/device.h
+++ b/core/device.h
diff --git a/subsurface-core/devicedetails.cpp b/core/devicedetails.cpp
index a917a4d0e..a917a4d0e 100644
--- a/subsurface-core/devicedetails.cpp
+++ b/core/devicedetails.cpp
diff --git a/subsurface-core/devicedetails.h b/core/devicedetails.h
index ff3009bc5..ff3009bc5 100644
--- a/subsurface-core/devicedetails.h
+++ b/core/devicedetails.h
diff --git a/subsurface-core/display.h b/core/display.h
index 9e3e1d159..9e3e1d159 100644
--- a/subsurface-core/display.h
+++ b/core/display.h
diff --git a/subsurface-core/dive.c b/core/dive.c
index ce730da28..ce730da28 100644
--- a/subsurface-core/dive.c
+++ b/core/dive.c
diff --git a/subsurface-core/dive.h b/core/dive.h
index ae24b7409..ae24b7409 100644
--- a/subsurface-core/dive.h
+++ b/core/dive.h
diff --git a/subsurface-core/divecomputer.cpp b/core/divecomputer.cpp
index e4081e1cd..e4081e1cd 100644
--- a/subsurface-core/divecomputer.cpp
+++ b/core/divecomputer.cpp
diff --git a/subsurface-core/divecomputer.h b/core/divecomputer.h
index 98d12ab8b..98d12ab8b 100644
--- a/subsurface-core/divecomputer.h
+++ b/core/divecomputer.h
diff --git a/subsurface-core/divelist.c b/core/divelist.c
index 543d9e17b..543d9e17b 100644
--- a/subsurface-core/divelist.c
+++ b/core/divelist.c
diff --git a/subsurface-core/divelist.h b/core/divelist.h
index 5bae09cff..5bae09cff 100644
--- a/subsurface-core/divelist.h
+++ b/core/divelist.h
diff --git a/subsurface-core/divelogexportlogic.cpp b/core/divelogexportlogic.cpp
index af5157f4a..af5157f4a 100644
--- a/subsurface-core/divelogexportlogic.cpp
+++ b/core/divelogexportlogic.cpp
diff --git a/subsurface-core/divelogexportlogic.h b/core/divelogexportlogic.h
index 84f09c362..84f09c362 100644
--- a/subsurface-core/divelogexportlogic.h
+++ b/core/divelogexportlogic.h
diff --git a/subsurface-core/divesite.c b/core/divesite.c
index e9eed2a07..e9eed2a07 100644
--- a/subsurface-core/divesite.c
+++ b/core/divesite.c
diff --git a/subsurface-core/divesite.cpp b/core/divesite.cpp
index ae102a14b..ae102a14b 100644
--- a/subsurface-core/divesite.cpp
+++ b/core/divesite.cpp
diff --git a/subsurface-core/divesite.h b/core/divesite.h
index f18b2e8e8..f18b2e8e8 100644
--- a/subsurface-core/divesite.h
+++ b/core/divesite.h
diff --git a/subsurface-core/divesitehelpers.cpp b/core/divesitehelpers.cpp
index 3542f96fa..3542f96fa 100644
--- a/subsurface-core/divesitehelpers.cpp
+++ b/core/divesitehelpers.cpp
diff --git a/subsurface-core/divesitehelpers.h b/core/divesitehelpers.h
index a08069bc0..a08069bc0 100644
--- a/subsurface-core/divesitehelpers.h
+++ b/core/divesitehelpers.h
diff --git a/subsurface-core/equipment.c b/core/equipment.c
index 9f3e49039..9f3e49039 100644
--- a/subsurface-core/equipment.c
+++ b/core/equipment.c
diff --git a/subsurface-core/exif.cpp b/core/exif.cpp
index 0b1cda2bc..0b1cda2bc 100644
--- a/subsurface-core/exif.cpp
+++ b/core/exif.cpp
diff --git a/subsurface-core/exif.h b/core/exif.h
index 0fb3a7d4a..0fb3a7d4a 100644
--- a/subsurface-core/exif.h
+++ b/core/exif.h
diff --git a/subsurface-core/file.c b/core/file.c
index 1337da3a2..1337da3a2 100644
--- a/subsurface-core/file.c
+++ b/core/file.c
diff --git a/subsurface-core/file.h b/core/file.h
index 1c1dfc116..1c1dfc116 100644
--- a/subsurface-core/file.h
+++ b/core/file.h
diff --git a/subsurface-core/gas-model.c b/core/gas-model.c
index ad1160f3b..ad1160f3b 100644
--- a/subsurface-core/gas-model.c
+++ b/core/gas-model.c
diff --git a/subsurface-core/gaspressures.c b/core/gaspressures.c
index 5d3fc9791..5d3fc9791 100644
--- a/subsurface-core/gaspressures.c
+++ b/core/gaspressures.c
diff --git a/subsurface-core/gaspressures.h b/core/gaspressures.h
index 420c117a2..420c117a2 100644
--- a/subsurface-core/gaspressures.h
+++ b/core/gaspressures.h
diff --git a/subsurface-core/gettext.h b/core/gettext.h
index 43ff023c7..43ff023c7 100644
--- a/subsurface-core/gettext.h
+++ b/core/gettext.h
diff --git a/subsurface-core/gettextfromc.cpp b/core/gettextfromc.cpp
index c579e3c3c..43ee8da50 100644
--- a/subsurface-core/gettextfromc.cpp
+++ b/core/gettextfromc.cpp
@@ -1,6 +1,6 @@
 #include <QCoreApplication>
 #include <QString>
-#include <gettextfromc.h>
+#include "gettextfromc.h"
 
 const char *gettextFromC::trGettext(const char *text)
 {
diff --git a/subsurface-core/gettextfromc.h b/core/gettextfromc.h
index 53df18365..53df18365 100644
--- a/subsurface-core/gettextfromc.h
+++ b/core/gettextfromc.h
diff --git a/subsurface-core/git-access.c b/core/git-access.c
index d10139d3d..d10139d3d 100644
--- a/subsurface-core/git-access.c
+++ b/core/git-access.c
diff --git a/subsurface-core/git-access.h b/core/git-access.h
index 3a0c5160a..3a0c5160a 100644
--- a/subsurface-core/git-access.h
+++ b/core/git-access.h
diff --git a/subsurface-core/gpslocation.cpp b/core/gpslocation.cpp
index 075b1c046..8595cc45d 100644
--- a/subsurface-core/gpslocation.cpp
+++ b/core/gpslocation.cpp
@@ -1,8 +1,8 @@
-#include "gpslocation.h"
-#include "gpslistmodel.h"
-#include "pref.h"
-#include "dive.h"
-#include "helpers.h"
+#include "core/gpslocation.h"
+#include "qt-models/gpslistmodel.h"
+#include "core/pref.h"
+#include "core/dive.h"
+#include "core/helpers.h"
 #include <time.h>
 #include <unistd.h>
 #include <QDebug>
diff --git a/subsurface-core/gpslocation.h b/core/gpslocation.h
index 82b51a291..82b51a291 100644
--- a/subsurface-core/gpslocation.h
+++ b/core/gpslocation.h
diff --git a/subsurface-core/helpers.h b/core/helpers.h
index f88da015c..f88da015c 100644
--- a/subsurface-core/helpers.h
+++ b/core/helpers.h
diff --git a/subsurface-core/imagedownloader.cpp b/core/imagedownloader.cpp
index daa49eadf..f406ee45a 100644
--- a/subsurface-core/imagedownloader.cpp
+++ b/core/imagedownloader.cpp
@@ -69,7 +69,7 @@ void ImageDownloader::saveImage(QNetworkReply *reply)
 	reply->manager()->deleteLater();
 	reply->deleteLater();
 	// This should be called to make the picture actually show.
-	// Problem is DivePictureModel is not in subsurface-core.
+	// Problem is DivePictureModel is not in core.
 	// Nevertheless, the image shows when the dive is selected the next time.
 	// DivePictureModel::instance()->updateDivePictures();
 
diff --git a/subsurface-core/imagedownloader.h b/core/imagedownloader.h
index f4e3df875..f4e3df875 100644
--- a/subsurface-core/imagedownloader.h
+++ b/core/imagedownloader.h
diff --git a/subsurface-core/isocialnetworkintegration.cpp b/core/isocialnetworkintegration.cpp
index eb1e82a49..eb1e82a49 100644
--- a/subsurface-core/isocialnetworkintegration.cpp
+++ b/core/isocialnetworkintegration.cpp
diff --git a/subsurface-core/isocialnetworkintegration.h b/core/isocialnetworkintegration.h
index 70ea3d9ab..70ea3d9ab 100644
--- a/subsurface-core/isocialnetworkintegration.h
+++ b/core/isocialnetworkintegration.h
diff --git a/subsurface-core/libdivecomputer.c b/core/libdivecomputer.c
index 549b894ce..549b894ce 100644
--- a/subsurface-core/libdivecomputer.c
+++ b/core/libdivecomputer.c
diff --git a/subsurface-core/libdivecomputer.h b/core/libdivecomputer.h
index 99f1c2490..99f1c2490 100644
--- a/subsurface-core/libdivecomputer.h
+++ b/core/libdivecomputer.h
diff --git a/subsurface-core/linux.c b/core/linux.c
index b81f6bf53..b81f6bf53 100644
--- a/subsurface-core/linux.c
+++ b/core/linux.c
diff --git a/subsurface-core/liquivision.c b/core/liquivision.c
index 9347a724a..9347a724a 100644
--- a/subsurface-core/liquivision.c
+++ b/core/liquivision.c
diff --git a/subsurface-core/load-git.c b/core/load-git.c
index a1f2d2031..a1f2d2031 100644
--- a/subsurface-core/load-git.c
+++ b/core/load-git.c
diff --git a/subsurface-core/macos.c b/core/macos.c
index 500412cd8..500412cd8 100644
--- a/subsurface-core/macos.c
+++ b/core/macos.c
diff --git a/subsurface-core/membuffer.c b/core/membuffer.c
index 053edb8f0..053edb8f0 100644
--- a/subsurface-core/membuffer.c
+++ b/core/membuffer.c
diff --git a/subsurface-core/membuffer.h b/core/membuffer.h
index 434b34c71..434b34c71 100644
--- a/subsurface-core/membuffer.h
+++ b/core/membuffer.h
diff --git a/subsurface-core/metrics.cpp b/core/metrics.cpp
index 3c66528b8..3c66528b8 100644
--- a/subsurface-core/metrics.cpp
+++ b/core/metrics.cpp
diff --git a/subsurface-core/metrics.h b/core/metrics.h
index ca281b3b1..ca281b3b1 100644
--- a/subsurface-core/metrics.h
+++ b/core/metrics.h
diff --git a/subsurface-core/ostctools.c b/core/ostctools.c
index 9be591b0e..9be591b0e 100644
--- a/subsurface-core/ostctools.c
+++ b/core/ostctools.c
diff --git a/subsurface-core/parse-xml.c b/core/parse-xml.c
index e8782251e..e8782251e 100644
--- a/subsurface-core/parse-xml.c
+++ b/core/parse-xml.c
diff --git a/subsurface-core/planner.c b/core/planner.c
index 705aad1cb..705aad1cb 100644
--- a/subsurface-core/planner.c
+++ b/core/planner.c
diff --git a/subsurface-core/planner.h b/core/planner.h
index a675989e0..a675989e0 100644
--- a/subsurface-core/planner.h
+++ b/core/planner.h
diff --git a/subsurface-core/pluginmanager.cpp b/core/pluginmanager.cpp
index 28c978280..28c978280 100644
--- a/subsurface-core/pluginmanager.cpp
+++ b/core/pluginmanager.cpp
diff --git a/subsurface-core/pluginmanager.h b/core/pluginmanager.h
index 3f43b5db1..3f43b5db1 100644
--- a/subsurface-core/pluginmanager.h
+++ b/core/pluginmanager.h
diff --git a/subsurface-core/pref.h b/core/pref.h
index be684fd90..be684fd90 100644
--- a/subsurface-core/pref.h
+++ b/core/pref.h
diff --git a/subsurface-core/prefs-macros.h b/core/prefs-macros.h
index fe459d3da..fe459d3da 100644
--- a/subsurface-core/prefs-macros.h
+++ b/core/prefs-macros.h
diff --git a/subsurface-core/profile.c b/core/profile.c
index 6576f6453..6576f6453 100644
--- a/subsurface-core/profile.c
+++ b/core/profile.c
diff --git a/subsurface-core/profile.h b/core/profile.h
index abac9dd49..abac9dd49 100644
--- a/subsurface-core/profile.h
+++ b/core/profile.h
diff --git a/subsurface-core/qt-gui.h b/core/qt-gui.h
index 92532d22f..92532d22f 100644
--- a/subsurface-core/qt-gui.h
+++ b/core/qt-gui.h
diff --git a/subsurface-core/qt-init.cpp b/core/qt-init.cpp
index b52dfd970..b52dfd970 100644
--- a/subsurface-core/qt-init.cpp
+++ b/core/qt-init.cpp
diff --git a/subsurface-core/qthelper.cpp b/core/qthelper.cpp
index c45e86388..1d3951088 100644
--- a/subsurface-core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -9,7 +9,7 @@
 #include "time.h"
 #include "gettextfromc.h"
 #include <sys/time.h>
-#include <exif.h>
+#include "exif.h"
 #include "file.h"
 #include "prefs-macros.h"
 #include <QFile>
diff --git a/subsurface-core/qthelper.h b/core/qthelper.h
index 3a5ef60e4..3a5ef60e4 100644
--- a/subsurface-core/qthelper.h
+++ b/core/qthelper.h
diff --git a/subsurface-core/qthelperfromc.h b/core/qthelperfromc.h
index 32aed8949..32aed8949 100644
--- a/subsurface-core/qthelperfromc.h
+++ b/core/qthelperfromc.h
diff --git a/subsurface-core/qtserialbluetooth.cpp b/core/qtserialbluetooth.cpp
index 6b104157a..6b104157a 100644
--- a/subsurface-core/qtserialbluetooth.cpp
+++ b/core/qtserialbluetooth.cpp
diff --git a/subsurface-core/save-git.c b/core/save-git.c
index e22019ab0..e22019ab0 100644
--- a/subsurface-core/save-git.c
+++ b/core/save-git.c
diff --git a/subsurface-core/save-html.c b/core/save-html.c
index 2d0ea9cf3..2d0ea9cf3 100644
--- a/subsurface-core/save-html.c
+++ b/core/save-html.c
diff --git a/subsurface-core/save-html.h b/core/save-html.h
index 13bb102b1..13bb102b1 100644
--- a/subsurface-core/save-html.h
+++ b/core/save-html.h
diff --git a/subsurface-core/save-xml.c b/core/save-xml.c
index 2335637e8..2335637e8 100644
--- a/subsurface-core/save-xml.c
+++ b/core/save-xml.c
diff --git a/subsurface-core/serial_ftdi.c b/core/serial_ftdi.c
index ff1335171..ff1335171 100644
--- a/subsurface-core/serial_ftdi.c
+++ b/core/serial_ftdi.c
diff --git a/subsurface-core/sha1.c b/core/sha1.c
index acf8c5d9f..acf8c5d9f 100644
--- a/subsurface-core/sha1.c
+++ b/core/sha1.c
diff --git a/subsurface-core/sha1.h b/core/sha1.h
index cab6ff77d..cab6ff77d 100644
--- a/subsurface-core/sha1.h
+++ b/core/sha1.h
diff --git a/subsurface-core/statistics.c b/core/statistics.c
index 6a05cffc1..6a05cffc1 100644
--- a/subsurface-core/statistics.c
+++ b/core/statistics.c
diff --git a/subsurface-core/statistics.h b/core/statistics.h
index 015c3481e..015c3481e 100644
--- a/subsurface-core/statistics.h
+++ b/core/statistics.h
diff --git a/subsurface-core/strndup.h b/core/strndup.h
index 84e18b60f..84e18b60f 100644
--- a/subsurface-core/strndup.h
+++ b/core/strndup.h
diff --git a/subsurface-core/strtod.c b/core/strtod.c
index 81e5d42d1..81e5d42d1 100644
--- a/subsurface-core/strtod.c
+++ b/core/strtod.c
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp
index ab88d2f3c..ab88d2f3c 100644
--- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp
+++ b/core/subsurface-qt/DiveObjectHelper.cpp
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h
index 602775ef8..602775ef8 100644
--- a/subsurface-core/subsurface-qt/DiveObjectHelper.h
+++ b/core/subsurface-qt/DiveObjectHelper.h
diff --git a/subsurface-core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index e43be1a9b..e43be1a9b 100644
--- a/subsurface-core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
diff --git a/subsurface-core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index f115e2d86..f115e2d86 100644
--- a/subsurface-core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
diff --git a/subsurface-core/subsurfacestartup.c b/core/subsurfacestartup.c
index 6e0dede1c..6e0dede1c 100644
--- a/subsurface-core/subsurfacestartup.c
+++ b/core/subsurfacestartup.c
diff --git a/subsurface-core/subsurfacestartup.h b/core/subsurfacestartup.h
index 3ccc24aa4..3ccc24aa4 100644
--- a/subsurface-core/subsurfacestartup.h
+++ b/core/subsurfacestartup.h
diff --git a/subsurface-core/subsurfacesysinfo.cpp b/core/subsurfacesysinfo.cpp
index a7173b169..a7173b169 100644
--- a/subsurface-core/subsurfacesysinfo.cpp
+++ b/core/subsurfacesysinfo.cpp
diff --git a/subsurface-core/subsurfacesysinfo.h b/core/subsurfacesysinfo.h
index b2c267b83..b2c267b83 100644
--- a/subsurface-core/subsurfacesysinfo.h
+++ b/core/subsurfacesysinfo.h
diff --git a/subsurface-core/taxonomy.c b/core/taxonomy.c
index 670d85ad0..670d85ad0 100644
--- a/subsurface-core/taxonomy.c
+++ b/core/taxonomy.c
diff --git a/subsurface-core/taxonomy.h b/core/taxonomy.h
index 51245d562..51245d562 100644
--- a/subsurface-core/taxonomy.h
+++ b/core/taxonomy.h
diff --git a/subsurface-core/time.c b/core/time.c
index 0893f19d8..0893f19d8 100644
--- a/subsurface-core/time.c
+++ b/core/time.c
diff --git a/subsurface-core/uemis-downloader.c b/core/uemis-downloader.c
index b9b532303..b9b532303 100644
--- a/subsurface-core/uemis-downloader.c
+++ b/core/uemis-downloader.c
diff --git a/subsurface-core/uemis.c b/core/uemis.c
index 5635d5630..5635d5630 100644
--- a/subsurface-core/uemis.c
+++ b/core/uemis.c
diff --git a/subsurface-core/uemis.h b/core/uemis.h
index 1758b4b32..1758b4b32 100644
--- a/subsurface-core/uemis.h
+++ b/core/uemis.h
diff --git a/subsurface-core/units.h b/core/units.h
index 029bb64fa..029bb64fa 100644
--- a/subsurface-core/units.h
+++ b/core/units.h
diff --git a/subsurface-core/version.c b/core/version.c
index 764e4d2db..764e4d2db 100644
--- a/subsurface-core/version.c
+++ b/core/version.c
diff --git a/subsurface-core/version.h b/core/version.h
index 0a3204bd9..0a3204bd9 100644
--- a/subsurface-core/version.h
+++ b/core/version.h
diff --git a/subsurface-core/webservice.h b/core/webservice.h
index 052b8aae7..052b8aae7 100644
--- a/subsurface-core/webservice.h
+++ b/core/webservice.h
diff --git a/subsurface-core/windows.c b/core/windows.c
index 58d3beaad..58d3beaad 100644
--- a/subsurface-core/windows.c
+++ b/core/windows.c
diff --git a/subsurface-core/windowtitleupdate.cpp b/core/windowtitleupdate.cpp
index 963455f1d..963455f1d 100644
--- a/subsurface-core/windowtitleupdate.cpp
+++ b/core/windowtitleupdate.cpp
diff --git a/subsurface-core/windowtitleupdate.h b/core/windowtitleupdate.h
index 8650e5868..8650e5868 100644
--- a/subsurface-core/windowtitleupdate.h
+++ b/core/windowtitleupdate.h
diff --git a/subsurface-core/worldmap-options.h b/core/worldmap-options.h
index 177443563..177443563 100644
--- a/subsurface-core/worldmap-options.h
+++ b/core/worldmap-options.h
diff --git a/subsurface-core/worldmap-save.c b/core/worldmap-save.c
index e7e8bcc30..e7e8bcc30 100644
--- a/subsurface-core/worldmap-save.c
+++ b/core/worldmap-save.c
diff --git a/subsurface-core/worldmap-save.h b/core/worldmap-save.h
index 102ea40e5..102ea40e5 100644
--- a/subsurface-core/worldmap-save.h
+++ b/core/worldmap-save.h
diff --git a/desktop-widgets/about.cpp b/desktop-widgets/about.cpp
index 02bb9b72b..6bd2503f6 100644
--- a/desktop-widgets/about.cpp
+++ b/desktop-widgets/about.cpp
@@ -1,5 +1,5 @@
-#include "about.h"
-#include "version.h"
+#include "desktop-widgets/about.h"
+#include "core/version.h"
 #include <QDesktopServices>
 #include <QUrl>
 #include <QShortcut>
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index 428b326e4..471db9a65 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -1,8 +1,8 @@
-#include "configuredivecomputerdialog.h"
+#include "desktop-widgets/configuredivecomputerdialog.h"
 
-#include "helpers.h"
-#include "mainwindow.h"
-#include "display.h"
+#include "core/helpers.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/display.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/desktop-widgets/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h
index 9ad30ac67..f3ea97de5 100644
--- a/desktop-widgets/configuredivecomputerdialog.h
+++ b/desktop-widgets/configuredivecomputerdialog.h
@@ -4,12 +4,12 @@
 #include <QDialog>
 #include <QStringListModel>
 #include "ui_configuredivecomputerdialog.h"
-#include "subsurface-core/libdivecomputer.h"
-#include "configuredivecomputer.h"
+#include "core/libdivecomputer.h"
+#include "core/configuredivecomputer.h"
 #include <QStyledItemDelegate>
 #include <QNetworkAccessManager>
 #ifdef BT_SUPPORT
-#include "btdeviceselectiondialog.h"
+#include "desktop-widgets/btdeviceselectiondialog.h"
 #endif
 
 class GasSpinBoxItemDelegate : public QStyledItemDelegate {
diff --git a/desktop-widgets/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp
index fd9273ffb..41572355c 100644
--- a/desktop-widgets/divecomputermanagementdialog.cpp
+++ b/desktop-widgets/divecomputermanagementdialog.cpp
@@ -1,7 +1,7 @@
-#include "divecomputermanagementdialog.h"
-#include "mainwindow.h"
-#include "helpers.h"
-#include "divecomputermodel.h"
+#include "desktop-widgets/divecomputermanagementdialog.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/helpers.h"
+#include "qt-models/divecomputermodel.h"
 #include <QMessageBox>
 #include <QShortcut>
 
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp
index f3204a111..0aea54f2a 100644
--- a/desktop-widgets/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
@@ -4,11 +4,11 @@
  * classes for the divelist of Subsurface
  *
  */
-#include "filtermodels.h"
-#include "modeldelegates.h"
-#include "mainwindow.h"
-#include "divepicturewidget.h"
-#include "display.h"
+#include "qt-models/filtermodels.h"
+#include "desktop-widgets/modeldelegates.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/divepicturewidget.h"
+#include "core/display.h"
 #include <unistd.h>
 #include <QSettings>
 #include <QKeyEvent>
@@ -17,12 +17,12 @@
 #include <QNetworkReply>
 #include <QStandardPaths>
 #include <QMessageBox>
-#include "qthelper.h"
-#include "undocommands.h"
-#include "divelistview.h"
-#include "divepicturemodel.h"
-#include "metrics.h"
-#include "helpers.h"
+#include "core/qthelper.h"
+#include "desktop-widgets/undocommands.h"
+#include "desktop-widgets/divelistview.h"
+#include "qt-models/divepicturemodel.h"
+#include "core/metrics.h"
+#include "core/helpers.h"
 
 //                                #  Date  Rtg Dpth  Dur  Tmp Wght Suit  Cyl  Gas  SAC  OTU  CNS  Loc
 static int defaultWidth[] =    {  70, 140, 90,  50,  50,  50,  50,  70,  50,  50,  70,  50,  50, 500};
diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h
index aaec37af5..2554725b7 100644
--- a/desktop-widgets/divelistview.h
+++ b/desktop-widgets/divelistview.h
@@ -14,7 +14,7 @@
 #include <QTreeView>
 #include <QLineEdit>
 #include <QNetworkAccessManager>
-#include "divetripmodel.h"
+#include "qt-models/divetripmodel.h"
 
 class DiveListView : public QTreeView {
 	Q_OBJECT
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index e7c53274c..5b58d0c1d 100644
--- a/desktop-widgets/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
@@ -3,14 +3,14 @@
 #include <QSettings>
 #include <QtConcurrent>
 
-#include "divelogexportdialog.h"
-#include "divelogexportlogic.h"
-#include "diveshareexportdialog.h"
+#include "desktop-widgets/divelogexportdialog.h"
+#include "core/divelogexportlogic.h"
+#include "desktop-widgets/diveshareexportdialog.h"
 #include "ui_divelogexportdialog.h"
-#include "subsurfacewebservices.h"
-#include "worldmap-save.h"
-#include "save-html.h"
-#include "mainwindow.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "core/worldmap-save.h"
+#include "core/save-html.h"
+#include "desktop-widgets/mainwindow.h"
 
 #define GET_UNIT(name, field, f, t)                   \
 	v = settings.value(QString(name));            \
diff --git a/desktop-widgets/divelogexportdialog.h b/desktop-widgets/divelogexportdialog.h
index b72d96c50..e7cde318d 100644
--- a/desktop-widgets/divelogexportdialog.h
+++ b/desktop-widgets/divelogexportdialog.h
@@ -4,8 +4,8 @@
 #include <QDialog>
 #include <QTextStream>
 #include <QFuture>
-#include "helpers.h"
-#include "statistics.h"
+#include "core/helpers.h"
+#include "core/statistics.h"
 
 class QAbstractButton;
 
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 4e5607ed3..cd9026f87 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -1,6 +1,6 @@
-#include "divelogimportdialog.h"
-#include "mainwindow.h"
-#include "color.h"
+#include "desktop-widgets/divelogimportdialog.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/color.h"
 #include "ui_divelogimportdialog.h"
 #include <QShortcut>
 #include <QDrag>
diff --git a/desktop-widgets/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h
index 2d12c7cac..811775379 100644
--- a/desktop-widgets/divelogimportdialog.h
+++ b/desktop-widgets/divelogimportdialog.h
@@ -9,8 +9,8 @@
 #include <QAbstractTableModel>
 #include <QStyledItemDelegate>
 
-#include "subsurface-core/dive.h"
-#include "subsurface-core/divelist.h"
+#include "core/dive.h"
+#include "core/divelist.h"
 
 namespace Ui {
 	class DiveLogImportDialog;
diff --git a/desktop-widgets/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui
index 6d154b7c6..36746ffe9 100644
--- a/desktop-widgets/divelogimportdialog.ui
+++ b/desktop-widgets/divelogimportdialog.ui
@@ -200,12 +200,12 @@
   <customwidget>
    <class>ColumnNameView</class>
    <extends>QListView</extends>
-   <header>divelogimportdialog.h</header>
+   <header>desktop-widgets/divelogimportdialog.h</header>
   </customwidget>
   <customwidget>
    <class>ColumnDropCSVView</class>
    <extends>QTableView</extends>
-   <header>divelogimportdialog.h</header>
+   <header>desktop-widgets/divelogimportdialog.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/desktop-widgets/divepicturewidget.cpp b/desktop-widgets/divepicturewidget.cpp
index d52fbb9d7..04ae76e23 100644
--- a/desktop-widgets/divepicturewidget.cpp
+++ b/desktop-widgets/divepicturewidget.cpp
@@ -1,8 +1,8 @@
-#include "divepicturewidget.h"
-#include "divepicturemodel.h"
-#include "metrics.h"
-#include "dive.h"
-#include "divelist.h"
+#include "desktop-widgets/divepicturewidget.h"
+#include "qt-models/divepicturemodel.h"
+#include "core/metrics.h"
+#include "core/dive.h"
+#include "core/divelist.h"
 #include <unistd.h>
 #include <QtConcurrentMap>
 #include <QtConcurrentRun>
@@ -11,8 +11,8 @@
 #include <QCryptographicHash>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <mainwindow.h>
-#include <qthelper.h>
+#include "desktop-widgets/mainwindow.h"
+#include "core/qthelper.h"
 #include <QStandardPaths>
 #include <QtWidgets>
 
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index f84781e96..3a2436c6c 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -1,12 +1,12 @@
-#include "diveplanner.h"
-#include "modeldelegates.h"
-#include "mainwindow.h"
-#include "planner.h"
-#include "helpers.h"
-#include "cylindermodel.h"
-#include "models.h"
+#include "desktop-widgets/diveplanner.h"
+#include "desktop-widgets/modeldelegates.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/planner.h"
+#include "core/helpers.h"
+#include "qt-models/cylindermodel.h"
+#include "qt-models/models.h"
 #include "profile-widget/profilewidget2.h"
-#include "diveplannermodel.h"
+#include "qt-models/diveplannermodel.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QMessageBox>
diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h
index 1cc96adc3..03014cb9c 100644
--- a/desktop-widgets/diveplanner.h
+++ b/desktop-widgets/diveplanner.h
@@ -7,7 +7,7 @@
 #include <QDateTime>
 #include <QSignalMapper>
 
-#include "dive.h"
+#include "core/dive.h"
 
 class QListView;
 class QModelIndex;
diff --git a/desktop-widgets/diveplanner.ui b/desktop-widgets/diveplanner.ui
index adb44fad9..b7d1e74bf 100644
--- a/desktop-widgets/diveplanner.ui
+++ b/desktop-widgets/diveplanner.ui
@@ -243,7 +243,7 @@
   <customwidget>
    <class>TableView</class>
    <extends>QWidget</extends>
-   <header>tableview.h</header>
+   <header>desktop-widgets/tableview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp
index ed6e2829a..4460a44df 100644
--- a/desktop-widgets/diveshareexportdialog.cpp
+++ b/desktop-widgets/diveshareexportdialog.cpp
@@ -1,10 +1,10 @@
-#include "diveshareexportdialog.h"
+#include "desktop-widgets/diveshareexportdialog.h"
 #include "ui_diveshareexportdialog.h"
-#include "mainwindow.h"
-#include "save-html.h"
-#include "subsurfacewebservices.h"
-#include "helpers.h"
-#include "subsurface-core/cloudstorage.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/save-html.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "core/helpers.h"
+#include "core/cloudstorage.h"
 
 #include <QDesktopServices>
 #include <QSettings>
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index be6018b36..7ef4e1e28 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -1,10 +1,10 @@
-#include "downloadfromdivecomputer.h"
-#include "helpers.h"
-#include "mainwindow.h"
-#include "divelistview.h"
-#include "display.h"
-#include "uemis.h"
-#include "models.h"
+#include "desktop-widgets/downloadfromdivecomputer.h"
+#include "core/helpers.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/divelistview.h"
+#include "core/display.h"
+#include "core/uemis.h"
+#include "qt-models/models.h"
 
 #include <QTimer>
 #include <QFileDialog>
diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h
index 7acd49e95..33c3ef0a8 100644
--- a/desktop-widgets/downloadfromdivecomputer.h
+++ b/desktop-widgets/downloadfromdivecomputer.h
@@ -7,8 +7,8 @@
 #include <QMap>
 #include <QAbstractTableModel>
 
-#include "libdivecomputer.h"
-#include "configuredivecomputerdialog.h"
+#include "core/libdivecomputer.h"
+#include "desktop-widgets/configuredivecomputerdialog.h"
 #include "ui_downloadfromdivecomputer.h"
 
 #if defined(BT_SUPPORT)
diff --git a/desktop-widgets/globe.cpp b/desktop-widgets/globe.cpp
index 135f195a1..39f030b74 100644
--- a/desktop-widgets/globe.cpp
+++ b/desktop-widgets/globe.cpp
@@ -1,10 +1,10 @@
-#include "globe.h"
+#include "desktop-widgets/globe.h"
 #ifndef NO_MARBLE
-#include "mainwindow.h"
-#include "helpers.h"
-#include "divelistview.h"
-#include "maintab.h"
-#include "display.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/helpers.h"
+#include "desktop-widgets/divelistview.h"
+#include "desktop-widgets/maintab.h"
+#include "core/display.h"
 
 #include <QTimer>
 #include <QContextMenuEvent>
diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui
index 58d065648..923e17f24 100644
--- a/desktop-widgets/locationInformation.ui
+++ b/desktop-widgets/locationInformation.ui
@@ -145,7 +145,7 @@
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>desktop-widgets/kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 5ca858a6b..20cc6fe1d 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -1,13 +1,13 @@
-#include "locationinformation.h"
-#include "dive.h"
-#include "mainwindow.h"
-#include "divelistview.h"
-#include "qthelper.h"
-#include "globe.h"
-#include "filtermodels.h"
-#include "divelocationmodel.h"
-#include "divesitehelpers.h"
-#include "modeldelegates.h"
+#include "desktop-widgets/locationinformation.h"
+#include "core/dive.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/divelistview.h"
+#include "core/qthelper.h"
+#include "desktop-widgets/globe.h"
+#include "qt-models/filtermodels.h"
+#include "qt-models/divelocationmodel.h"
+#include "core/divesitehelpers.h"
+#include "desktop-widgets/modeldelegates.h"
 
 #include <QDebug>
 #include <QShowEvent>
diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp
index eddf90b98..180814c9c 100644
--- a/desktop-widgets/maintab.cpp
+++ b/desktop-widgets/maintab.cpp
@@ -4,25 +4,25 @@
  * classes for the "notebook" area of the main window of Subsurface
  *
  */
-#include "maintab.h"
-#include "mainwindow.h"
-#include "globe.h"
-#include "helpers.h"
-#include "statistics.h"
-#include "modeldelegates.h"
-#include "diveplannermodel.h"
-#include "divelistview.h"
-#include "display.h"
+#include "desktop-widgets/maintab.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/globe.h"
+#include "core/helpers.h"
+#include "core/statistics.h"
+#include "desktop-widgets/modeldelegates.h"
+#include "qt-models/diveplannermodel.h"
+#include "desktop-widgets/divelistview.h"
+#include "core/display.h"
 #include "profile-widget/profilewidget2.h"
-#include "diveplanner.h"
-#include "divesitehelpers.h"
-#include "cylindermodel.h"
-#include "weightmodel.h"
-#include "divepicturemodel.h"
-#include "divecomputerextradatamodel.h"
-#include "divelocationmodel.h"
-#include "divesite.h"
-#include "locationinformation.h"
+#include "desktop-widgets/diveplanner.h"
+#include "core/divesitehelpers.h"
+#include "qt-models/cylindermodel.h"
+#include "qt-models/weightmodel.h"
+#include "qt-models/divepicturemodel.h"
+#include "qt-models/divecomputerextradatamodel.h"
+#include "qt-models/divelocationmodel.h"
+#include "core/divesite.h"
+#include "desktop-widgets/locationinformation.h"
 
 #include <QCompleter>
 #include <QSettings>
diff --git a/desktop-widgets/maintab.h b/desktop-widgets/maintab.h
index d4f7aaaa9..50a7d6d21 100644
--- a/desktop-widgets/maintab.h
+++ b/desktop-widgets/maintab.h
@@ -13,9 +13,9 @@
 #include <QUuid>
 
 #include "ui_maintab.h"
-#include "completionmodels.h"
-#include "divelocationmodel.h"
-#include "dive.h"
+#include "qt-models/completionmodels.h"
+#include "qt-models/divelocationmodel.h"
+#include "core/dive.h"
 
 class WeightModel;
 class CylindersModel;
diff --git a/desktop-widgets/maintab.ui b/desktop-widgets/maintab.ui
index 7bc516b1a..964593b38 100644
--- a/desktop-widgets/maintab.ui
+++ b/desktop-widgets/maintab.ui
@@ -1205,47 +1205,47 @@
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>desktop-widgets/kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>StarWidget</class>
    <extends>QWidget</extends>
-   <header>starwidget.h</header>
+   <header>desktop-widgets/starwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>MinMaxAvgWidget</class>
    <extends>QWidget</extends>
-   <header>simplewidgets.h</header>
+   <header>desktop-widgets/simplewidgets.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>TableView</class>
    <extends>QWidget</extends>
-   <header>tableview.h</header>
+   <header>desktop-widgets/desktop-widget/tableview.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>TagWidget</class>
    <extends>QPlainTextEdit</extends>
-   <header>tagwidget.h</header>
+   <header>desktop-widgets/tagwidget.h</header>
   </customwidget>
   <customwidget>
    <class>DivePictureWidget</class>
    <extends>QListView</extends>
-   <header>divepicturewidget.h</header>
+   <header>desktop-widgets/divepicturewidget.h</header>
   </customwidget>
   <customwidget>
    <class>QtWaitingSpinner</class>
    <extends>QWidget</extends>
-   <header>qtwaitingspinner.h</header>
+   <header>desktop-widgets/qtwaitingspinner.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>DiveLocationLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>locationinformation.h</header>
+   <header>desktop-widgets/locationinformation.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index ca78b82af..c6f487486 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -12,50 +12,50 @@
 #include <QShortcut>
 #include <QToolBar>
 
-#include "version.h"
-#include "divelistview.h"
-#include "downloadfromdivecomputer.h"
-#include "subsurfacewebservices.h"
-#include "divecomputermanagementdialog.h"
-#include "about.h"
-#include "updatemanager.h"
-#include "planner.h"
-#include "filtermodels.h"
+#include "core/version.h"
+#include "desktop-widgets/divelistview.h"
+#include "desktop-widgets/downloadfromdivecomputer.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "desktop-widgets/divecomputermanagementdialog.h"
+#include "desktop-widgets/about.h"
+#include "desktop-widgets/updatemanager.h"
+#include "core/planner.h"
+#include "qt-models/filtermodels.h"
 #include "profile-widget/profilewidget2.h"
-#include "globe.h"
-#include "divecomputer.h"
-#include "maintab.h"
-#include "diveplanner.h"
+#include "desktop-widgets/globe.h"
+#include "core/divecomputer.h"
+#include "desktop-widgets/maintab.h"
+#include "desktop-widgets/diveplanner.h"
 #ifndef NO_PRINTING
 #include <QPrintDialog>
 #include <QBuffer>
-#include "printdialog.h"
+#include "desktop-widgets/printdialog.h"
 #endif
-#include "tankinfomodel.h"
-#include "weigthsysteminfomodel.h"
-#include "yearlystatisticsmodel.h"
-#include "diveplannermodel.h"
-#include "divelogimportdialog.h"
-#include "divelogexportdialog.h"
-#include "usersurvey.h"
-#include "divesitehelpers.h"
-#include "windowtitleupdate.h"
-#include "locationinformation.h"
+#include "qt-models/tankinfomodel.h"
+#include "qt-models/weigthsysteminfomodel.h"
+#include "qt-models/yearlystatisticsmodel.h"
+#include "qt-models/diveplannermodel.h"
+#include "desktop-widgets/divelogimportdialog.h"
+#include "desktop-widgets/divelogexportdialog.h"
+#include "desktop-widgets/usersurvey.h"
+#include "core/divesitehelpers.h"
+#include "core/windowtitleupdate.h"
+#include "desktop-widgets/locationinformation.h"
 #include "preferences/preferencesdialog.h"
 
 #ifndef NO_USERMANUAL
 #include "usermanual.h"
 #endif
-#include "divepicturemodel.h"
-#include "git-access.h"
+#include "qt-models/divepicturemodel.h"
+#include "core/git-access.h"
 #include <QNetworkProxy>
 #include <QUndoStack>
-#include <qthelper.h>
+#include "core/qthelper.h"
 #include <QtConcurrentRun>
-#include "subsurface-core/color.h"
-#include "subsurface-core/isocialnetworkintegration.h"
-#include "subsurface-core/pluginmanager.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "core/color.h"
+#include "core/isocialnetworkintegration.h"
+#include "core/pluginmanager.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 
 #if defined(FBSUPPORT)
 #include "plugins/facebook/facebook_integration.h"
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 7e7f5db1e..0a53405e8 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -14,9 +14,9 @@
 #include <QProgressDialog>
 
 #include "ui_mainwindow.h"
-#include "notificationwidget.h"
-#include "windowtitleupdate.h"
-#include "gpslocation.h"
+#include "desktop-widgets/notificationwidget.h"
+#include "core/windowtitleupdate.h"
+#include "core/gpslocation.h"
 
 struct DiveList;
 class QSortFilterProxyModel;
diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 724c83657..85f034692 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -750,13 +750,13 @@
   <customwidget>
    <class>NotificationWidget</class>
    <extends>QWidget</extends>
-   <header>notificationwidget.h</header>
+   <header>desktop-widgets/notificationwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>MultiFilter</class>
    <extends>QWidget</extends>
-   <header>simplewidgets.h</header>
+   <header>desktop-widgets/simplewidgets.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp
index 377a1baed..a80137e80 100644
--- a/desktop-widgets/modeldelegates.cpp
+++ b/desktop-widgets/modeldelegates.cpp
@@ -1,18 +1,18 @@
-#include "modeldelegates.h"
-#include "dive.h"
-#include "gettextfromc.h"
-#include "mainwindow.h"
-#include "cylindermodel.h"
-#include "models.h"
-#include "starwidget.h"
+#include "desktop-widgets/modeldelegates.h"
+#include "core/dive.h"
+#include "core/gettextfromc.h"
+#include "desktop-widgets/mainwindow.h"
+#include "qt-models/cylindermodel.h"
+#include "qt-models/models.h"
+#include "desktop-widgets/starwidget.h"
 #include "profile-widget/profilewidget2.h"
-#include "tankinfomodel.h"
-#include "weigthsysteminfomodel.h"
-#include "weightmodel.h"
-#include "divetripmodel.h"
-#include "qthelper.h"
+#include "qt-models/tankinfomodel.h"
+#include "qt-models/weigthsysteminfomodel.h"
+#include "qt-models/weightmodel.h"
+#include "qt-models/divetripmodel.h"
+#include "core/qthelper.h"
 #ifndef NO_MARBLE
-#include "globe.h"
+#include "desktop-widgets/globe.h"
 #endif
 
 #include <QCompleter>
diff --git a/desktop-widgets/notificationwidget.h b/desktop-widgets/notificationwidget.h
index 8a551a0b3..388982191 100644
--- a/desktop-widgets/notificationwidget.h
+++ b/desktop-widgets/notificationwidget.h
@@ -4,7 +4,7 @@
 #include <QWidget>
 #include <QFutureWatcher>
 
-#include <kmessagewidget.h>
+#include "desktop-widgets/kmessagewidget.h"
 
 namespace Ui {
 	class NotificationWidget;
diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h
index 40b16917d..ce4793cad 100644
--- a/desktop-widgets/plugins/facebook/facebook_integration.h
+++ b/desktop-widgets/plugins/facebook/facebook_integration.h
@@ -1,7 +1,7 @@
 #ifndef FACEBOOK_INTEGRATION_H
 #define FACEBOOK_INTEGRATION_H
 
-#include "subsurface-core/isocialnetworkintegration.h"
+#include "core/isocialnetworkintegration.h"
 #include <QString>
 
 class FacebookConnectWidget;
@@ -23,4 +23,4 @@ private:
 	SocialNetworkDialog *fbUploadDialog;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp
index 45888ebec..62bb3bcb2 100644
--- a/desktop-widgets/preferences/preferences_defaults.cpp
+++ b/desktop-widgets/preferences/preferences_defaults.cpp
@@ -1,7 +1,7 @@
 #include "preferences_defaults.h"
 #include "ui_preferences_defaults.h"
-#include "dive.h"
-#include "subsurface-core/prefs-macros.h"
+#include "core/dive.h"
+#include "core/prefs-macros.h"
 
 #include <QSettings>
 #include <QFileDialog>
diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h
index c72be31a6..eb588c097 100644
--- a/desktop-widgets/preferences/preferences_defaults.h
+++ b/desktop-widgets/preferences/preferences_defaults.h
@@ -2,7 +2,7 @@
 #define PREFERENCES_DEFAULTS_H
 
 #include "abstractpreferenceswidget.h"
-#include "subsurface-core/pref.h"
+#include "core/pref.h"
 
 namespace Ui {
 	class PreferencesDefaults;
@@ -25,4 +25,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp
index 7e8ccec9d..8446d0e9a 100644
--- a/desktop-widgets/preferences/preferences_georeference.cpp
+++ b/desktop-widgets/preferences/preferences_georeference.cpp
@@ -1,7 +1,7 @@
 #include "preferences_georeference.h"
 #include "ui_prefs_georeference.h"
-#include "prefs-macros.h"
-#include "qthelper.h"
+#include "core/prefs-macros.h"
+#include "core/qthelper.h"
 #include "qt-models/divelocationmodel.h"
 
 #include <ctime>
@@ -42,4 +42,4 @@ void PreferencesGeoreference::syncSettings()
 	s.setValue("cat1", ui->second_item->currentIndex());
 	s.setValue("cat2", ui->third_item->currentIndex());
 	s.endGroup();
-}
\ No newline at end of file
+}
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index 327557692..3d8d8f685 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -1,6 +1,6 @@
 #include "preferences_graph.h"
 #include "ui_preferences_graph.h"
-#include "subsurface-core/prefs-macros.h"
+#include "core/prefs-macros.h"
 
 #include <QSettings>
 #include <QMessageBox>
@@ -74,4 +74,4 @@ void PreferencesGraph::on_gfhigh_valueChanged(int gf)
 {
 	ui->gfhigh->setStyleSheet(DANGER_GF);
 }
-#undef DANGER_GF
\ No newline at end of file
+#undef DANGER_GF
diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp
index 31bbd1c20..264e2a1a5 100644
--- a/desktop-widgets/preferences/preferences_language.cpp
+++ b/desktop-widgets/preferences/preferences_language.cpp
@@ -1,6 +1,6 @@
 #include "preferences_language.h"
 #include "ui_prefs_language.h"
-#include "subsurface-core/helpers.h"
+#include "core/helpers.h"
 
 #include <QApplication>
 #include <QSettings>
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index 818a16f1b..7d89d4496 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -1,9 +1,9 @@
 #include "preferences_network.h"
 #include "ui_preferences_network.h"
-#include "dive.h"
+#include "core/dive.h"
 #include "subsurfacewebservices.h"
-#include "subsurface-core/prefs-macros.h"
-#include "subsurface-core/cloudstorage.h"
+#include "core/prefs-macros.h"
+#include "core/cloudstorage.h"
 
 #include <QNetworkProxy>
 #include <QSettings>
diff --git a/desktop-widgets/preferences/preferences_units.cpp b/desktop-widgets/preferences/preferences_units.cpp
index cc77e51bb..8fb67a813 100644
--- a/desktop-widgets/preferences/preferences_units.cpp
+++ b/desktop-widgets/preferences/preferences_units.cpp
@@ -1,7 +1,7 @@
 #include "preferences_units.h"
 #include "ui_preferences_units.h"
-#include "prefs-macros.h"
-#include "qthelper.h"
+#include "core/prefs-macros.h"
+#include "core/qthelper.h"
 
 #include <QSettings>
 
diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 34df09b27..01d0aace4 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -8,7 +8,7 @@
 #include "preferences_graph.h"
 #include "preferences_network.h"
 
-#include "subsurface-core/qthelper.h"
+#include "core/qthelper.h"
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index 5f7f5f979..9210dddb0 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -2,7 +2,7 @@
 #define PREFERENCES_WIDGET_H
 
 #include <QDialog>
-#include "pref.h"
+#include "core/pref.h"
 
 class AbstractPreferencesWidget;
 class QListWidget;
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 6c9ec3f96..cbf31cb98 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -1,5 +1,5 @@
-#include "simplewidgets.h"
-#include "filtermodels.h"
+#include "desktop-widgets/simplewidgets.h"
+#include "qt-models/filtermodels.h"
 
 #include <QProcess>
 #include <QFileDialog>
@@ -10,14 +10,14 @@
 #include <QDesktopServices>
 #include <QToolTip>
 
-#include "file.h"
-#include "mainwindow.h"
-#include "helpers.h"
+#include "core/file.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/helpers.h"
 #include "libdivecomputer/parser.h"
-#include "divelistview.h"
-#include "display.h"
+#include "desktop-widgets/divelistview.h"
+#include "core/display.h"
 #include "profile-widget/profilewidget2.h"
-#include "undocommands.h"
+#include "desktop-widgets/undocommands.h"
 
 class MinMaxAvgWidgetPrivate {
 public:
diff --git a/desktop-widgets/simplewidgets.h b/desktop-widgets/simplewidgets.h
index 8a7a5df6a..3c384ba89 100644
--- a/desktop-widgets/simplewidgets.h
+++ b/desktop-widgets/simplewidgets.h
@@ -18,8 +18,8 @@ class QNetworkReply;
 #include "ui_divecomponentselection.h"
 #include "ui_listfilter.h"
 #include "ui_filterwidget.h"
-#include "exif.h"
-#include <dive.h>
+#include "core/exif.h"
+#include "core/dive.h"
 
 
 class MinMaxAvgWidget : public QWidget {
diff --git a/desktop-widgets/starwidget.cpp b/desktop-widgets/starwidget.cpp
index a810883c2..67e22ddb7 100644
--- a/desktop-widgets/starwidget.cpp
+++ b/desktop-widgets/starwidget.cpp
@@ -1,8 +1,8 @@
-#include "starwidget.h"
-#include "metrics.h"
+#include "desktop-widgets/starwidget.h"
+#include "core/metrics.h"
 #include <QSvgRenderer>
 #include <QMouseEvent>
-#include "simplewidgets.h"
+#include "desktop-widgets/simplewidgets.h"
 
 QImage StarWidget::activeStar;
 QImage StarWidget::inactiveStar;
diff --git a/desktop-widgets/statistics/statisticswidget.cpp b/desktop-widgets/statistics/statisticswidget.cpp
index d06f51a98..50d5f3149 100644
--- a/desktop-widgets/statistics/statisticswidget.cpp
+++ b/desktop-widgets/statistics/statisticswidget.cpp
@@ -1,5 +1,5 @@
-#include "statisticswidget.h"
-#include "yearlystatisticsmodel.h"
+#include "desktop-widgets/statistics/statisticswidget.h"
+#include "qt-models/yearlystatisticsmodel.h"
 #include <QModelIndex>
 
 YearlyStatisticsWidget::YearlyStatisticsWidget(QWidget *parent):
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 2ca3de187..bd798c729 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -1,15 +1,15 @@
-#include "subsurfacewebservices.h"
-#include "helpers.h"
-#include "webservice.h"
-#include "mainwindow.h"
-#include "usersurvey.h"
-#include "divelist.h"
-#include "globe.h"
-#include "maintab.h"
-#include "display.h"
-#include "membuffer.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "core/helpers.h"
+#include "core/webservice.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/usersurvey.h"
+#include "core/divelist.h"
+#include "desktop-widgets/globe.h"
+#include "desktop-widgets/maintab.h"
+#include "core/display.h"
+#include "core/membuffer.h"
 #include <errno.h>
-#include "subsurface-core/cloudstorage.h"
+#include "core/cloudstorage.h"
 
 #include <QDir>
 #include <QHttpMultiPart>
diff --git a/desktop-widgets/tableview.cpp b/desktop-widgets/tableview.cpp
index 40d5199ec..20b62ac3c 100644
--- a/desktop-widgets/tableview.cpp
+++ b/desktop-widgets/tableview.cpp
@@ -1,5 +1,5 @@
-#include "tableview.h"
-#include "modeldelegates.h"
+#include "desktop-widgets/tableview.h"
+#include "desktop-widgets/modeldelegates.h"
 
 #include <QPushButton>
 #include <QSettings>
diff --git a/desktop-widgets/tableview.h b/desktop-widgets/tableview.h
index f72b256ea..c3afdaf12 100644
--- a/desktop-widgets/tableview.h
+++ b/desktop-widgets/tableview.h
@@ -9,7 +9,7 @@
 
 #include "ui_tableview.h"
 
-#include "metrics.h"
+#include "core/metrics.h"
 
 class QPushButton;
 class QAbstractItemModel;
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 9e420f381..fc77a5079 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -7,7 +7,7 @@
 #include "statistics.h"
 #include "qthelper.h"
 #include "helpers.h"
-#include "subsurface-core/subsurface-qt/DiveObjectHelper.h"
+#include "core/subsurface-qt/DiveObjectHelper.h"
 
 int getTotalWork(print_options *printOptions);
 void find_all_templates();
diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp
index 0fd182cb3..75fc810c6 100644
--- a/desktop-widgets/undocommands.cpp
+++ b/desktop-widgets/undocommands.cpp
@@ -1,6 +1,6 @@
-#include "undocommands.h"
-#include "mainwindow.h"
-#include "divelist.h"
+#include "desktop-widgets/undocommands.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/divelist.h"
 
 UndoDeleteDive::UndoDeleteDive(QList<dive *> deletedDives) : diveList(deletedDives)
 {
diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h
index 8e359db51..cca87ac2d 100644
--- a/desktop-widgets/undocommands.h
+++ b/desktop-widgets/undocommands.h
@@ -3,7 +3,7 @@
 
 #include <QUndoCommand>
 #include <QMap>
-#include "dive.h"
+#include "core/dive.h"
 
 class UndoDeleteDive : public QUndoCommand {
 public:
diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index daa65e007..b09d12439 100644
--- a/desktop-widgets/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
@@ -1,13 +1,13 @@
-#include "updatemanager.h"
-#include "helpers.h"
-#include "qthelper.h"
+#include "desktop-widgets/updatemanager.h"
+#include "core/helpers.h"
+#include "core/qthelper.h"
 #include <QtNetwork>
 #include <QMessageBox>
 #include <QUuid>
-#include "subsurfacewebservices.h"
-#include "version.h"
-#include "mainwindow.h"
-#include "subsurface-core/cloudstorage.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "core/version.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/cloudstorage.h"
 
 UpdateManager::UpdateManager(QObject *parent) :
 	QObject(parent),
diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp
index 6b676f16b..690307961 100644
--- a/desktop-widgets/usermanual.cpp
+++ b/desktop-widgets/usermanual.cpp
@@ -2,9 +2,9 @@
 #include <QShortcut>
 #include <QFile>
 
-#include "usermanual.h"
-#include "mainwindow.h"
-#include "helpers.h"
+#include "desktop-widgets/usermanual.h"
+#include "desktop-widgets/mainwindow.h"
+#include "core/helpers.h"
 
 SearchBar::SearchBar(QWidget *parent): QWidget(parent)
 {
diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index 6dba30d8b..c60ff8c83 100644
--- a/desktop-widgets/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
@@ -2,14 +2,14 @@
 #include <QMessageBox>
 #include <QSettings>
 
-#include "usersurvey.h"
+#include "desktop-widgets/usersurvey.h"
 #include "ui_usersurvey.h"
-#include "version.h"
-#include "subsurfacewebservices.h"
-#include "updatemanager.h"
+#include "core/version.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "desktop-widgets/updatemanager.h"
 
-#include "helpers.h"
-#include "subsurfacesysinfo.h"
+#include "core/helpers.h"
+#include "core/subsurfacesysinfo.h"
 
 UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
 	ui(new Ui::UserSurvey)
diff --git a/qt-mobile/qml/About.qml b/mobile-widgets/qml/About.qml
index b1ca6e6bc..b1ca6e6bc 100644
--- a/qt-mobile/qml/About.qml
+++ b/mobile-widgets/qml/About.qml
diff --git a/qt-mobile/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml
index aa7c57651..aa7c57651 100644
--- a/qt-mobile/qml/CloudCredentials.qml
+++ b/mobile-widgets/qml/CloudCredentials.qml
diff --git a/qt-mobile/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 108833470..108833470 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
diff --git a/qt-mobile/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml
index e4338b3b8..e4338b3b8 100644
--- a/qt-mobile/qml/DiveDetailsEdit.qml
+++ b/mobile-widgets/qml/DiveDetailsEdit.qml
diff --git a/qt-mobile/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index ef1dc5605..ef1dc5605 100644
--- a/qt-mobile/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
diff --git a/qt-mobile/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 95af9a973..95af9a973 100644
--- a/qt-mobile/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
diff --git a/qt-mobile/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index a062ffaa0..a062ffaa0 100644
--- a/qt-mobile/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
diff --git a/qt-mobile/qml/GpsList.qml b/mobile-widgets/qml/GpsList.qml
index 6903acd80..6903acd80 100644
--- a/qt-mobile/qml/GpsList.qml
+++ b/mobile-widgets/qml/GpsList.qml
diff --git a/qt-mobile/qml/Log.qml b/mobile-widgets/qml/Log.qml
index d617901de..d617901de 100644
--- a/qt-mobile/qml/Log.qml
+++ b/mobile-widgets/qml/Log.qml
diff --git a/qt-mobile/qml/Preferences.qml b/mobile-widgets/qml/Preferences.qml
index 3ec96d198..3ec96d198 100644
--- a/qt-mobile/qml/Preferences.qml
+++ b/mobile-widgets/qml/Preferences.qml
diff --git a/qt-mobile/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml
index 2d70cfcb3..2d70cfcb3 100644
--- a/qt-mobile/qml/StartPage.qml
+++ b/mobile-widgets/qml/StartPage.qml
diff --git a/qt-mobile/qml/SubsurfaceButton.qml b/mobile-widgets/qml/SubsurfaceButton.qml
index 174d44659..174d44659 100644
--- a/qt-mobile/qml/SubsurfaceButton.qml
+++ b/mobile-widgets/qml/SubsurfaceButton.qml
diff --git a/qt-mobile/qml/TextButton.qml b/mobile-widgets/qml/TextButton.qml
index 3e5a36735..3e5a36735 100644
--- a/qt-mobile/qml/TextButton.qml
+++ b/mobile-widgets/qml/TextButton.qml
diff --git a/qt-mobile/qml/ThemeTest.qml b/mobile-widgets/qml/ThemeTest.qml
index c0916aea0..c0916aea0 100644
--- a/qt-mobile/qml/ThemeTest.qml
+++ b/mobile-widgets/qml/ThemeTest.qml
diff --git a/qt-mobile/qml/TopBar.qml b/mobile-widgets/qml/TopBar.qml
index 024b818b0..024b818b0 100644
--- a/qt-mobile/qml/TopBar.qml
+++ b/mobile-widgets/qml/TopBar.qml
diff --git a/qt-mobile/qml/dive.jpg b/mobile-widgets/qml/dive.jpg
index 56445648a..56445648a 100644
--- a/qt-mobile/qml/dive.jpg
+++ b/mobile-widgets/qml/dive.jpg
diff --git a/qt-mobile/qml/icons/context-menu.png b/mobile-widgets/qml/icons/context-menu.png
index df34cfd4f..df34cfd4f 100644
--- a/qt-mobile/qml/icons/context-menu.png
+++ b/mobile-widgets/qml/icons/context-menu.png
diff --git a/qt-mobile/qml/icons/context-menu.svg b/mobile-widgets/qml/icons/context-menu.svg
index e0750c57e..e0750c57e 100644
--- a/qt-mobile/qml/icons/context-menu.svg
+++ b/mobile-widgets/qml/icons/context-menu.svg
diff --git a/qt-mobile/qml/icons/main-menu.png b/mobile-widgets/qml/icons/main-menu.png
index 20729b8f5..20729b8f5 100644
--- a/qt-mobile/qml/icons/main-menu.png
+++ b/mobile-widgets/qml/icons/main-menu.png
diff --git a/qt-mobile/qml/icons/main-menu.svg b/mobile-widgets/qml/icons/main-menu.svg
index 1e89193f5..1e89193f5 100644
--- a/qt-mobile/qml/icons/main-menu.svg
+++ b/mobile-widgets/qml/icons/main-menu.svg
diff --git a/qt-mobile/qml/icons/menu-back.png b/mobile-widgets/qml/icons/menu-back.png
index dc96b7728..dc96b7728 100644
--- a/qt-mobile/qml/icons/menu-back.png
+++ b/mobile-widgets/qml/icons/menu-back.png
diff --git a/qt-mobile/qml/icons/menu-edit.png b/mobile-widgets/qml/icons/menu-edit.png
index ea7dd055a..ea7dd055a 100644
--- a/qt-mobile/qml/icons/menu-edit.png
+++ b/mobile-widgets/qml/icons/menu-edit.png
diff --git a/qt-mobile/qml/main.qml b/mobile-widgets/qml/main.qml
index f4f6ea28b..f4f6ea28b 100644
--- a/qt-mobile/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
diff --git a/qt-mobile/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc
index e6c1fba65..e6c1fba65 100644
--- a/qt-mobile/qml/mobile-resources.qrc
+++ b/mobile-widgets/qml/mobile-resources.qrc
diff --git a/qt-mobile/qml/theme/Theme.qml b/mobile-widgets/qml/theme/Theme.qml
index 2c51ae00f..2c51ae00f 100644
--- a/qt-mobile/qml/theme/Theme.qml
+++ b/mobile-widgets/qml/theme/Theme.qml
diff --git a/qt-mobile/qml/theme/Units.qml b/mobile-widgets/qml/theme/Units.qml
index 7cfa5c23b..7cfa5c23b 100644
--- a/qt-mobile/qml/theme/Units.qml
+++ b/mobile-widgets/qml/theme/Units.qml
diff --git a/qt-mobile/qml/theme/qmldir b/mobile-widgets/qml/theme/qmldir
index c654dbad6..c654dbad6 100644
--- a/qt-mobile/qml/theme/qmldir
+++ b/mobile-widgets/qml/theme/qmldir
diff --git a/qt-mobile/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index c6e6c5025..0bfde62aa 100644
--- a/qt-mobile/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -11,14 +11,14 @@
 #include <QElapsedTimer>
 
 #include "qt-models/divelistmodel.h"
-#include <gpslistmodel.h>
-#include "divelist.h"
-#include "device.h"
-#include "pref.h"
-#include "qthelper.h"
-#include "qt-gui.h"
-#include "git-access.h"
-#include "subsurface-core/cloudstorage.h"
+#include "qt-models/gpslistmodel.h"
+#include "core/divelist.h"
+#include "core/device.h"
+#include "core/pref.h"
+#include "core/qthelper.h"
+#include "core/qt-gui.h"
+#include "core/git-access.h"
+#include "core/cloudstorage.h"
 
 QMLManager *QMLManager::m_instance = NULL;
 
diff --git a/qt-mobile/qmlmanager.h b/mobile-widgets/qmlmanager.h
index 7c56119d5..bd55f68e4 100644
--- a/qt-mobile/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -7,7 +7,7 @@
 #include <QScreen>
 #include <QElapsedTimer>
 
-#include "gpslocation.h"
+#include "core/gpslocation.h"
 
 class QMLManager : public QObject {
 	Q_OBJECT
diff --git a/qt-mobile/qmlprofile.cpp b/mobile-widgets/qmlprofile.cpp
index ad686561d..b023741ef 100644
--- a/qt-mobile/qmlprofile.cpp
+++ b/mobile-widgets/qmlprofile.cpp
@@ -1,8 +1,8 @@
 #include "qmlprofile.h"
 #include "qmlmanager.h"
 #include "profile-widget/profilewidget2.h"
-#include "subsurface-core/dive.h"
-#include "subsurface-core/metrics.h"
+#include "core/dive.h"
+#include "core/metrics.h"
 #include <QTransform>
 #include <QScreen>
 
diff --git a/qt-mobile/qmlprofile.h b/mobile-widgets/qmlprofile.h
index c8a77d700..c8a77d700 100644
--- a/qt-mobile/qmlprofile.h
+++ b/mobile-widgets/qmlprofile.h
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
index e3f657eb2..27125fe50 100644
--- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
@@ -8,64 +8,64 @@ CONFIG += c++11
 
 SOURCES += ../../../subsurface-mobile-main.cpp \
     ../../../subsurface-mobile-helper.cpp \
-    ../../../subsurface-core/cloudstorage.cpp \
-    ../../../subsurface-core/configuredivecomputerthreads.cpp \
-    ../../../subsurface-core/devicedetails.cpp \
-    ../../../subsurface-core/gpslocation.cpp \
-    ../../../subsurface-core/imagedownloader.cpp \
-    ../../../subsurface-core/qthelper.cpp \
-    ../../../subsurface-core/checkcloudconnection.cpp \
-    ../../../subsurface-core/color.cpp \
-    ../../../subsurface-core/configuredivecomputer.cpp \
-    ../../../subsurface-core/divecomputer.cpp \
-    ../../../subsurface-core/divelogexportlogic.cpp \
-    ../../../subsurface-core/divesite.cpp \
-    ../../../subsurface-core/divesitehelpers.cpp \
-    ../../../subsurface-core/exif.cpp \
-    ../../../subsurface-core/gettextfromc.cpp \
-    ../../../subsurface-core/isocialnetworkintegration.cpp \
-    ../../../subsurface-core/metrics.cpp \
-    ../../../subsurface-core/pluginmanager.cpp \
-    ../../../subsurface-core/qt-init.cpp \
-    ../../../subsurface-core/subsurfacesysinfo.cpp \
-    ../../../subsurface-core/windowtitleupdate.cpp \
-    ../../../subsurface-core/file.c \
-    ../../../subsurface-core/subsurfacestartup.c \
-    ../../../subsurface-core/macos.c \
-    ../../../subsurface-core/profile.c \
-    ../../../subsurface-core/device.c \
-    ../../../subsurface-core/dive.c \
-    ../../../subsurface-core/divelist.c \
-    ../../../subsurface-core/gas-model.c \
-    ../../../subsurface-core/gaspressures.c \
-    ../../../subsurface-core/git-access.c \
-    ../../../subsurface-core/liquivision.c \
-    ../../../subsurface-core/load-git.c \
-    ../../../subsurface-core/parse-xml.c \
-    ../../../subsurface-core/save-html.c \
-    ../../../subsurface-core/statistics.c \
-    ../../../subsurface-core/worldmap-save.c \
-    ../../../subsurface-core/libdivecomputer.c \
-    ../../../subsurface-core/version.c \
-    ../../../subsurface-core/save-git.c \
-    ../../../subsurface-core/datatrak.c \
-    ../../../subsurface-core/ostctools.c \
-    ../../../subsurface-core/planner.c \
-    ../../../subsurface-core/save-xml.c \
-    ../../../subsurface-core/cochran.c \
-    ../../../subsurface-core/deco.c \
-    ../../../subsurface-core/divesite.c \
-    ../../../subsurface-core/equipment.c \
-    ../../../subsurface-core/membuffer.c \
-    ../../../subsurface-core/sha1.c \
-    ../../../subsurface-core/strtod.c \
-    ../../../subsurface-core/taxonomy.c \
-    ../../../subsurface-core/time.c \
-    ../../../subsurface-core/uemis.c \
-    ../../../subsurface-core/subsurface-qt/DiveObjectHelper.cpp \
-    ../../../subsurface-core/subsurface-qt/SettingsObjectWrapper.cpp \
-    ../../../qt-mobile/qmlmanager.cpp \
-    ../../../qt-mobile/qmlprofile.cpp \
+    ../../../core/cloudstorage.cpp \
+    ../../../core/configuredivecomputerthreads.cpp \
+    ../../../core/devicedetails.cpp \
+    ../../../core/gpslocation.cpp \
+    ../../../core/imagedownloader.cpp \
+    ../../../core/qthelper.cpp \
+    ../../../core/checkcloudconnection.cpp \
+    ../../../core/color.cpp \
+    ../../../core/configuredivecomputer.cpp \
+    ../../../core/divecomputer.cpp \
+    ../../../core/divelogexportlogic.cpp \
+    ../../../core/divesite.cpp \
+    ../../../core/divesitehelpers.cpp \
+    ../../../core/exif.cpp \
+    ../../../core/gettextfromc.cpp \
+    ../../../core/isocialnetworkintegration.cpp \
+    ../../../core/metrics.cpp \
+    ../../../core/pluginmanager.cpp \
+    ../../../core/qt-init.cpp \
+    ../../../core/subsurfacesysinfo.cpp \
+    ../../../core/windowtitleupdate.cpp \
+    ../../../core/file.c \
+    ../../../core/subsurfacestartup.c \
+    ../../../core/macos.c \
+    ../../../core/profile.c \
+    ../../../core/device.c \
+    ../../../core/dive.c \
+    ../../../core/divelist.c \
+    ../../../core/gas-model.c \
+    ../../../core/gaspressures.c \
+    ../../../core/git-access.c \
+    ../../../core/liquivision.c \
+    ../../../core/load-git.c \
+    ../../../core/parse-xml.c \
+    ../../../core/save-html.c \
+    ../../../core/statistics.c \
+    ../../../core/worldmap-save.c \
+    ../../../core/libdivecomputer.c \
+    ../../../core/version.c \
+    ../../../core/save-git.c \
+    ../../../core/datatrak.c \
+    ../../../core/ostctools.c \
+    ../../../core/planner.c \
+    ../../../core/save-xml.c \
+    ../../../core/cochran.c \
+    ../../../core/deco.c \
+    ../../../core/divesite.c \
+    ../../../core/equipment.c \
+    ../../../core/membuffer.c \
+    ../../../core/sha1.c \
+    ../../../core/strtod.c \
+    ../../../core/taxonomy.c \
+    ../../../core/time.c \
+    ../../../core/uemis.c \
+    ../../../core/subsurface-qt/DiveObjectHelper.cpp \
+    ../../../core/subsurface-qt/SettingsObjectWrapper.cpp \
+    ../../../mobile-widgets/qmlmanager.cpp \
+    ../../../mobile-widgets/qmlprofile.cpp \
     ../../../qt-models/cylindermodel.cpp \
     ../../../qt-models/divelistmodel.cpp \
     ../../../qt-models/diveplotdatamodel.cpp \
@@ -100,7 +100,7 @@ SOURCES += ../../../subsurface-mobile-main.cpp \
     ../../../profile-widget/diverectitem.cpp \
     ../../../profile-widget/divetextitem.cpp
 
-RESOURCES += qml.qrc ../../../subsurface.qrc ../../../qt-mobile/qml/mobile-resources.qrc
+RESOURCES += qml.qrc ../../../subsurface.qrc ../../../mobile-widgets/qml/mobile-resources.qrc
 
 LIBS += ../install-root/lib/libcrypto.a \
         ../install-root/lib/libdivecomputer.a \
@@ -120,65 +120,65 @@ INCLUDEPATH += ../install-root/include/ \
                ../install-root/include/libexstl \
                ../install-root/include/openssl \
                ../../.. \
-               ../../../subsurface-core
+               ../../../core
 
 HEADERS += \
-    ../../../subsurface-core/libdivecomputer.h \
-    ../../../subsurface-core/cloudstorage.h \
-    ../../../subsurface-core/configuredivecomputerthreads.h \
-    ../../../subsurface-core/device.h \
-    ../../../subsurface-core/devicedetails.h \
-    ../../../subsurface-core/dive.h \
-    ../../../subsurface-core/git-access.h \
-    ../../../subsurface-core/gpslocation.h \
-    ../../../subsurface-core/helpers.h \
-    ../../../subsurface-core/imagedownloader.h \
-    ../../../subsurface-core/pref.h \
-    ../../../subsurface-core/profile.h \
-    ../../../subsurface-core/qthelper.h \
-    ../../../subsurface-core/save-html.h \
-    ../../../subsurface-core/statistics.h \
-    ../../../subsurface-core/units.h \
-    ../../../subsurface-core/qthelperfromc.h \
-    ../../../subsurface-core/version.h \
-    ../../../subsurface-core/planner.h \
-    ../../../subsurface-core/divesite.h \
-    ../../../subsurface-core/checkcloudconnection.h \
-    ../../../subsurface-core/cochran.h \
-    ../../../subsurface-core/color.h \
-    ../../../subsurface-core/configuredivecomputer.h \
-    ../../../subsurface-core/datatrak.h \
-    ../../../subsurface-core/deco.h \
-    ../../../subsurface-core/display.h \
-    ../../../subsurface-core/divecomputer.h \
-    ../../../subsurface-core/divelist.h \
-    ../../../subsurface-core/divelogexportlogic.h \
-    ../../../subsurface-core/divesitehelpers.h \
-    ../../../subsurface-core/exif.h \
-    ../../../subsurface-core/file.h \
-    ../../../subsurface-core/gaspressures.h \
-    ../../../subsurface-core/gettext.h \
-    ../../../subsurface-core/gettextfromc.h \
-    ../../../subsurface-core/isocialnetworkintegration.h \
-    ../../../subsurface-core/membuffer.h \
-    ../../../subsurface-core/metrics.h \
-    ../../../subsurface-core/pluginmanager.h \
-    ../../../subsurface-core/prefs-macros.h \
-    ../../../subsurface-core/qt-gui.h \
-    ../../../subsurface-core/sha1.h \
-    ../../../subsurface-core/strndup.h \
-    ../../../subsurface-core/subsurfacestartup.h \
-    ../../../subsurface-core/subsurfacesysinfo.h \
-    ../../../subsurface-core/taxonomy.h \
-    ../../../subsurface-core/uemis.h \
-    ../../../subsurface-core/webservice.h \
-    ../../../subsurface-core/windowtitleupdate.h \
-    ../../../subsurface-core/worldmap-options.h \
-    ../../../subsurface-core/worldmap-save.h \
-    ../../../subsurface-core/subsurface-qt/DiveObjectHelper.h \
-    ../../../subsurface-core/subsurface-qt/SettingsObjectWrapper.h \
-    ../../../qt-mobile/qmlmanager.h \
-    ../../../qt-mobile/qmlprofile.h \
+    ../../../core/libdivecomputer.h \
+    ../../../core/cloudstorage.h \
+    ../../../core/configuredivecomputerthreads.h \
+    ../../../core/device.h \
+    ../../../core/devicedetails.h \
+    ../../../core/dive.h \
+    ../../../core/git-access.h \
+    ../../../core/gpslocation.h \
+    ../../../core/helpers.h \
+    ../../../core/imagedownloader.h \
+    ../../../core/pref.h \
+    ../../../core/profile.h \
+    ../../../core/qthelper.h \
+    ../../../core/save-html.h \
+    ../../../core/statistics.h \
+    ../../../core/units.h \
+    ../../../core/qthelperfromc.h \
+    ../../../core/version.h \
+    ../../../core/planner.h \
+    ../../../core/divesite.h \
+    ../../../core/checkcloudconnection.h \
+    ../../../core/cochran.h \
+    ../../../core/color.h \
+    ../../../core/configuredivecomputer.h \
+    ../../../core/datatrak.h \
+    ../../../core/deco.h \
+    ../../../core/display.h \
+    ../../../core/divecomputer.h \
+    ../../../core/divelist.h \
+    ../../../core/divelogexportlogic.h \
+    ../../../core/divesitehelpers.h \
+    ../../../core/exif.h \
+    ../../../core/file.h \
+    ../../../core/gaspressures.h \
+    ../../../core/gettext.h \
+    ../../../core/gettextfromc.h \
+    ../../../core/isocialnetworkintegration.h \
+    ../../../core/membuffer.h \
+    ../../../core/metrics.h \
+    ../../../core/pluginmanager.h \
+    ../../../core/prefs-macros.h \
+    ../../../core/qt-gui.h \
+    ../../../core/sha1.h \
+    ../../../core/strndup.h \
+    ../../../core/subsurfacestartup.h \
+    ../../../core/subsurfacesysinfo.h \
+    ../../../core/taxonomy.h \
+    ../../../core/uemis.h \
+    ../../../core/webservice.h \
+    ../../../core/windowtitleupdate.h \
+    ../../../core/worldmap-options.h \
+    ../../../core/worldmap-save.h \
+    ../../../core/subsurface-qt/DiveObjectHelper.h \
+    ../../../core/subsurface-qt/SettingsObjectWrapper.h \
+    ../../../mobile-widgets/qmlmanager.h \
+    ../../../mobile-widgets/qmlprofile.h \
     ../../../qt-models/divelistmodel.h \
     ../../../qt-models/diveplotdatamodel.h \
     ../../../qt-models/gpslistmodel.h \
diff --git a/profile-widget/animationfunctions.cpp b/profile-widget/animationfunctions.cpp
index a19d50c9d..bf47f3204 100644
--- a/profile-widget/animationfunctions.cpp
+++ b/profile-widget/animationfunctions.cpp
@@ -1,5 +1,5 @@
-#include "animationfunctions.h"
-#include "pref.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/pref.h"
 #include <QPropertyAnimation>
 
 namespace Animations {
diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp
index a453d69ea..4270d4b89 100644
--- a/profile-widget/divecartesianaxis.cpp
+++ b/profile-widget/divecartesianaxis.cpp
@@ -1,14 +1,14 @@
-#include "divecartesianaxis.h"
-#include "divetextitem.h"
-#include "helpers.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/divetextitem.h"
+#include "core/helpers.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
-#include "diveplotdatamodel.h"
-#include "animationfunctions.h"
-#include "divelineitem.h"
-#include "profilewidget2.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/animationfunctions.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/profilewidget2.h"
 
 QPen DiveCartesianAxis::gridPen()
 {
diff --git a/profile-widget/divecartesianaxis.h b/profile-widget/divecartesianaxis.h
index a603cebc7..d35af88a1 100644
--- a/profile-widget/divecartesianaxis.h
+++ b/profile-widget/divecartesianaxis.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QGraphicsLineItem>
-#include "subsurface-core/color.h"
+#include "core/color.h"
 #include "profilewidget2.h"
 
 class QPropertyAnimation;
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index 3e1de48f3..daef227d8 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -1,11 +1,11 @@
-#include "diveeventitem.h"
-#include "diveplotdatamodel.h"
-#include "divecartesianaxis.h"
-#include "animationfunctions.h"
-#include "libdivecomputer.h"
-#include "profile.h"
-#include "gettextfromc.h"
-#include "metrics.h"
+#include "profile-widget/diveeventitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/libdivecomputer.h"
+#include "core/profile.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
 
 extern struct ev_select *ev_namelist;
 extern int evn_used;
diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 39c41d19d..2373e992d 100644
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@@ -1,9 +1,9 @@
-#include "divepixmapitem.h"
-#include "animationfunctions.h"
+#include "profile-widget/divepixmapitem.h"
+#include "profile-widget/animationfunctions.h"
 #include "qt-models/divepicturemodel.h"
-#include "pref.h"
+#include "core/pref.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 
 #include <QDesktopServices>
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 022616ef1..d62c35f93 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -1,18 +1,18 @@
-#include "diveprofileitem.h"
-#include "diveplotdatamodel.h"
-#include "divecartesianaxis.h"
-#include "divetextitem.h"
-#include "animationfunctions.h"
-#include "dive.h"
-#include "profile.h"
+#include "profile-widget/diveprofileitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/divetextitem.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/dive.h"
+#include "core/profile.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 #include "qt-models/diveplannermodel.h"
-#include "helpers.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "core/helpers.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #include "libdivecomputer/parser.h"
-#include "profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
 
 #include <QSettings>
 
diff --git a/profile-widget/divetextitem.cpp b/profile-widget/divetextitem.cpp
index ab816b32a..1f4576dc6 100644
--- a/profile-widget/divetextitem.cpp
+++ b/profile-widget/divetextitem.cpp
@@ -1,6 +1,6 @@
 #include "divetextitem.h"
 #include "profilewidget2.h"
-#include "subsurface-core/color.h"
+#include "core/color.h"
 
 #include <QBrush>
 #include <QDebug>
diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp
index 6d6405056..49e9bdca7 100644
--- a/profile-widget/divetooltipitem.cpp
+++ b/profile-widget/divetooltipitem.cpp
@@ -1,19 +1,14 @@
-#include "divetooltipitem.h"
-#include "divecartesianaxis.h"
-#include "dive.h"
-#include "profile.h"
-#include "membuffer.h"
-#include "metrics.h"
+#include "profile-widget/divetooltipitem.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/dive.h"
+#include "core/profile.h"
+#include "core/membuffer.h"
+#include "core/metrics.h"
 #include <QPropertyAnimation>
 #include <QSettings>
 #include <QGraphicsView>
 #include <QStyleOptionGraphicsItem>
 
-#define PORT_IN_PROGRESS 1
-#ifdef PORT_IN_PROGRESS
-#include "display.h"
-#endif
-
 void ToolTipItem::addToolTip(const QString &toolTip, const QIcon &icon, const QPixmap& pixmap)
 {
 	const IconMetrics& iconMetrics = defaultIconMetrics();
diff --git a/profile-widget/divetooltipitem.h b/profile-widget/divetooltipitem.h
index 4fa7ec2d7..a26593a18 100644
--- a/profile-widget/divetooltipitem.h
+++ b/profile-widget/divetooltipitem.h
@@ -7,7 +7,7 @@
 #include <QRectF>
 #include <QIcon>
 #include <QTime>
-#include "display.h"
+#include "core/display.h"
 
 class DiveCartesianAxis;
 class QGraphicsLineItem;
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 35a9594a3..5aa0c53a5 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1,24 +1,24 @@
-#include "profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
 #include "qt-models/diveplotdatamodel.h"
-#include "helpers.h"
-#include "profile.h"
-#include "diveeventitem.h"
-#include "divetextitem.h"
-#include "divetooltipitem.h"
-#include "planner.h"
-#include "device.h"
-#include "ruleritem.h"
-#include "tankitem.h"
-#include "pref.h"
+#include "core/helpers.h"
+#include "core/profile.h"
+#include "profile-widget/diveeventitem.h"
+#include "profile-widget/divetextitem.h"
+#include "profile-widget/divetooltipitem.h"
+#include "core/planner.h"
+#include "core/device.h"
+#include "profile-widget/ruleritem.h"
+#include "profile-widget/tankitem.h"
+#include "core/pref.h"
 #include "qt-models/diveplannermodel.h"
 #include "qt-models/models.h"
 #include "qt-models/divepicturemodel.h"
-#include "divelist.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "core/divelist.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #ifndef SUBSURFACE_MOBILE
-#include "diveplanner.h"
-#include "simplewidgets.h"
-#include "divepicturewidget.h"
+#include "desktop-widgets/diveplanner.h"
+#include "desktop-widgets/simplewidgets.h"
+#include "desktop-widgets/divepicturewidget.h"
 #endif
 
 #include <libdivecomputer/parser.h>
@@ -35,7 +35,7 @@
 #include <QTableView>
 #endif
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 #include <QtWidgets>
 
diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h
index 5e05b14f8..d745517f1 100644
--- a/profile-widget/profilewidget2.h
+++ b/profile-widget/profilewidget2.h
@@ -13,9 +13,9 @@
 //  *
 //  * It needs to be dynamic, things should *flow* on it, not just appear / disappear.
 //  */
-#include "divelineitem.h"
-#include "diveprofileitem.h"
-#include "display.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/diveprofileitem.h"
+#include "core/display.h"
 
 class RulerItem2;
 struct dive;
diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp
index ce217b918..c5712de54 100644
--- a/profile-widget/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
@@ -1,14 +1,14 @@
-#include "ruleritem.h"
+#include "profile-widget/ruleritem.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
-#include "profilewidget2.h"
-#include "display.h"
-#include "subsurface-core/subsurface-qt/SettingsObjectWrapper.h"
+#include "profile-widget/profilewidget2.h"
+#include "core/display.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 
 #include <qgraphicssceneevent.h>
 
-#include "profile.h"
+#include "core/profile.h"
 
 RulerNodeItem2::RulerNodeItem2() :
 	entry(NULL),
diff --git a/profile-widget/ruleritem.h b/profile-widget/ruleritem.h
index 343a24862..dceab9178 100644
--- a/profile-widget/ruleritem.h
+++ b/profile-widget/ruleritem.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <QGraphicsEllipseItem>
 #include <QGraphicsObject>
-#include "divecartesianaxis.h"
-#include "display.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/display.h"
 
 struct plot_data;
 class RulerItem2;
diff --git a/profile-widget/tankitem.cpp b/profile-widget/tankitem.cpp
index aba41d660..e4663b8f9 100644
--- a/profile-widget/tankitem.cpp
+++ b/profile-widget/tankitem.cpp
@@ -1,7 +1,7 @@
-#include "tankitem.h"
-#include "diveplotdatamodel.h"
-#include "divetextitem.h"
-#include "profile.h"
+#include "profile-widget/tankitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divetextitem.h"
+#include "core/profile.h"
 #include <QPen>
 
 TankItem::TankItem(QObject *parent) :
diff --git a/profile-widget/tankitem.h b/profile-widget/tankitem.h
index fd685fc82..2efcd34a8 100644
--- a/profile-widget/tankitem.h
+++ b/profile-widget/tankitem.h
@@ -4,9 +4,9 @@
 #include <QGraphicsItem>
 #include <QModelIndex>
 #include <QBrush>
-#include "divelineitem.h"
-#include "divecartesianaxis.h"
-#include "dive.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/dive.h"
 
 class TankItem : public QObject, public QGraphicsRectItem
 {
diff --git a/qt-models/cleanertablemodel.cpp b/qt-models/cleanertablemodel.cpp
index 77d3f3369..ac8d10a33 100644
--- a/qt-models/cleanertablemodel.cpp
+++ b/qt-models/cleanertablemodel.cpp
@@ -1,5 +1,5 @@
 #include "cleanertablemodel.h"
-#include "metrics.h"
+#include "core/metrics.h"
 
 CleanerTableModel::CleanerTableModel(QObject *parent) : QAbstractTableModel(parent)
 {
diff --git a/qt-models/completionmodels.cpp b/qt-models/completionmodels.cpp
index a8b61aed5..7839398ee 100644
--- a/qt-models/completionmodels.cpp
+++ b/qt-models/completionmodels.cpp
@@ -1,5 +1,5 @@
-#include "completionmodels.h"
-#include "dive.h"
+#include "qt-models/completionmodels.h"
+#include "core/dive.h"
 #include <QSet>
 #include <QString>
 
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index af01650a4..b1ce0be24 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -1,11 +1,11 @@
 #include "cylindermodel.h"
 #include "tankinfomodel.h"
 #include "models.h"
-#include "helpers.h"
-#include "dive.h"
-#include "color.h"
-#include "diveplannermodel.h"
-#include "gettextfromc.h"
+#include "core/helpers.h"
+#include "core/dive.h"
+#include "core/color.h"
+#include "qt-models/diveplannermodel.h"
+#include "core/gettextfromc.h"
 
 CylindersModel::CylindersModel(QObject *parent) :
 	CleanerTableModel(parent),
diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h
index 9556bcc02..7115dbe25 100644
--- a/qt-models/cylindermodel.h
+++ b/qt-models/cylindermodel.h
@@ -2,7 +2,7 @@
 #define CYLINDERMODEL_H
 
 #include "cleanertablemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 /* Encapsulation of the Cylinder Model, that presents the
  * Current cylinders that are used on a dive. */
diff --git a/qt-models/divecomputerextradatamodel.cpp b/qt-models/divecomputerextradatamodel.cpp
index 0f89a2a6b..d71c606a4 100644
--- a/qt-models/divecomputerextradatamodel.cpp
+++ b/qt-models/divecomputerextradatamodel.cpp
@@ -1,6 +1,6 @@
-#include "divecomputerextradatamodel.h"
-#include "dive.h"
-#include "metrics.h"
+#include "qt-models/divecomputerextradatamodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
 
 
 ExtraDataModel::ExtraDataModel(QObject *parent) : CleanerTableModel(parent),
diff --git a/qt-models/divecomputermodel.cpp b/qt-models/divecomputermodel.cpp
index 58641ff77..0dd110fcc 100644
--- a/qt-models/divecomputermodel.cpp
+++ b/qt-models/divecomputermodel.cpp
@@ -1,6 +1,6 @@
-#include "divecomputermodel.h"
-#include "dive.h"
-#include "divelist.h"
+#include "qt-models/divecomputermodel.h"
+#include "core/dive.h"
+#include "core/divelist.h"
 
 DiveComputerModel::DiveComputerModel(QMultiMap<QString, DiveComputerNode> &dcMap, QObject *parent) : CleanerTableModel(parent)
 {
diff --git a/qt-models/divecomputermodel.h b/qt-models/divecomputermodel.h
index bed48b81a..fe1b437ba 100644
--- a/qt-models/divecomputermodel.h
+++ b/qt-models/divecomputermodel.h
@@ -1,8 +1,8 @@
 #ifndef DIVECOMPUTERMODEL_H
 #define DIVECOMPUTERMODEL_H
 
-#include "cleanertablemodel.h"
-#include "divecomputer.h"
+#include "qt-models/cleanertablemodel.h"
+#include "core/divecomputer.h"
 
 class DiveComputerModel : public CleanerTableModel {
 	Q_OBJECT
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp
index af6825285..79d770853 100644
--- a/qt-models/divelistmodel.cpp
+++ b/qt-models/divelistmodel.cpp
@@ -1,5 +1,5 @@
-#include "divelistmodel.h"
-#include "helpers.h"
+#include "qt-models/divelistmodel.h"
+#include "core/helpers.h"
 #include <QDateTime>
 
 DiveListSortModel::DiveListSortModel(QObject *parent) : QSortFilterProxyModel(parent)
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h
index aae3bfc74..39c3497b9 100644
--- a/qt-models/divelistmodel.h
+++ b/qt-models/divelistmodel.h
@@ -4,9 +4,9 @@
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
-#include "dive.h"
-#include "helpers.h"
-#include "subsurface-qt/DiveObjectHelper.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "core/subsurface-qt/DiveObjectHelper.h"
 
 class DiveListSortModel : public QSortFilterProxyModel
 {
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index f77953760..877ca0552 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -1,6 +1,6 @@
-#include "units.h"
-#include "divelocationmodel.h"
-#include "dive.h"
+#include "core/units.h"
+#include "qt-models/divelocationmodel.h"
+#include "core/dive.h"
 #include <QDebug>
 #include <QLineEdit>
 #include <QIcon>
diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h
index 185e0bc5f..cee67c5fe 100644
--- a/qt-models/divelocationmodel.h
+++ b/qt-models/divelocationmodel.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <QStringListModel>
 #include <stdint.h>
-#include "units.h"
+#include "core/units.h"
 #include "ssrfsortfilterproxymodel.h"
 
 class QLineEdit;
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp
index 173cf9dd0..04738eed0 100644
--- a/qt-models/divepicturemodel.cpp
+++ b/qt-models/divepicturemodel.cpp
@@ -1,8 +1,8 @@
-#include "divepicturemodel.h"
-#include "dive.h"
-#include "metrics.h"
-#include "divelist.h"
-#include "imagedownloader.h"
+#include "qt-models/divepicturemodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
+#include "core/divelist.h"
+#include "core/imagedownloader.h"
 
 #include <QtConcurrent>
 
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index c3996d077..16a2e40eb 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -1,9 +1,9 @@
 #include "diveplannermodel.h"
-#include "dive.h"
-#include "helpers.h"
-#include "cylindermodel.h"
-#include "planner.h"
-#include "models.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "qt-models/cylindermodel.h"
+#include "core/planner.h"
+#include "qt-models/models.h"
 
 /* TODO: Port this to CleanerTableModel to remove a bit of boilerplate and
  * use the signal warningMessage() to communicate errors to the MainWindow.
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index b87ed84c3..0770aa077 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <QDateTime>
 
-#include "dive.h"
+#include "core/dive.h"
 
 class DivePlannerPointsModel : public QAbstractTableModel {
 	Q_OBJECT
diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp
index 7a7ab195f..5bb9ebbd1 100644
--- a/qt-models/diveplotdatamodel.cpp
+++ b/qt-models/diveplotdatamodel.cpp
@@ -1,8 +1,8 @@
-#include "diveplotdatamodel.h"
-#include "dive.h"
-#include "profile.h"
-#include "divelist.h"
-#include "subsurface-core/color.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "core/dive.h"
+#include "core/profile.h"
+#include "core/divelist.h"
+#include "core/color.h"
 
 DivePlotDataModel::DivePlotDataModel(QObject *parent) :
 	QAbstractTableModel(parent),
diff --git a/qt-models/diveplotdatamodel.h b/qt-models/diveplotdatamodel.h
index 21b0ffd5b..ef5b544cb 100644
--- a/qt-models/diveplotdatamodel.h
+++ b/qt-models/diveplotdatamodel.h
@@ -3,7 +3,7 @@
 
 #include <QAbstractTableModel>
 
-#include "display.h"
+#include "core/display.h"
 
 struct dive;
 struct plot_data;
diff --git a/qt-models/divesitepicturesmodel.cpp b/qt-models/divesitepicturesmodel.cpp
index 3777f1d36..272716b07 100644
--- a/qt-models/divesitepicturesmodel.cpp
+++ b/qt-models/divesitepicturesmodel.cpp
@@ -1,6 +1,6 @@
-#include "divesitepicturesmodel.h"
-#include "dive.h"
-#include "stdint.h"
+#include "qt-models/divesitepicturesmodel.h"
+#include "core/dive.h"
+#include <stdint.h>
 
 #include <QtConcurrent>
 #include <QPixmap>
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 78a7a7420..e0f95b0b3 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -1,8 +1,8 @@
-#include "divetripmodel.h"
-#include "gettextfromc.h"
-#include "metrics.h"
-#include "divelist.h"
-#include "helpers.h"
+#include "qt-models/divetripmodel.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
+#include "core/divelist.h"
+#include "core/helpers.h"
 #include <QIcon>
 
 static int nitrox_sort_value(struct dive *dive)
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index 31cee9633..7844d813f 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -2,7 +2,7 @@
 #define DIVETRIPMODEL_H
 
 #include "treemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 struct DiveItem : public TreeItem {
 	Q_DECLARE_TR_FUNCTIONS(TripItem)
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp
index 452b1077f..b4aacf1bd 100644
--- a/qt-models/filtermodels.cpp
+++ b/qt-models/filtermodels.cpp
@@ -1,7 +1,7 @@
-#include "filtermodels.h"
-#include "models.h"
-#include "display.h"
-#include "divetripmodel.h"
+#include "qt-models/filtermodels.h"
+#include "qt-models/models.h"
+#include "core/display.h"
+#include "qt-models/divetripmodel.h"
 
 #include <QDebug>
 
@@ -309,7 +309,7 @@ MultiFilterSortModel::MultiFilterSortModel(QObject *parent) :
 	QSortFilterProxyModel(parent),
 	divesDisplayed(0),
 	justCleared(false),
-	curr_dive_site(NULL)	
+	curr_dive_site(NULL)
 {
 }
 
diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp
index 3ea03f040..0023198f7 100644
--- a/qt-models/gpslistmodel.cpp
+++ b/qt-models/gpslistmodel.cpp
@@ -1,5 +1,5 @@
-#include "gpslistmodel.h"
-#include "helpers.h"
+#include "qt-models/gpslistmodel.h"
+#include "core/helpers.h"
 #include <QVector>
 
 GpsListModel *GpsListModel::m_instance = NULL;
diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h
index 870540b4f..34eae4c56 100644
--- a/qt-models/gpslistmodel.h
+++ b/qt-models/gpslistmodel.h
@@ -1,7 +1,7 @@
 #ifndef GPSLISTMODEL_H
 #define GPSLISTMODEL_H
 
-#include "gpslocation.h"
+#include "core/gpslocation.h"
 #include <QObject>
 #include <QAbstractListModel>
 
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index 48b22797c..d02f466a4 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -4,8 +4,8 @@
  * classes for the equipment models of Subsurface
  *
  */
-#include "models.h"
-#include "helpers.h"
+#include "qt-models/models.h"
+#include "core/helpers.h"
 
 #include <QLocale>
 #include <QSettings>
diff --git a/qt-models/models.h b/qt-models/models.h
index f152af469..8e4aba6af 100644
--- a/qt-models/models.h
+++ b/qt-models/models.h
@@ -13,11 +13,11 @@
 #include <QSortFilterProxyModel>
 #include <QPixmap>
 
-#include "metrics.h"
+#include "core/metrics.h"
 
-#include "subsurface-core/dive.h"
-#include "subsurface-core/divelist.h"
-#include "subsurface-core/divecomputer.h"
+#include "core/dive.h"
+#include "core/divelist.h"
+#include "core/divecomputer.h"
 #include "cleanertablemodel.h"
 #include "treemodel.h"
 
diff --git a/qt-models/tankinfomodel.cpp b/qt-models/tankinfomodel.cpp
index b32437392..3e9e654bf 100644
--- a/qt-models/tankinfomodel.cpp
+++ b/qt-models/tankinfomodel.cpp
@@ -1,7 +1,7 @@
-#include "tankinfomodel.h"
-#include "dive.h"
-#include "gettextfromc.h"
-#include "metrics.h"
+#include "qt-models/tankinfomodel.h"
+#include "core/dive.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
 
 TankInfoModel *TankInfoModel::instance()
 {
diff --git a/qt-models/treemodel.cpp b/qt-models/treemodel.cpp
index 01db3520f..b98f3f4db 100644
--- a/qt-models/treemodel.cpp
+++ b/qt-models/treemodel.cpp
@@ -1,5 +1,5 @@
-#include "treemodel.h"
-#include "metrics.h"
+#include "qt-models/treemodel.h"
+#include "core/metrics.h"
 
 TreeItem::TreeItem()
 {
diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp
index 1ab8c24c8..ec1398d0e 100644
--- a/qt-models/weightmodel.cpp
+++ b/qt-models/weightmodel.cpp
@@ -1,9 +1,9 @@
-#include "weightmodel.h"
-#include "dive.h"
-#include "gettextfromc.h"
-#include "metrics.h"
-#include "helpers.h"
-#include "weigthsysteminfomodel.h"
+#include "qt-models/weightmodel.h"
+#include "core/dive.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
+#include "core/helpers.h"
+#include "qt-models/weigthsysteminfomodel.h"
 
 WeightModel::WeightModel(QObject *parent) : CleanerTableModel(parent),
 	changed(false),
diff --git a/qt-models/weightmodel.h b/qt-models/weightmodel.h
index 5ab67e592..d251dec68 100644
--- a/qt-models/weightmodel.h
+++ b/qt-models/weightmodel.h
@@ -2,7 +2,7 @@
 #define WEIGHTMODEL_H
 
 #include "cleanertablemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 /* Encapsulation of the Weight Model, that represents
  * the current weights on a dive. */
diff --git a/qt-models/weigthsysteminfomodel.cpp b/qt-models/weigthsysteminfomodel.cpp
index daa305284..c7d9e7fad 100644
--- a/qt-models/weigthsysteminfomodel.cpp
+++ b/qt-models/weigthsysteminfomodel.cpp
@@ -1,7 +1,7 @@
-#include "weigthsysteminfomodel.h"
-#include "dive.h"
-#include "metrics.h"
-#include "gettextfromc.h"
+#include "qt-models/weigthsysteminfomodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
+#include "core/gettextfromc.h"
 
 WSInfoModel *WSInfoModel::instance()
 {
diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp
index f6579f499..8c96ff14a 100644
--- a/qt-models/yearlystatisticsmodel.cpp
+++ b/qt-models/yearlystatisticsmodel.cpp
@@ -1,8 +1,8 @@
-#include "yearlystatisticsmodel.h"
-#include "dive.h"
-#include "helpers.h"
-#include "metrics.h"
-#include "statistics.h"
+#include "qt-models/yearlystatisticsmodel.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "core/metrics.h"
+#include "core/statistics.h"
 
 class YearStatisticsItem : public TreeItem {
 public:
diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh
index 7f589309c..d406f7148 100755
--- a/scripts/mobilecomponents.sh
+++ b/scripts/mobilecomponents.sh
@@ -9,7 +9,7 @@
 
 SRC=$(cd .. ; pwd)
 
-if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core" ] ; then
+if [ ! -d "$SRC/subsurface" ] || [ ! -d "mobile-widgets" ] || [ ! -d "core" ] ; then
 	echo "please start this script from the Subsurface source directory (which needs to be named \"subsurface\")."
 	exit 1
 fi
@@ -43,7 +43,7 @@ if [ "$NOPULL" = "" ] ; then
 fi
 
 # now copy the components and a couple of icons into plae
-MC=$SRC/subsurface/qt-mobile/qml/kirigami
+MC=$SRC/subsurface/mobile-widgets/qml/kirigami
 PMMC=kirigami/src/qml
 BREEZE=breeze-icons
 
diff --git a/subsurface-desktop-helper.cpp b/subsurface-desktop-helper.cpp
index 420f75249..ef349ad3d 100644
--- a/subsurface-desktop-helper.cpp
+++ b/subsurface-desktop-helper.cpp
@@ -1,27 +1,26 @@
 /* qt-gui.cpp */
 /* Qt UI implementation */
-#include "dive.h"
-#include "display.h"
+#include "core/dive.h"
+#include "core/display.h"
 #include "desktop-widgets/mainwindow.h"
-#include "helpers.h"
-#include "pluginmanager.h"
+#include "core/helpers.h"
+#include "core/pluginmanager.h"
 
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QNetworkProxy>
 #include <QLibraryInfo>
 
-
-#include "qt-gui.h"
+#include "core/qt-gui.h"
 
 #ifdef SUBSURFACE_MOBILE
 #include <QQuickWindow>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QSortFilterProxyModel>
-#include "qt-mobile/qmlmanager.h"
+#include "mobile-widgets/qmlmanager.h"
 #include "qt-models/divelistmodel.h"
-#include "qt-mobile/qmlprofile.h"
+#include "mobile-widgets/qmlprofile.h"
 QObject *qqWindowObject = NULL;
 #endif
 
diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp
index b93b642bd..0bdad42a2 100644
--- a/subsurface-desktop-main.cpp
+++ b/subsurface-desktop-main.cpp
@@ -5,16 +5,16 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "dive.h"
-#include "qt-gui.h"
-#include "subsurfacestartup.h"
+#include "core/dive.h"
+#include "core/qt-gui.h"
+#include "core/subsurfacestartup.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/maintab.h"
 #include "profile-widget/profilewidget2.h"
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #include "desktop-widgets/diveplanner.h"
-#include "subsurface-core/color.h"
-#include "qthelper.h"
+#include "core/color.h"
+#include "core/qthelper.h"
 
 #include <QStringList>
 #include <QApplication>
diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp
index 214d65e79..b4a54d11c 100644
--- a/subsurface-mobile-helper.cpp
+++ b/subsurface-mobile-helper.cpp
@@ -1,25 +1,25 @@
 /* qt-gui.cpp */
 /* Qt UI implementation */
-#include "dive.h"
-#include "display.h"
-#include "helpers.h"
+#include "core/dive.h"
+#include "core/display.h"
+#include "core/helpers.h"
 
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QNetworkProxy>
 #include <QLibraryInfo>
 
-#include "qt-gui.h"
+#include "core/qt-gui.h"
 
 #include <QQuickWindow>
 #include <QScreen>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QSortFilterProxyModel>
-#include "qt-mobile/qmlmanager.h"
+#include "mobile-widgets/qmlmanager.h"
 #include "qt-models/divelistmodel.h"
 #include "qt-models/gpslistmodel.h"
-#include "qt-mobile/qmlprofile.h"
+#include "mobile-widgets/qmlprofile.h"
 
 QObject *qqWindowObject = NULL;
 
diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp
index 940c9225b..e5965090b 100644
--- a/subsurface-mobile-main.cpp
+++ b/subsurface-mobile-main.cpp
@@ -5,12 +5,12 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "dive.h"
-#include "qt-gui.h"
-#include "subsurfacestartup.h"
-#include "subsurface-core/color.h"
-#include "qthelper.h"
-#include "helpers.h"
+#include "core/dive.h"
+#include "core/qt-gui.h"
+#include "core/subsurfacestartup.h"
+#include "core/color.h"
+#include "core/qthelper.h"
+#include "core/helpers.h"
 
 #include <QStringList>
 #include <QApplication>