diff --git a/Makefile b/Makefile
index 032d7258..983b17a4 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ APPLICATION_VERSION_DEBIAN = $(shell echo $(APPLICATION_VERSION) | tr "-" "~")
 # ---------------------------------------------------------------------
 
 release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules: package.json npm-shrinkwrap.json
-	./scripts/unix/dependencies-npm.sh -p \
+	./scripts/build/dependencies-npm.sh -p \
 		-r "$(TARGET_ARCH)" \
 		-v "$(ELECTRON_VERSION)" \
 		-x $(dir $@) \
@@ -106,20 +106,20 @@ release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules: pa
 		-s "$(TARGET_PLATFORM)"
 
 release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components: bower.json
-	./scripts/unix/dependencies-bower.sh -p -x $(dir $@)
+	./scripts/build/dependencies-bower.sh -p -x $(dir $@)
 
 release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app: \
 	release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/node_modules \
 	release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-dependencies/bower_components
-	./scripts/unix/electron-create-resources-app.sh -s . -f "$(APPLICATION_FILES)" -o $@
+	./scripts/build/electron-create-resources-app.sh -s . -f "$(APPLICATION_FILES)" -o $@
 	$(foreach prerequisite,$^,cp -rf $(prerequisite) $@;)
 
 release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app.asar: \
 	release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app
-	./scripts/unix/electron-create-asar.sh -d $< -o $@
+	./scripts/build/electron-create-asar.sh -d $< -o $@
 
 release/electron-$(ELECTRON_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip:
-	./scripts/unix/electron-download-package.sh \
+	./scripts/build/electron-download-package.sh \
 		-r "$(TARGET_ARCH)" \
 		-v "$(ELECTRON_VERSION)" \
 		-s "$(TARGET_PLATFORM)" \
@@ -129,7 +129,7 @@ release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH): \
 	release/electron-$(TARGET_PLATFORM)-$(TARGET_ARCH)-app.asar \
 	release/electron-$(ELECTRON_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 ifeq ($(TARGET_PLATFORM),darwin)
-	./scripts/darwin/electron-configure-package-darwin.sh -p $(word 2,$^) -a $< \
+	./scripts/build/electron-configure-package-darwin.sh -p $(word 2,$^) -a $< \
 		-n "$(APPLICATION_NAME)" \
 		-v "$(APPLICATION_VERSION)" \
 		-b "$(APPLICATION_BUNDLE_ID)" \
@@ -139,7 +139,7 @@ ifeq ($(TARGET_PLATFORM),darwin)
 		-o $@
 endif
 ifeq ($(TARGET_PLATFORM),linux)
-	./scripts/linux/electron-configure-package-linux.sh -p $(word 2,$^) -a $< \
+	./scripts/build/electron-configure-package-linux.sh -p $(word 2,$^) -a $< \
 		-n "$(APPLICATION_NAME)" \
 		-v "$(APPLICATION_VERSION)" \
 		-l LICENSE \
@@ -148,7 +148,7 @@ endif
 
 release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH)-rw.dmg: \
 	release/$(APPLICATION_NAME)-darwin-$(TARGET_ARCH)
-	./scripts/darwin/electron-create-readwrite-dmg.sh -p $< -o $@ \
+	./scripts/build/electron-create-readwrite-dmg-darwin.sh -p $< -o $@ \
 		-n "$(APPLICATION_NAME)" \
 		-i assets/icon.icns \
 		-b assets/osx/installer.png
@@ -156,23 +156,23 @@ release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH)-rw.dmg: \
 release/out/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TARGET_ARCH).zip: \
 	release/$(APPLICATION_NAME)-darwin-$(TARGET_ARCH)
 ifdef CODE_SIGN_IDENTITY
-	./scripts/darwin/electron-sign-app.sh -a $</$(APPLICATION_NAME).app -i "$(CODE_SIGN_IDENTITY)"
+	./scripts/build/electron-sign-app-darwin.sh -a $</$(APPLICATION_NAME).app -i "$(CODE_SIGN_IDENTITY)"
 endif
