diff --git a/ground/openpilotgcs/packaging/packaging.pro b/ground/openpilotgcs/copydata.pro
similarity index 96%
rename from ground/openpilotgcs/packaging/packaging.pro
rename to ground/openpilotgcs/copydata.pro
index d6bfbcd25..c50ad9330 100644
--- a/ground/openpilotgcs/packaging/packaging.pro
+++ b/ground/openpilotgcs/copydata.pro
@@ -1,4 +1,4 @@
-include(../openpilotgcs.pri)
+include(openpilotgcs.pri)
 
 TEMPLATE = subdirs
 
diff --git a/ground/openpilotgcs/openpilotgcs.pro b/ground/openpilotgcs/openpilotgcs.pro
index 5c2611a11..22a893f52 100644
--- a/ground/openpilotgcs/openpilotgcs.pro
+++ b/ground/openpilotgcs/openpilotgcs.pro
@@ -9,5 +9,7 @@ include(openpilotgcs.pri)
 TEMPLATE  = subdirs
 CONFIG   += ordered
 
-SUBDIRS = src share packaging
+SUBDIRS = src share copydata
 unix:!macx:!isEmpty(copydata):SUBDIRS += bin
+
+copydata.file = copydata.pro
diff --git a/release/Makefile.winx86 b/release/Makefile.winx86
index 1984ad58b..b83669432 100644
--- a/release/Makefile.winx86
+++ b/release/Makefile.winx86
@@ -7,7 +7,7 @@ NSIS_OPTS     := /V3
 NSIS_DIR      := $(ROOT_DIR)/release/winx86
 NSIS_SCRIPT   := $(NSIS_DIR)/openpilotgcs.nsi
 NSIS_TEMPLATE := $(NSIS_DIR)/openpilotgcs.tpl
-NSIS_HEADER   := $(BUILD_DIR)/ground/openpilotgcs/packaging/openpilotgcs.nsh
+NSIS_HEADER   := $(BUILD_DIR)/ground/openpilotgcs/openpilotgcs.nsh
 
 $(NSIS_HEADER): $(NSIS_TEMPLATE)
 	$(V0) @echo " PY        $@"
diff --git a/release/winx86/openpilotgcs.nsi b/release/winx86/openpilotgcs.nsi
index 18a08668f..93a61d785 100644
--- a/release/winx86/openpilotgcs.nsi
+++ b/release/winx86/openpilotgcs.nsi
@@ -35,7 +35,6 @@
   ; Tree root locations (relative to this script location)
   !define NSIS_DATA_TREE "."
   !define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs"
-  !define GCS_PKG_TREE "${GCS_BUILD_TREE}\packaging"
 
   ; Default installation folder
   InstallDir "$LOCALAPPDATA\OpenPilot"
@@ -58,7 +57,7 @@
 ; !define PRODUCT_VERSION "0.0.0.0"
 ; !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8} ${DATETIME}"
 ; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built using ${ORIGIN} as origin, committed ${DATETIME} as ${HASH}"
-  !include "${GCS_PKG_TREE}\openpilotgcs.nsh"
+  !include "${GCS_BUILD_TREE}\openpilotgcs.nsh"
 
   Name "${PRODUCT_NAME}"
   OutFile "${RELEASE_DIR}\${OUT_FILE}"