diff --git a/bin/get-django-setting b/scripts/get-django-setting
similarity index 100%
rename from bin/get-django-setting
rename to scripts/get-django-setting
diff --git a/scripts/restart-server b/scripts/restart-server
index 1fe6d65cae..a2e193bbf8 100755
--- a/scripts/restart-server
+++ b/scripts/restart-server
@@ -37,7 +37,7 @@ subprocess.check_call(["supervisorctl", "start", "zulip-tornado zulip-django zul
 logging.info("Starting workers")
 subprocess.check_call(["supervisorctl", "start", "zulip-workers:*"])
 
-using_sso = subprocess.check_output(['./bin/get-django-setting', 'USING_APACHE_SSO'])
+using_sso = subprocess.check_output(['./scripts/get-django-setting', 'USING_APACHE_SSO'])
 if using_sso.strip() == 'True':
     logging.info("Restarting Apache WSGI process...")
     subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"])
diff --git a/scripts/setup/configure-rabbitmq b/scripts/setup/configure-rabbitmq
index bee7d48064..46715cf521 100755
--- a/scripts/setup/configure-rabbitmq
+++ b/scripts/setup/configure-rabbitmq
@@ -5,8 +5,8 @@
 set -e
 set -x
 
-RABBITMQ_USERNAME=$("$(dirname "$0")/../../bin/get-django-setting" RABBITMQ_USERNAME)
-RABBITMQ_PASSWORD=$("$(dirname "$0")/../../bin/get-django-setting" RABBITMQ_PASSWORD)
+RABBITMQ_USERNAME=$("$(dirname "$0")/../get-django-setting" RABBITMQ_USERNAME)
+RABBITMQ_PASSWORD=$("$(dirname "$0")/../get-django-setting" RABBITMQ_PASSWORD)
 sudo rabbitmqctl delete_user "$RABBITMQ_USERNAME" || true
 sudo rabbitmqctl delete_user zulip || true
 sudo rabbitmqctl delete_user guest || true
diff --git a/tools/postgres-init-dev-db b/tools/postgres-init-dev-db
index 5039532b1f..0eb2ee853f 100755
--- a/tools/postgres-init-dev-db
+++ b/tools/postgres-init-dev-db
@@ -22,7 +22,7 @@ VAGRANTUSERNAME=$(whoami)
 
 if [[ $# == 0 ]]; then
     USERNAME=zulip
-    PASSWORD=$("$(dirname "$0")/../bin/get-django-setting" LOCAL_DATABASE_PASSWORD)
+    PASSWORD=$("$(dirname "$0")/../scripts/get-django-setting" LOCAL_DATABASE_PASSWORD)
     DBNAME=zulip
     SEARCH_PATH="$USERNAME",public
 elif [[ $# == 4 ]]; then
diff --git a/tools/postgres-init-test-db b/tools/postgres-init-test-db
index 0a3a461b1e..442a028181 100755
--- a/tools/postgres-init-test-db
+++ b/tools/postgres-init-test-db
@@ -2,4 +2,4 @@
 set -x
 set -e
 
-"$(dirname "$0")/postgres-init-dev-db" zulip_test "$("$(dirname "$0")/../bin/get-django-setting" LOCAL_DATABASE_PASSWORD)" zulip_test zulip,public
+"$(dirname "$0")/postgres-init-dev-db" zulip_test "$("$(dirname "$0")/../scripts/get-django-setting" LOCAL_DATABASE_PASSWORD)" zulip_test zulip,public