-	./scripts/darwin/electron-installer-app-zip.sh -a $</$(APPLICATION_NAME).app -o $@
+	./scripts/build/electron-installer-app-zip-darwin.sh -a $</$(APPLICATION_NAME).app -o $@
 
 release/out/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TARGET_ARCH).dmg: \
 	release/$(APPLICATION_NAME)-$(TARGET_PLATFORM)-$(TARGET_ARCH)-rw.dmg
 ifdef CODE_SIGN_IDENTITY
-	./scripts/darwin/electron-sign-dmg.sh \
+	./scripts/build/electron-sign-dmg-darwin.sh \
 		-n "$(APPLICATION_NAME)" \
 		-d $< \
 		-i "$(CODE_SIGN_IDENTITY)"
 endif
-	./scripts/darwin/electron-create-readonly-dmg.sh -d $< -o $@
+	./scripts/build/electron-create-readonly-dmg-darwin.sh -d $< -o $@
 
 release/out/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH).zip: \
 	release/$(APPLICATION_NAME)-linux-$(TARGET_ARCH)
-	TMPDIR=$(TEMPORARY_DIRECTORY) ./scripts/linux/electron-installer-appimage.sh -p $< -o $@ \
+	TMPDIR=$(TEMPORARY_DIRECTORY) ./scripts/build/electron-installer-appimage-linux.sh -p $< -o $@ \
 		-n "$(APPLICATION_NAME)" \
 		-d "$(APPLICATION_DESCRIPTION)" \
 		-r "$(TARGET_ARCH)" \
@@ -181,7 +181,7 @@ release/out/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH).zip:
 
 release/out/$(APPLICATION_NAME_LOWERCASE)-electron_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb: \
 	release/$(APPLICATION_NAME)-linux-$(TARGET_ARCH)
-	./scripts/linux/electron-installer-debian.sh -p $< -r "$(TARGET_ARCH)" \
+	./scripts/build/electron-installer-debian-linux.sh -p $< -r "$(TARGET_ARCH)" \
 		-c scripts/build/debian/config.json \
 		-o $(dir $@)
 
@@ -219,12 +219,12 @@ electron-develop:
 	# is defined by the `npm-shrinkwrap.json` file, and will thus
 	# refuse to do anything but install from scratch.
 	rm -rf node_modules
-	./scripts/unix/dependencies-npm.sh \
+	./scripts/build/dependencies-npm.sh \
 		-r "$(TARGET_ARCH)" \
 		-v "$(ELECTRON_VERSION)" \
 		-t electron \
 		-s "$(TARGET_PLATFORM)"
-	./scripts/unix/dependencies-bower.sh
+	./scripts/build/dependencies-bower.sh
 
 help:
 	@echo "Available targets: $(TARGETS)"
