diff --git a/.travis.yml b/.travis.yml
index 7723e6d330..b4116593cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,12 +81,12 @@ before_cache:
 - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi
 
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/setup-osx.sh; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/package/setup-osx.sh; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source bin/activate; fi
 - "$INSTALL_DEPS"
 - "$INSTALL_TEST_TOOLS"
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/package-osx.sh; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/package/package-osx.sh; fi
 
 script:
 - py.test -v --cov=picard --cov-report xml:coverage.xml test
diff --git a/picard.spec b/picard.spec
index 330b0a8805..3596ccaae8 100644
--- a/picard.spec
+++ b/picard.spec
@@ -77,9 +77,9 @@ if os.path.isfile(fpcalc_name):
 
 runtime_hooks = []
 if sys.platform == 'win32':
-    runtime_hooks.append('scripts/picard-winconsole-hook.py')
+    runtime_hooks.append('scripts/pyinstaller/picard-winconsole-hook.py')
 if '--onefile' in sys.argv:
-    runtime_hooks.append('scripts/picard-portable-hook.py')
+    runtime_hooks.append('scripts/pyinstaller/picard-portable-hook.py')
 
 
 a = Analysis(['tagger.py'],
diff --git a/scripts/appledev.p12.enc b/scripts/package/appledev.p12.enc
similarity index 100%
rename from scripts/appledev.p12.enc
rename to scripts/package/appledev.p12.enc
diff --git a/scripts/package-osx.sh b/scripts/package/package-osx.sh
similarity index 93%
rename from scripts/package-osx.sh
rename to scripts/package/package-osx.sh
index f63bf8f11b..93aa83342f 100755
--- a/scripts/package-osx.sh
+++ b/scripts/package/package-osx.sh
@@ -17,13 +17,13 @@ CODESIGN=0
 KEYCHAIN_PATH=picard.keychain
 KEYCHAIN_PASSWORD=picard
 CERTIFICATE_NAME="Developer ID Application: MetaBrainz Foundation Inc."
-CERTIFICATE_FILE=scripts/appledev.p12
+CERTIFICATE_FILE=scripts/package/appledev.p12
 
 if [ -n "$encrypted_be5fb2212036_key" ] && [ -n "$encrypted_be5fb2212036_iv" ]; then
-    openssl aes-256-cbc -K "$encrypted_be5fb2212036_key" -iv "$encrypted_be5fb2212036_iv" -in scripts/appledev.p12.enc -out $CERTIFICATE_FILE -d
+    openssl aes-256-cbc -K "$encrypted_be5fb2212036_key" -iv "$encrypted_be5fb2212036_iv" -in scripts/package/appledev.p12.enc -out $CERTIFICATE_FILE -d
 fi
 
-if [ -f scripts/appledev.p12 ] && [ -n "$appledev_p12_password" ]; then
+if [ -f scripts/package/appledev.p12 ] && [ -n "$appledev_p12_password" ]; then
     security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
     security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
     security list-keychains -d user -s $KEYCHAIN_PATH
diff --git a/scripts/setup-osx.sh b/scripts/package/setup-osx.sh
similarity index 100%
rename from scripts/setup-osx.sh
rename to scripts/package/setup-osx.sh
diff --git a/scripts/upload.sh b/scripts/package/upload.sh
similarity index 100%
rename from scripts/upload.sh
rename to scripts/package/upload.sh
diff --git a/scripts/picard-portable-hook.py b/scripts/pyinstaller/picard-portable-hook.py
similarity index 100%
rename from scripts/picard-portable-hook.py
rename to scripts/pyinstaller/picard-portable-hook.py
diff --git a/scripts/picard-winconsole-hook.py b/scripts/pyinstaller/picard-winconsole-hook.py
similarity index 100%
rename from scripts/picard-winconsole-hook.py
rename to scripts/pyinstaller/picard-winconsole-hook.py