diff --git a/installer/images/createBoxTarball b/scripts/createBoxTarball
similarity index 89%
rename from installer/images/createBoxTarball
rename to scripts/createBoxTarball
index bd8ea9281..d477d10bf 100755
--- a/installer/images/createBoxTarball
+++ b/scripts/createBoxTarball
@@ -14,8 +14,8 @@ readonly GNU_GETOPT
 args=$(${GNU_GETOPT} -o "" -l "revision:,output:,publish,no-upload" -n "$0" -- "$@")
 eval set -- "${args}"
 
-readonly release_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../../release" && pwd)"
-readonly box_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+readonly RELEASE_TOOL_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../release" && pwd)"
+readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
 delete_bundle="yes"
 commitish="HEAD"
@@ -44,18 +44,18 @@ readonly TMPDIR=${TMPDIR:-/tmp} # why is this not set on mint?
 assertNotEmpty AWS_DEV_ACCESS_KEY
 assertNotEmpty AWS_DEV_SECRET_KEY
 
-if ! $(cd "${box_dir}" && git diff --exit-code >/dev/null); then
+if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
     echo "You have local changes, stash or commit them to proceed"
     exit 1
 fi
 
-version=$(cd "${box_dir}" && git rev-parse "${commitish}")
+version=$(cd "${SOURCE_DIR}" && git rev-parse "${commitish}")
 bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR)
 [[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${version}.tar.gz"
 
 chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't be readable by others/group
 echo "Checking out code [${version}] into ${bundle_dir}"
-(cd "${box_dir}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -))
+(cd "${SOURCE_DIR}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -))
 
 if diff "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.all" "${bundle_dir}/npm-shrinkwrap.json" >/dev/null 2>&1; then
     echo "Reusing dev modules from cache"
@@ -106,7 +106,7 @@ if [[ "${upload}" == "yes" ]]; then
 
     if [[ "${publish}" == "yes" ]]; then
         echo "Publishing to dev"
-        ${release_dir}/release create --env dev --code "${versions_file_url}"
+        ${RELEASE_TOOL_DIR}/release create --env dev --code "${versions_file_url}"
     fi
 fi
 
diff --git a/installer/images/createImage b/scripts/createImage
similarity index 96%
rename from installer/images/createImage
rename to scripts/createImage
index 8512a2aab..1f865f444 100755
--- a/installer/images/createImage
+++ b/scripts/createImage
@@ -7,8 +7,8 @@ assertNotEmpty() {
 }
 
 readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly BOX_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd)"
-export JSON="${BOX_DIR}/node_modules/.bin/json"
+readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
+export JSON="${SOURCE_DIR}/node_modules/.bin/json"
 
 provider="digitalocean"
 installer_revision=$(git rev-parse HEAD)
@@ -141,10 +141,10 @@ while true; do
 done
 
 echo "Copying INFRA_VERSION"
-$scp22 "${SCRIPT_DIR}/../../setup/INFRA_VERSION" root@${server_ip}:.
+$scp22 "${SCRIPT_DIR}/../setup/INFRA_VERSION" root@${server_ip}:.
 
 echo "Copying box source"
-cd "${BOX_DIR}"
+cd "${SOURCE_DIR}"
 git archive --format=tar HEAD | $ssh22 "root@${server_ip}" "cat - > /tmp/box.tar.gz"
 
 echo "Executing init script"
@@ -154,7 +154,7 @@ if ! $ssh22 "root@${server_ip}" "/bin/bash /root/initializeBaseUbuntuImage.sh ${
 fi
 
 echo "Copy over certs"
-cd "${SCRIPT_DIR}/../../../secrets"
+cd "${SCRIPT_DIR}/../../secrets"
 blackbox_cat installer/server.crt.gpg | $ssh202 "root@${server_ip}" "cat - > /home/yellowtent/installer/src/certs/server.crt"
 blackbox_cat installer/server.key.gpg | $ssh202 "root@${server_ip}" "cat - > /home/yellowtent/installer/src/certs/server.key"
 blackbox_cat installer_ca/ca.crt.gpg  | $ssh202 "root@${server_ip}" "cat - > /home/yellowtent/installer/src/certs/ca.crt"
diff --git a/installer/images/digitalocean.sh b/scripts/digitalocean.sh
similarity index 100%
rename from installer/images/digitalocean.sh
rename to scripts/digitalocean.sh
diff --git a/installer/images/images b/scripts/images
similarity index 100%
rename from installer/images/images
rename to scripts/images
diff --git a/installer/images/initializeBaseUbuntuImage.sh b/scripts/initializeBaseUbuntuImage.sh
similarity index 100%
rename from installer/images/initializeBaseUbuntuImage.sh
rename to scripts/initializeBaseUbuntuImage.sh
diff --git a/installer/images/vultr.js b/scripts/vultr.js
similarity index 100%
rename from installer/images/vultr.js
rename to scripts/vultr.js