diff --git a/scripts/unix/dependencies-bower.sh b/scripts/build/dependencies-bower.sh
similarity index 100%
rename from scripts/unix/dependencies-bower.sh
rename to scripts/build/dependencies-bower.sh
diff --git a/scripts/unix/dependencies-npm.sh b/scripts/build/dependencies-npm.sh
similarity index 100%
rename from scripts/unix/dependencies-npm.sh
rename to scripts/build/dependencies-npm.sh
diff --git a/scripts/darwin/electron-configure-package-darwin.sh b/scripts/build/electron-configure-package-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-configure-package-darwin.sh
rename to scripts/build/electron-configure-package-darwin.sh
diff --git a/scripts/linux/electron-configure-package-linux.sh b/scripts/build/electron-configure-package-linux.sh
similarity index 100%
rename from scripts/linux/electron-configure-package-linux.sh
rename to scripts/build/electron-configure-package-linux.sh
diff --git a/scripts/unix/electron-create-asar.sh b/scripts/build/electron-create-asar.sh
similarity index 100%
rename from scripts/unix/electron-create-asar.sh
rename to scripts/build/electron-create-asar.sh
diff --git a/scripts/darwin/electron-create-readonly-dmg.sh b/scripts/build/electron-create-readonly-dmg-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-create-readonly-dmg.sh
rename to scripts/build/electron-create-readonly-dmg-darwin.sh
diff --git a/scripts/darwin/electron-create-readwrite-dmg.sh b/scripts/build/electron-create-readwrite-dmg-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-create-readwrite-dmg.sh
rename to scripts/build/electron-create-readwrite-dmg-darwin.sh
diff --git a/scripts/unix/electron-create-resources-app.sh b/scripts/build/electron-create-resources-app.sh
similarity index 100%
rename from scripts/unix/electron-create-resources-app.sh
rename to scripts/build/electron-create-resources-app.sh
diff --git a/scripts/unix/electron-download-package.sh b/scripts/build/electron-download-package.sh
similarity index 100%
rename from scripts/unix/electron-download-package.sh
rename to scripts/build/electron-download-package.sh
diff --git a/scripts/darwin/electron-installer-app-zip.sh b/scripts/build/electron-installer-app-zip-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-installer-app-zip.sh
rename to scripts/build/electron-installer-app-zip-darwin.sh
diff --git a/scripts/linux/electron-installer-appimage.sh b/scripts/build/electron-installer-appimage-linux.sh
similarity index 100%
rename from scripts/linux/electron-installer-appimage.sh
rename to scripts/build/electron-installer-appimage-linux.sh
diff --git a/scripts/linux/electron-installer-debian.sh b/scripts/build/electron-installer-debian-linux.sh
similarity index 100%
rename from scripts/linux/electron-installer-debian.sh
rename to scripts/build/electron-installer-debian-linux.sh
diff --git a/scripts/darwin/electron-sign-app.sh b/scripts/build/electron-sign-app-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-sign-app.sh
rename to scripts/build/electron-sign-app-darwin.sh
diff --git a/scripts/darwin/electron-sign-dmg.sh b/scripts/build/electron-sign-dmg-darwin.sh
similarity index 100%
rename from scripts/darwin/electron-sign-dmg.sh
rename to scripts/build/electron-sign-dmg-darwin.sh
diff --git a/scripts/windows/electron-sign-exe.sh b/scripts/build/electron-sign-exe-win32.sh
similarity index 100%
rename from scripts/windows/electron-sign-exe.sh
rename to scripts/build/electron-sign-exe-win32.sh
diff --git a/scripts/unix/package-cli.sh b/scripts/build/package-cli.sh
similarity index 100%
rename from scripts/unix/package-cli.sh
rename to scripts/build/package-cli.sh
diff --git a/scripts/build/windows.bat b/scripts/build/windows.bat
index 8a49b7bc..cc345c36 100644
--- a/scripts/build/windows.bat
+++ b/scripts/build/windows.bat
@@ -148,12 +148,12 @@ set package_name=Etcher-%etcher_version%-win32-%arch%
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 if not "%command%"=="package" (
-  call bash.exe scripts\unix\dependencies-npm.sh^
+  call bash.exe scripts\build\dependencies-npm.sh^
    -r %arch%^
    -v %electron_version%^
    -t electron^
    -s win32
-  call bash.exe scripts\unix\dependencies-bower.sh
+  call bash.exe scripts\build\dependencies-bower.sh
 )
 
 if "%command%"=="install" (
@@ -193,13 +193,13 @@ if not "%arch%"=="%electron_arch%" (
 
 move %output_build_directory%\Etcher-win32-%arch% %package_output%
 
-call bash.exe scripts\unix\electron-create-asar.sh^
+call bash.exe scripts\build\electron-create-asar.sh^
  -d %package_output%\resources\app^
  -o %package_output%\resources\app.asar
 
 call rimraf %package_output%\resources\app
 
-call bash.exe scripts\windows\electron-sign-exe.sh^
+call bash.exe scripts\build\electron-sign-exe-win32.sh^
  -c %certificate_file%^
  -p %certificate_pass%^
  -f %package_output%\Etcher.exe^
@@ -226,7 +226,7 @@ mkdir "%output_directory%"
 move "%installer_tmp_output%\%application_name% Setup.exe" "%installer_output%"
 rd /s /q "%installer_tmp_output%"
 
-call bash.exe scripts\windows\electron-sign-exe.sh^
+call bash.exe scripts\build\electron-sign-exe-win32.sh^
  -c %certificate_file%^
  -p %certificate_pass%^
  -f %installer_output%^