diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 14d930881..4b78a9ba0 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -88,7 +88,7 @@ When prompted build the non-linux binaries and test them.
 
         ...release notes go here...
 
-5.  Attach the binaries and `script/run.sh`
+5.  Attach the binaries and `script/run/run.sh`
 
 6.  Add "Thanks" with a list of contributors. The contributor list can be generated
     by running `./script/release/contributors`.
diff --git a/script/dev b/script/dev
deleted file mode 100755
index 80b3d0131..000000000
--- a/script/dev
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# This is a script for running Compose inside a Docker container. It's handy for
-# development.
-#
-# $ ln -s `pwd`/script/dev /usr/local/bin/docker-compose
-# $ cd /a/compose/project
-# $ docker-compose up
-# 
-
-set -e
-
-# Follow symbolic links
-if [ -h "$0" ]; then
-    DIR=$(readlink "$0")
-else
-    DIR=$0
-fi
-DIR="$(dirname "$DIR")"/..
-
-docker build -t docker-compose $DIR
-exec docker run -i -t -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:`pwd` -w `pwd` docker-compose $@
diff --git a/script/release/make-branch b/script/release/make-branch
index 46ba6bbca..86b4c9f64 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -65,10 +65,10 @@ git config "branch.${BRANCH}.release" $VERSION
 
 editor=${EDITOR:-vim}
 
-echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
+echo "Update versions in docs/install.md, compose/__init__.py, script/run/run.sh"
 $editor docs/install.md
 $editor compose/__init__.py
-$editor script/run.sh
+$editor script/run/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
diff --git a/script/run.ps1 b/script/run/run.ps1
similarity index 100%
rename from script/run.ps1
rename to script/run/run.ps1
diff --git a/script/run.sh b/script/run/run.sh
similarity index 100%
rename from script/run.sh
rename to script/run/run.sh
diff --git a/script/shell b/script/shell
deleted file mode 100755
index 903be76fc..000000000
--- a/script/shell
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -ex
-docker build -t docker-compose .
-exec docker run -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:/code -ti --rm --entrypoint bash docker-compose