diff --git a/.travis.yml b/.travis.yml
index 6732b1e..9b6f8e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ jobs:
         - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
         - install.sh
       script:
-        - deploy-phpdoc-branch.sh
+        - deploy-branch.sh
 
     # Release stage
     - stage: release
@@ -36,7 +36,7 @@ jobs:
         - '[ -n "$TRAVIS_TAG" ] || travis_terminate 0'
         - install.sh --release
       script:
-        - deploy-phpdoc-release.sh
+        - deploy-release.sh
       before_deploy:
         - create-release-archive.sh "pico-release-$TRAVIS_TAG.tar.gz"
       deploy:
diff --git a/_build/deploy-phpdoc-branch.sh b/_build/deploy-branch.sh
similarity index 97%
rename from _build/deploy-phpdoc-branch.sh
rename to _build/deploy-branch.sh
index 31b4486..a3ac6fd 100755
--- a/_build/deploy-phpdoc-branch.sh
+++ b/_build/deploy-branch.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export PATH="$(dirname "$0")/tools:$PATH"
+
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
diff --git a/_build/deploy-phpdoc-release.sh b/_build/deploy-release.sh
similarity index 98%
rename from _build/deploy-phpdoc-release.sh
rename to _build/deploy-release.sh
index 0ff50d1..1c994ab 100755
--- a/_build/deploy-phpdoc-release.sh
+++ b/_build/deploy-release.sh
@@ -13,6 +13,8 @@ if [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] || [ "$DEPLOY_VERSION_BADGE" != "true
     [ "$DEPLOY_PHPDOC_RELEASES" != "true" ] && [ "$DEPLOY_VERSION_BADGE" != "true" ] && [ "$DEPLOY_VERSION_FILE" != "true" ] && [ "$DEPLOY_CLOC_STATS" != "true" ] && exit 0 || echo
 fi
 
+export PATH="$(dirname "$0")/tools:$PATH"
+
 DEPLOYMENT_ID="${TRAVIS_BRANCH//\//_}"
 DEPLOYMENT_DIR="$TRAVIS_BUILD_DIR/_build/deploy-$DEPLOYMENT_ID.git"
 
diff --git a/_build/generate-badge.sh b/_build/tools/generate-badge.sh
similarity index 100%
rename from _build/generate-badge.sh
rename to _build/tools/generate-badge.sh
diff --git a/_build/generate-phpdoc.sh b/_build/tools/generate-phpdoc.sh
similarity index 100%
rename from _build/generate-phpdoc.sh
rename to _build/tools/generate-phpdoc.sh
diff --git a/_build/github-clone.sh b/_build/tools/github-clone.sh
similarity index 100%
rename from _build/github-clone.sh
rename to _build/tools/github-clone.sh
diff --git a/_build/github-deploy.sh b/_build/tools/github-deploy.sh
similarity index 100%
rename from _build/github-deploy.sh
rename to _build/tools/github-deploy.sh
diff --git a/_build/github-setup.sh b/_build/tools/github-setup.sh
similarity index 100%
rename from _build/github-setup.sh
rename to _build/tools/github-setup.sh
diff --git a/_build/update-cloc-stats.sh b/_build/tools/update-cloc-stats.sh
similarity index 100%
rename from _build/update-cloc-stats.sh
rename to _build/tools/update-cloc-stats.sh
diff --git a/_build/update-phpdoc-list.sh b/_build/tools/update-phpdoc-list.sh
similarity index 100%
rename from _build/update-phpdoc-list.sh
rename to _build/tools/update-phpdoc-list.sh
diff --git a/_build/update-version-file.sh b/_build/tools/update-version-file.sh
similarity index 100%
rename from _build/update-version-file.sh
rename to _build/tools/update-version-file.sh