diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
index ab859bd..8b31acf 100644
--- a/QGCPostLinkCommon.pri
+++ b/QGCPostLinkCommon.pri
@@ -53,8 +53,8 @@ WindowsBuild {
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
         $$SOURCE_DIR\\libs\\sdl2\\msvc\\lib\\x64\\SDL2.dll \
-        $$SOURCE_DIR\\deploy\\libcrypto-1_1-x64.dll \
-        $$SOURCE_DIR\\deploy\\libssl-1_1-x64.dll
+        $$SOURCE_DIR\\libs\\OpenSSL\\windows\\libcrypto-1_1-x64.dll \
+        $$SOURCE_DIR\\libs\\OpenSSL\\windows\\libssl-1_1-x64.dll
 
     for(COPY_FILE, COPY_FILE_LIST) {
         QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR\"
@@ -63,8 +63,8 @@ WindowsBuild {
     ReleaseBuild {
         # Copy Visual Studio DLLs
         # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
-        QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\deploy\\msvcp140.dll\"  \"$$DESTDIR\"
-        QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\deploy\\vcruntime140.dll\"  \"$$DESTDIR\"
+        QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\libs\\Microsoft\\windows\\msvcp140.dll\"  \"$$DESTDIR\"
+        QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\libs\\Microsoft\\windows\\vcruntime140.dll\"  \"$$DESTDIR\"
     }
 
     DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR\\$${TARGET}.exe))
diff --git a/QGCPostLinkInstaller.pri b/QGCPostLinkInstaller.pri
index da1eb6e..9912a58 100644
--- a/QGCPostLinkInstaller.pri
+++ b/QGCPostLinkInstaller.pri
@@ -47,8 +47,8 @@ installer {
         QMAKE_POST_LINK += && rm /tmp/tmp.dmg
     }
     WindowsBuild {
-        QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" $$(QGC_NSIS_INSTALLER_PARAMETERS) /DDRIVER_MSI="$$SOURCE_DIR\\deploy\\driver.msi" /DINSTALLER_ICON="\"$${QGC_INSTALLER_ICON}\"" /DHEADER_BITMAP="\"$${QGC_INSTALLER_HEADER_BITMAP}\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR}\\$${TARGET}-installer.exe\"" "$$SOURCE_DIR\\deploy\\qgroundcontrol_installer.nsi")
-        OTHER_FILES += deploy/qgroundcontrol_installer.nsi
+        QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" $$(QGC_NSIS_INSTALLER_PARAMETERS) /DDRIVER_MSI="\"$${QGC_INSTALLER_DRIVER_MSI}\"" /DINSTALLER_ICON="\"$${QGC_INSTALLER_ICON}\"" /DHEADER_BITMAP="\"$${QGC_INSTALLER_HEADER_BITMAP}\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR}\\$${TARGET}-installer.exe\"" "\"$${QGC_INSTALLER_SCRIPT}\"")
+        OTHER_FILES += $${QGC_INSTALLER_SCRIPT}
     }
     LinuxBuild {
         #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
diff --git a/windows/QGroundControl.rc b/deploy/windows/QGroundControl.rc
similarity index 100%
rename from windows/QGroundControl.rc
rename to deploy/windows/QGroundControl.rc
diff --git a/windows/WindowsQGC.ico b/deploy/windows/WindowsQGC.ico
similarity index 100%
rename from windows/WindowsQGC.ico
rename to deploy/windows/WindowsQGC.ico
diff --git a/deploy/driver.msi b/deploy/windows/driver.msi
similarity index 100%
rename from deploy/driver.msi
rename to deploy/windows/driver.msi
diff --git a/windows/installheader.bmp b/deploy/windows/installheader.bmp
similarity index 100%
rename from windows/installheader.bmp
rename to deploy/windows/installheader.bmp
diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/windows/nullsoft_installer.nsi
similarity index 100%
rename from deploy/qgroundcontrol_installer.nsi
rename to deploy/windows/nullsoft_installer.nsi
diff --git a/windows/resource.h b/deploy/windows/resource.h
similarity index 100%
rename from windows/resource.h
rename to deploy/windows/resource.h
diff --git a/deploy/msvcp140.dll b/libs/Microsoft/windows/msvcp140.dll
similarity index 100%
rename from deploy/msvcp140.dll
rename to libs/Microsoft/windows/msvcp140.dll
diff --git a/deploy/vcruntime140.dll b/libs/Microsoft/windows/vcruntime140.dll
similarity index 100%
rename from deploy/vcruntime140.dll
rename to libs/Microsoft/windows/vcruntime140.dll
diff --git a/deploy/libcrypto-1_1-x64.dll b/libs/OpenSSL/windows/libcrypto-1_1-x64.dll
similarity index 100%
rename from deploy/libcrypto-1_1-x64.dll
rename to libs/OpenSSL/windows/libcrypto-1_1-x64.dll
diff --git a/deploy/libssl-1_1-x64.dll b/libs/OpenSSL/windows/libssl-1_1-x64.dll
similarity index 100%
rename from deploy/libssl-1_1-x64.dll
rename to libs/OpenSSL/windows/libssl-1_1-x64.dll
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index e429457..a20dce1 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -62,8 +62,10 @@ QGC_APP_DESCRIPTION = "Open source ground control app provided by QGroundControl
 QGC_APP_COPYRIGHT   = "Copyright (C) 2019 QGroundControl Development Team. All rights reserved."
 
 WindowsBuild {
-    QGC_INSTALLER_ICON          = "$$SOURCE_DIR\\windows\\WindowsQGC.ico"
-    QGC_INSTALLER_HEADER_BITMAP = "$$SOURCE_DIR\\windows\\installheader.bmp"
+    QGC_INSTALLER_SCRIPT        = "$$SOURCE_DIR\\deploy\\windows\\nullsoft_installer.nsi"
+    QGC_INSTALLER_ICON          = "$$SOURCE_DIR\\deploy\\windows\\WindowsQGC.ico"
+    QGC_INSTALLER_HEADER_BITMAP = "$$SOURCE_DIR\\deploy\\windows\\installheader.bmp"
+    QGC_INSTALLER_DRIVER_MSI    = "$$SOURCE_DIR\\deploy\\windows\\driver.msi"
 }
 
 # Load additional config flags from user_config.pri