diff --git a/add-front-matter.rb b/script/add-front-matter.rb
similarity index 100%
rename from add-front-matter.rb
rename to script/add-front-matter.rb
diff --git a/script/build b/script/build
index 8fb69d46..13231f34 100755
--- a/script/build
+++ b/script/build
@@ -40,8 +40,8 @@ for file in **/Home.md; do
   mv "$file" "$(dirname "$file")/index.md"
 done
 
-./add-front-matter.rb ms/** smokey/** &
-./create-data-files.rb &
+script/add-front-matter.rb ms/** smokey/** &
+script/create-data-files.rb &
 wait
 
 git -C ./ms     log -1 --pretty="MS wiki commit:     [%h] %s"
diff --git a/create-data-files.rb b/script/create-data-files.rb
similarity index 100%
rename from create-data-files.rb
rename to script/create-data-files.rb
diff --git a/script/install b/script/install
index 1a8aab69..529c5113 100755
--- a/script/install
+++ b/script/install
@@ -1,16 +1,15 @@
 #!/bin/bash
 
-for i in "$@"
-do
-  case $i in
+while [ $# -ne 0 ]; do
+  case $1 in
     --deploy)
       DEPLOY=YES
-      shift # past argument with no value
       ;;
     *)
       # unknown option
       ;;
   esac
+  shift
 done
 
 if [[ $DEPLOY ]]; then