diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 74ec69d..6b4673c 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -5,8 +5,8 @@
   </small>
   <br>
   <small>
-    &copy; 2015 wrestlingdev.com
+    &copy; <%= Time.now.year %>  wrestlingdev.com
   </small>
-  
+
 </footer>
-    
+
diff --git a/bin/fix-permissions.sh b/bin/fix-permissions.sh
new file mode 100755
index 0000000..a675e38
--- /dev/null
+++ b/bin/fix-permissions.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+USERNAME=$USER
+sudo chown -R ${USERNAME}:${USERNAME} ${project_dir}/.
+sudo chmod -R 774 ${project_dir}/.
diff --git a/bin/rails-dev-db-create.sh b/bin/rails-dev-db-create.sh
new file mode 100755
index 0000000..aa63596
--- /dev/null
+++ b/bin/rails-dev-db-create.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
+rake db:setup
+rake db:migrate RAILS_ENV=test
diff --git a/bin/rails-dev-run.sh b/bin/rails-dev-run.sh
new file mode 100755
index 0000000..52feef9
--- /dev/null
+++ b/bin/rails-dev-run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+if [ $# != 1 ]; then
+  echo "Please enter docker image name for the rails development environment"
+  exit 1
+fi
+
+docker build -t $1 -f ${project_dir}/deploy/rails-dev-Dockerfile ${project_dir}
+docker run -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash
diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh
new file mode 100755
index 0000000..961a6e7
--- /dev/null
+++ b/bin/run-all-tests.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
+rake db:migrate RAILS_ENV=test
+rake test
diff --git a/tmux.sh b/bin/tmux.sh
similarity index 60%
rename from tmux.sh
rename to bin/tmux.sh
index c51fc80..c928539 100755
--- a/tmux.sh
+++ b/bin/tmux.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
 CURRENT_SESSION=wrestlingdev
 tmux new-session -d -s $CURRENT_SESSION
 tmux send-keys 'vim' 'C-m'
@@ -6,7 +9,8 @@ tmux send-keys ':NERDTree' 'C-m'
 tmux rename-window rails-vim
 tmux new-window
 tmux rename-window rails
-tmux send-keys 'bash rails-dev.sh wrestlingdev' 'C-m'
+tmux send-keys 'bash bin/rails-dev-run.sh wrestlingdev' 'C-m'
+tmux send-keys 'bash bin/rails-dev-db-create.sh' 'C-m'
 tmux new-window
 tmux rename-window rails-git
 tmux select-window -t 0
diff --git a/app/controllers/.schools_controller.rb.swp b/deploy/.rails-dev-Dockerfile.swp
similarity index 70%
rename from app/controllers/.schools_controller.rb.swp
rename to deploy/.rails-dev-Dockerfile.swp
index cd08878..95e684a 100644
Binary files a/app/controllers/.schools_controller.rb.swp and b/deploy/.rails-dev-Dockerfile.swp differ
diff --git a/deploy/deploy-prod.sh b/deploy/deploy-prod.sh
index f375de2..b85995b 100755
--- a/deploy/deploy-prod.sh
+++ b/deploy/deploy-prod.sh
@@ -1,8 +1,11 @@
-gpg prod.env.gpg
-cd ..
-bash rails-prod.sh wrestlingdev
-cd deploy
-docker-compose -f docker-compose-prod-full-stack.yml up -d
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+gpg --output ${project_dir}/deploy/prod.env --decrypt ${project_dir}/deploy/prod.env.gpg
+docker build -t wrestlingdev-prod -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
+docker-compose -f ${project_dir}/deploy/docker-compose-prod-full-stack.yml up -d
 echo Make sure your local mysql database has a db for wrestlingdev called wrestlingtourney
 echo "mysqldump -u guy -ppassword -h host database_name > database.sql"
 echo "mysql -u guy -ppassword -h host database_name < database.sql"
+
+rm ${project_dir}/deploy/prod.env
diff --git a/deploy/deploy-test.sh b/deploy/deploy-test.sh
index 21116f5..c9a59bf 100755
--- a/deploy/deploy-test.sh
+++ b/deploy/deploy-test.sh
@@ -1,6 +1,7 @@
-cd ..
-docker build -t wrestlingdev -f rails-prod-Dockerfile .
-cd deploy
-docker-compose -f docker-compose-test.yml kill
-docker-compose -f docker-compose-test.yml up -d
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+docker build -t wrestlingdev -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
 echo Make sure your local mysql database has a wrestlingtourney db
diff --git a/deploy/docker-compose-prod-full-stack.yml b/deploy/docker-compose-prod-full-stack.yml
index 4bc765a..be57687 100644
--- a/deploy/docker-compose-prod-full-stack.yml
+++ b/deploy/docker-compose-prod-full-stack.yml
@@ -2,29 +2,31 @@ app:
   extends:
     file: docker-compose-common.yml
     service: app
+  image: wrestlingdev-prod
   links:
     - db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
 db:
   extends:
     file: docker-compose-common.yml
     service: db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
 worker:
   extends:
     file: docker-compose-common.yml
     service: worker
+  image: wrestlingdev-prod
   links:
     - db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
   command: bundle exec rake jobs:work RAILS_ENV=production
-  
+
 memcached:
   extends:
     file: docker-compose-common.yml
diff --git a/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile
similarity index 100%
rename from rails-dev-Dockerfile
rename to deploy/rails-dev-Dockerfile
diff --git a/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile
similarity index 97%
rename from rails-prod-Dockerfile
rename to deploy/rails-prod-Dockerfile
index 5937155..b1b53a4 100644
--- a/rails-prod-Dockerfile
+++ b/deploy/rails-prod-Dockerfile
@@ -1,6 +1,7 @@
 FROM ruby:2.4.2
 
 RUN apt-get -qq update \
+  && DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
     build-essential \
     libssl-dev \
diff --git a/rails-prod.sh b/deploy/rails-prod-create-image.sh
similarity index 58%
rename from rails-prod.sh
rename to deploy/rails-prod-create-image.sh
index e03aa95..006f5f6 100755
--- a/rails-prod.sh
+++ b/deploy/rails-prod-create-image.sh
@@ -1,16 +1,14 @@
 #!/bin/bash -e
-docker pull ruby:2.2.3
-
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
 if [ $# != 1 ]; then
   echo "Please enter docker image name for the rails development environment"
   exit 1
 fi
 
-docker build -t $1 -f rails-prod-Dockerfile .
+docker build -t $1 -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}/.
 
 #Kill and remove containers gracefully without error if none are running
 docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker kill $id
 done
 
-docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1
diff --git a/fix-permissions.sh b/fix-permissions.sh
deleted file mode 100755
index 7578b9f..0000000
--- a/fix-permissions.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-USERNAME=$USER
-sudo chown -R ${USERNAME}:${USERNAME} .
-sudo chmod -R 774 .
diff --git a/rails-dev-db.sh b/rails-dev-db.sh
deleted file mode 100755
index 7b59204..0000000
--- a/rails-dev-db.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rake db:setup
-rake db:migrate RAILS_ENV=test
diff --git a/rails-dev.sh b/rails-dev.sh
deleted file mode 100755
index 03ed3f9..0000000
--- a/rails-dev.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -e
-
-if [ $# != 1 ]; then
-  echo "Please enter docker image name for the rails development environment"
-  exit 1
-fi
-
-APPPATH="$(pwd)"
-
-docker build -t $1 -f rails-dev-Dockerfile .
-docker run -it -p 3000:3000 -v ${APPPATH}:/rails $1 /bin/bash
\ No newline at end of file
diff --git a/rails-worker-prod.sh b/rails-worker-prod.sh
deleted file mode 100755
index 3e75cc7..0000000
--- a/rails-worker-prod.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -e
-docker pull ruby:2.2.3
-
-if [ $# != 1 ]; then
-  echo "Please enter docker image name for the rails development environment"
-  exit 1
-fi
-
-docker build -t $1 -f rails-prod-Dockerfile .
-
-#Kill and remove containers gracefully without error if none are running
-docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
-  docker kill $id
-done
-
-docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /etc/localtime:/etc/localtime $1 bundle exec rake jobs:work RAILS_ENV=production
\ No newline at end of file
diff --git a/run-all-tests.sh b/run-all-tests.sh
deleted file mode 100755
index 7452d87..0000000
--- a/run-all-tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rake db:migrate RAILS_ENV=test
-rake test
\ No newline at end of file