diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index 5293f1ed5..6dc6d350f 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -43,7 +43,12 @@ win32 {
     include(../rpath.pri)
 
     equals(copyqt, 1) {
-        RESOURCES += qtconf.qrc
+        RESOURCES += $$OUT_PWD/qtconf.qrc
+
+        # Copy qtconf.qrc to OUT_PWD because paths are relative
+        # This needs to be done at qmake time because the Makefile depends on it
+        system(cp $$PWD/qtconf.qrc.in $$OUT_PWD/qtconf.qrc)
+        system(printf $$shell_quote([Paths]\nPrefix = $$relative_path($$GCS_QT_BASEPATH, $$GCS_APP_PATH)\n) > $$OUT_PWD/qt.conf)
     }
 }
 
diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp
index 02338ba9e..e0b251e09 100644
--- a/ground/openpilotgcs/src/app/main.cpp
+++ b/ground/openpilotgcs/src/app/main.cpp
@@ -342,7 +342,7 @@ AppOptionValues parseCommandLine(SharedTools::QtSingleApplication &app,
 
 void loadFactoryDefaults(QSettings &settings, AppOptionValues &appOptionValues)
 {
-    QDir directory(Utils::PathUtils().GetDataPath() + QString("default_configurations"));
+    QDir directory(Utils::GetDataPath() + QString("default_configurations"));
 
     qDebug() << "Looking for factory defaults configuration files in:" << directory.absolutePath();
 
@@ -414,7 +414,7 @@ void overrideSettings(QSettings &settings, int argc, char * *argv)
 
 void loadTranslators(QString language, QTranslator &translator, QTranslator &qtTranslator)
 {
-    const QString &creatorTrPath = Utils::PathUtils().GetDataPath() + QLatin1String("translations");
+    const QString &creatorTrPath = Utils::GetDataPath() + QLatin1String("translations");
 
     if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) {
         const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
@@ -472,7 +472,7 @@ int main(int argc, char * *argv)
     // load user settings
     // Must be done before any QSettings class is created
     // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp
-    QString settingsPath = Utils::PathUtils().GetDataPath();
+    QString settingsPath = Utils::GetDataPath();
     qDebug() << "Loading system settings from" << settingsPath;
     QSettings::setPath(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, settingsPath);
     QSettings settings;
diff --git a/ground/openpilotgcs/src/app/qt.conf b/ground/openpilotgcs/src/app/qt.conf
deleted file mode 100644
index f83499f3f..000000000
--- a/ground/openpilotgcs/src/app/qt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Prefix = ../lib/openpilotgcs/qt5/
diff --git a/ground/openpilotgcs/src/app/qtconf.qrc b/ground/openpilotgcs/src/app/qtconf.qrc.in
similarity index 95%
rename from ground/openpilotgcs/src/app/qtconf.qrc
rename to ground/openpilotgcs/src/app/qtconf.qrc.in
index bd4633fa9..8ebe9970f 100644
--- a/ground/openpilotgcs/src/app/qtconf.qrc
+++ b/ground/openpilotgcs/src/app/qtconf.qrc.in
@@ -1,5 +1,5 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="qt/etc/qt.conf">qt.conf</file>
-</qresource>
-</RCC>
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="qt/etc/qt.conf">qt.conf</file>
+</qresource>
+</RCC>
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp
index 47704b63a..973286cb8 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp
@@ -54,7 +54,7 @@ QString Cache::CacheLocation()
 Cache::Cache()
 {
     if (cache.isNull() | cache.isEmpty()) {
-        cache = Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator();
+        cache = Utils::GetStoragePath() + "mapscache" + QDir::separator();
         setCacheLocation(cache);
     }
 }
diff --git a/ground/openpilotgcs/src/libs/utils/pathutils.cpp b/ground/openpilotgcs/src/libs/utils/pathutils.cpp
index 2f0b234b6..5c545a340 100644
--- a/ground/openpilotgcs/src/libs/utils/pathutils.cpp
+++ b/ground/openpilotgcs/src/libs/utils/pathutils.cpp
@@ -33,15 +33,12 @@
 
 
 namespace Utils {
-PathUtils::PathUtils()
-{}
-
 /**
    Returns the base path of the share directory.
 
    Path is in Qt/Unix conventions, separated by "/".
  */
-QString PathUtils::GetDataPath()
+QString GetDataPath()
 {
     QString dataPath = QApplication::applicationDirPath();
     dataPath += QLatin1Char('/');
@@ -56,7 +53,7 @@ QString PathUtils::GetDataPath()
 
    Always returns a path converted to "/".
  */
-QString PathUtils::RemoveDataPath(QString path)
+QString RemoveDataPath(QString path)
 {
     // Depending on the platform, we might get either "/" or "\"
     // so we need to go to the standard ("/")
@@ -75,7 +72,7 @@ QString PathUtils::RemoveDataPath(QString path)
 
    Returns a "/" or "\" separated path depending on platform conventions.
  */
-QString PathUtils::InsertDataPath(QString path)
+QString InsertDataPath(QString path)
 {
     if (path.startsWith(QString("%%DATAPATH%%"))) {
         QString newPath = GetDataPath();
@@ -88,7 +85,7 @@ QString PathUtils::InsertDataPath(QString path)
 /**
    Gets a standard user-writable location for the system
  */
-QString PathUtils::GetStoragePath()
+QString GetStoragePath()
 {
     return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/');
 }
@@ -96,7 +93,7 @@ QString PathUtils::GetStoragePath()
 /**
    Removes the standard storage path and replace with a tag
  */
-QString PathUtils::RemoveStoragePath(QString path)
+QString RemoveStoragePath(QString path)
 {
     // Depending on the platform, we might get either "/" or "\"
     // so we need to go to the standard ("/")
@@ -113,7 +110,7 @@ QString PathUtils::RemoveStoragePath(QString path)
 /**
    Inserts the standard storage path is there is a storage path tag
  */
-QString PathUtils::InsertStoragePath(QString path)
+QString InsertStoragePath(QString path)
 {
     if (path.startsWith(QString("%%STOREPATH%%"))) {
         QString newPath = GetStoragePath();
diff --git a/ground/openpilotgcs/src/libs/utils/pathutils.h b/ground/openpilotgcs/src/libs/utils/pathutils.h
index 659ea6e91..d54ccf2a0 100644
--- a/ground/openpilotgcs/src/libs/utils/pathutils.h
+++ b/ground/openpilotgcs/src/libs/utils/pathutils.h
@@ -36,17 +36,13 @@
 #include <QSettings>
 
 namespace Utils {
-class QTCREATOR_UTILS_EXPORT PathUtils {
-public:
-    PathUtils();
-    QString GetDataPath();
-    QString RemoveDataPath(QString path);
-    QString InsertDataPath(QString path);
+QTCREATOR_UTILS_EXPORT QString GetDataPath();
+QTCREATOR_UTILS_EXPORT QString RemoveDataPath(QString path);
+QTCREATOR_UTILS_EXPORT QString InsertDataPath(QString path);
 
-    QString GetStoragePath();
-    QString RemoveStoragePath(QString path);
-    QString InsertStoragePath(QString path);
-};
+QTCREATOR_UTILS_EXPORT QString GetStoragePath();
+QTCREATOR_UTILS_EXPORT QString RemoveStoragePath(QString path);
+QTCREATOR_UTILS_EXPORT QString InsertStoragePath(QString path);
 }
 
 #endif /* PATHUTILS_H */
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp b/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
index 5ee027096..a6e3ab31d 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
@@ -31,6 +31,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QCoreApplication>
 
+#include "utils/pathutils.h"
+
 namespace Core {
 namespace Internal {
 // The Core Singleton
@@ -125,15 +127,9 @@ SettingsDatabase *CoreImpl::settingsDatabase() const
     return m_mainwindow->settingsDatabase();
 }
 
-#ifdef Q_OS_MAC
-#  define SHARE_PATH "/../Resources"
-#else
-#  define SHARE_PATH "/../share/openpilotgcs"
-#endif
-
 QString CoreImpl::resourcePath() const
 {
-    return QDir::cleanPath(QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH));
+    return QDir::cleanPath(Utils::GetDataPath());
 }
 
 IContext *CoreImpl::currentContextObject() const
diff --git a/ground/openpilotgcs/src/plugins/dial/dialgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/dial/dialgadgetconfiguration.cpp
index d85e64089..6d5d2115f 100644
--- a/ground/openpilotgcs/src/plugins/dial/dialgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/dial/dialgadgetconfiguration.cpp
@@ -60,7 +60,7 @@ DialGadgetConfiguration::DialGadgetConfiguration(QString classId, QSettings *qSe
     if (qSettings != 0) {
         QString dialFile = qSettings->value("dialFile").toString();
 
-        m_defaultDial      = Utils::PathUtils().InsertDataPath(dialFile);
+        m_defaultDial      = Utils::InsertDataPath(dialFile);
         dialBackgroundID   = qSettings->value("dialBackgroundID").toString();
         dialForegroundID   = qSettings->value("dialForegroundID").toString();
         dialNeedleID1      = qSettings->value("dialNeedleID1").toString();
@@ -135,7 +135,7 @@ IUAVGadgetConfiguration *DialGadgetConfiguration::clone()
  */
 void DialGadgetConfiguration::saveConfig(QSettings *settings) const
 {
-    QString dialFile = Utils::PathUtils().RemoveDataPath(m_defaultDial);
+    QString dialFile = Utils::RemoveDataPath(m_defaultDial);
 
     settings->setValue("dialFile", dialFile);
 
diff --git a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetconfiguration.cpp
index 1bfc5a434..7fd74d7ed 100644
--- a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetconfiguration.cpp
@@ -52,7 +52,7 @@ LineardialGadgetConfiguration::LineardialGadgetConfiguration(QString classId, QS
     // if a saved configuration exists load it
     if (qSettings != 0) {
         QString dFile = qSettings->value("dFile").toString();
-        dialFile          = Utils::PathUtils().InsertDataPath(dFile);
+        dialFile          = Utils::InsertDataPath(dFile);
         sourceDataObject  = qSettings->value("sourceDataObject").toString();
         sourceObjectField = qSettings->value("sourceObjectField").toString();
         minValue          = qSettings->value("minValue").toDouble();
@@ -103,7 +103,7 @@ IUAVGadgetConfiguration *LineardialGadgetConfiguration::clone()
  */
 void LineardialGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
-    QString dFile = Utils::PathUtils().RemoveDataPath(dialFile);
+    QString dFile = Utils::RemoveDataPath(dialFile);
 
     qSettings->setValue("dFile", dFile);
     qSettings->setValue("sourceDataObject", sourceDataObject);
diff --git a/ground/openpilotgcs/src/plugins/modelview/modelviewgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/modelview/modelviewgadgetconfiguration.cpp
index dd886d17f..7e2f550ff 100644
--- a/ground/openpilotgcs/src/plugins/modelview/modelviewgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/modelview/modelviewgadgetconfiguration.cpp
@@ -30,7 +30,7 @@
 
 ModelViewGadgetConfiguration::ModelViewGadgetConfiguration(QString classId, QSettings *qSettings, QObject *parent) :
     IUAVGadgetConfiguration(classId, parent),
-    m_acFilename("../share/openpilotgcs/models/planes/Easystar/EasyStar.3ds"),
+    m_acFilename(Utils::GetDataPath() + QString("models/planes/Easystar/EasyStar.3ds")),
     m_bgFilename(""),
     m_enableVbo(false)
 {
@@ -39,8 +39,8 @@ ModelViewGadgetConfiguration::ModelViewGadgetConfiguration(QString classId, QSet
         QString modelFile = qSettings->value("acFilename").toString();
         QString bgFile    = qSettings->value("bgFilename").toString();
         m_enableVbo  = qSettings->value("enableVbo").toBool();
-        m_acFilename = Utils::PathUtils().InsertDataPath(modelFile);
-        m_bgFilename = Utils::PathUtils().InsertDataPath(bgFile);
+        m_acFilename = Utils::InsertDataPath(modelFile);
+        m_bgFilename = Utils::InsertDataPath(bgFile);
     }
 }
 
@@ -60,7 +60,7 @@ IUAVGadgetConfiguration *ModelViewGadgetConfiguration::clone()
  */
 void ModelViewGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
-    qSettings->setValue("acFilename", Utils::PathUtils().RemoveDataPath(m_acFilename));
-    qSettings->setValue("bgFilename", Utils::PathUtils().RemoveDataPath(m_bgFilename));
+    qSettings->setValue("acFilename", Utils::RemoveDataPath(m_acFilename));
+    qSettings->setValue("bgFilename", Utils::RemoveDataPath(m_bgFilename));
     qSettings->setValue("enableVbo", m_enableVbo);
 }
diff --git a/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp b/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
index 358974388..a5d0e702c 100644
--- a/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
@@ -105,7 +105,7 @@ void NotificationItem::copyTo(NotificationItem *that) const
 
 void NotificationItem::saveState(QSettings *settings) const
 {
-    settings->setValue("SoundCollectionPath", Utils::PathUtils().RemoveDataPath(getSoundCollectionPath()));
+    settings->setValue("SoundCollectionPath", Utils::RemoveDataPath(getSoundCollectionPath()));
     settings->setValue(QLatin1String("CurrentLanguage"), getCurrentLanguage());
     settings->setValue(QLatin1String("ObjectField"), getObjectField());
     settings->setValue(QLatin1String("DataObject"), getDataObject());
@@ -124,7 +124,7 @@ void NotificationItem::saveState(QSettings *settings) const
 void NotificationItem::restoreState(QSettings *settings)
 {
     // settings = Core::ICore::instance()->settings();
-    setSoundCollectionPath(Utils::PathUtils().InsertDataPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString()));
+    setSoundCollectionPath(Utils::InsertDataPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString()));
     setCurrentLanguage(settings->value(QLatin1String("CurrentLanguage"), tr("")).toString());
     setDataObject(settings->value(QLatin1String("DataObject"), tr("")).toString());
     setObjectField(settings->value(QLatin1String("ObjectField"), tr("")).toString());
diff --git a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
index e34e8bfb8..e3c1434dd 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
@@ -384,7 +384,7 @@ void NotifyPluginOptionsPage::updateConfigView(NotificationItem *notification)
 
     QString path = notification->getSoundCollectionPath();
     if (path.isEmpty()) {
-        path = Utils::PathUtils().InsertDataPath("%%DATAPATH%%sounds");
+        path = Utils::InsertDataPath("%%DATAPATH%%sounds");
     }
 
     _optionsPage->SoundDirectoryPathChooser->setPath(path);
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp
index 922d41e16..6f15903ed 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp
@@ -39,7 +39,7 @@ OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, QSettings *q
     m_showTileGridLines(false),
     m_accessMode("ServerAndCache"),
     m_useMemoryCache(true),
-    m_cacheLocation(Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator()),
+    m_cacheLocation(Utils::GetStoragePath() + "mapscache" + QDir::separator()),
     m_uavSymbol(QString::fromUtf8(":/uavs/images/mapquad.png")),
     m_maxUpdateRate(2000), // ms
     m_settings(qSettings),
@@ -81,7 +81,7 @@ OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, QSettings *q
         }
         m_useMemoryCache = useMemoryCache;
         if (!cacheLocation.isEmpty()) {
-            m_cacheLocation = Utils::PathUtils().InsertStoragePath(cacheLocation);
+            m_cacheLocation = Utils::InsertStoragePath(cacheLocation);
         }
     }
 }
@@ -119,7 +119,7 @@ void OPMapGadgetConfiguration::saveConfig() const
     m_settings->setValue("accessMode", m_accessMode);
     m_settings->setValue("useMemoryCache", m_useMemoryCache);
     m_settings->setValue("uavSymbol", m_uavSymbol);
-    m_settings->setValue("cacheLocation", Utils::PathUtils().RemoveStoragePath(m_cacheLocation));
+    m_settings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation));
     m_settings->setValue("maxUpdateRate", m_maxUpdateRate);
     m_settings->setValue("overlayOpacity", m_opacity);
 }
@@ -134,7 +134,7 @@ void OPMapGadgetConfiguration::saveConfig(QSettings *qSettings) const
     qSettings->setValue("accessMode", m_accessMode);
     qSettings->setValue("useMemoryCache", m_useMemoryCache);
     qSettings->setValue("uavSymbol", m_uavSymbol);
-    qSettings->setValue("cacheLocation", Utils::PathUtils().RemoveStoragePath(m_cacheLocation));
+    qSettings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation));
     qSettings->setValue("maxUpdateRate", m_maxUpdateRate);
     qSettings->setValue("overlayOpacity", m_opacity);
 }
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.cpp
index 35664db9f..c6bee0c60 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.cpp
@@ -122,7 +122,7 @@ void OPMapGadgetOptionsPage::on_pushButtonCacheDefaults_clicked()
     m_page->accessModeComboBox->setCurrentIndex(index);
 
     m_page->checkBoxUseMemoryCache->setChecked(true);
-    m_page->lineEditCacheLocation->setPath(Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator());
+    m_page->lineEditCacheLocation->setPath(Utils::GetStoragePath() + "mapscache" + QDir::separator());
 }
 
 void OPMapGadgetOptionsPage::apply()
diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp
index 614441daf..dd4638f50 100644
--- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp
@@ -46,10 +46,10 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings
     // if a saved configuration exists load it
     if (qSettings != 0) {
         m_qmlFile            = qSettings->value("qmlFile").toString();
-        m_qmlFile            = Utils::PathUtils().InsertDataPath(m_qmlFile);
+        m_qmlFile            = Utils::InsertDataPath(m_qmlFile);
 
         m_earthFile          = qSettings->value("earthFile").toString();
-        m_earthFile          = Utils::PathUtils().InsertDataPath(m_earthFile);
+        m_earthFile          = Utils::InsertDataPath(m_earthFile);
 
         m_openGLEnabled      = qSettings->value("openGLEnabled", true).toBool();
         m_terrainEnabled     = qSettings->value("terrainEnabled").toBool();
@@ -92,10 +92,10 @@ IUAVGadgetConfiguration *PfdQmlGadgetConfiguration::clone()
  */
 void PfdQmlGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
-    QString qmlFile   = Utils::PathUtils().RemoveDataPath(m_qmlFile);
+    QString qmlFile   = Utils::RemoveDataPath(m_qmlFile);
 
     qSettings->setValue("qmlFile", qmlFile);
-    QString earthFile = Utils::PathUtils().RemoveDataPath(m_earthFile);
+    QString earthFile = Utils::RemoveDataPath(m_earthFile);
     qSettings->setValue("earthFile", earthFile);
 
     qSettings->setValue("openGLEnabled", m_openGLEnabled);
diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetconfiguration.cpp
index 95183e09b..c1090f7ff 100644
--- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetconfiguration.cpp
@@ -40,7 +40,7 @@ QmlViewGadgetConfiguration::QmlViewGadgetConfiguration(QString classId, QSetting
     if (qSettings != 0) {
         QString dialFile = qSettings->value("dialFile").toString();
         useOpenGLFlag = qSettings->value("useOpenGLFlag").toBool();
-        m_defaultDial = Utils::PathUtils().InsertDataPath(dialFile);
+        m_defaultDial = Utils::InsertDataPath(dialFile);
     }
 }
 
@@ -63,7 +63,7 @@ IUAVGadgetConfiguration *QmlViewGadgetConfiguration::clone()
  */
 void QmlViewGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
-    QString dialFile = Utils::PathUtils().RemoveDataPath(m_defaultDial);
+    QString dialFile = Utils::RemoveDataPath(m_defaultDial);
 
     qSettings->setValue("dialFile", dialFile);
     qSettings->setValue("useOpenGLFlag", useOpenGLFlag);
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
index 6c2011b0b..7693f62c3 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
@@ -272,7 +272,7 @@ QString VehicleTemplateExportDialog::fixFilenameString(QString input, int trunca
 
 void VehicleTemplateExportDialog::exportTemplate()
 {
-    QString path = QString("%1%2%3%4").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig"))
+    QString path = QString("%1%2%3%4").arg(Utils::InsertStoragePath("%%STOREPATH%%cloudconfig"))
                    .arg(QDir::separator()).arg(getTypeDirectory()).arg(QDir::separator());
     QDir dir;
 
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
index f2b963b1d..3352a715d 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
@@ -203,8 +203,8 @@ void VehicleTemplateSelectorWidget::loadValidFiles()
     }
     m_templates.clear();
     QString path = getTemplatePath();
-    loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(path));
-    loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(path));
+    loadFilesInDir(QString("%1/%2/").arg(Utils::InsertDataPath("%%DATAPATH%%cloudconfig")).arg(path));
+    loadFilesInDir(QString("%1/%2/").arg(Utils::InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(path));
 }
 
 void VehicleTemplateSelectorWidget::setupTemplateList()
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetconfiguration.cpp
index de16464da..a9cb18e25 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetconfiguration.cpp
@@ -39,7 +39,7 @@ SystemHealthGadgetConfiguration::SystemHealthGadgetConfiguration(QString classId
     // if a saved configuration exists load it
     if (qSettings != 0) {
         QString diagram = qSettings->value("diagram").toString();
-        systemFile = Utils::PathUtils().InsertDataPath(diagram);
+        systemFile = Utils::InsertDataPath(diagram);
     }
 }
 
@@ -61,7 +61,7 @@ IUAVGadgetConfiguration *SystemHealthGadgetConfiguration::clone()
  */
 void SystemHealthGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
-    QString diagram = Utils::PathUtils().RemoveDataPath(systemFile);
+    QString diagram = Utils::RemoveDataPath(systemFile);
 
     qSettings->setValue("diagram", diagram);
 }
diff --git a/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetconfiguration.cpp
index 48b0efd37..b90a537d8 100644
--- a/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetconfiguration.cpp
+++ b/ground/openpilotgcs/src/plugins/telemetry/monitorgadgetconfiguration.cpp
@@ -48,7 +48,7 @@ IUAVGadgetConfiguration *MonitorGadgetConfiguration::clone()
 void MonitorGadgetConfiguration::saveConfig(QSettings *qSettings) const
 {
     Q_UNUSED(qSettings);
-// qSettings->setValue("acFilename", Utils::PathUtils().RemoveDataPath(m_acFilename));
-// qSettings->setValue("bgFilename", Utils::PathUtils().RemoveDataPath(m_bgFilename));
+// qSettings->setValue("acFilename", Utils::RemoveDataPath(m_acFilename));
+// qSettings->setValue("bgFilename", Utils::RemoveDataPath(m_bgFilename));
 // qSettings->setValue("enableVbo", m_enableVbo);
 }