diff --git a/ansible/common.yml b/ansible/common.yml
deleted file mode 100644
index 197512190..000000000
--- a/ansible/common.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: all
-  vars:
-    - update_apt_cache: yes
-  vars_files:
-    - env_vars/base.yml
-    - env_vars/dev.yml
-  
-  roles:
-      - base
-      - docker
diff --git a/ansible/deploy_app.yml b/ansible/deploy_app.yml
index 1dce39cb3..455a832b7 100644
--- a/ansible/deploy_app.yml
+++ b/ansible/deploy_app.yml
@@ -18,4 +18,4 @@
     - name: Reload gunicorn
       become: yes
       command: "docker kill --signal=HUP newsblur_web"
-      when: pulled.changed
+      when: pulled.changed and "app" in inventory_hostname
diff --git a/ansible/.gitignore b/ansible/inventories/.gitignore
similarity index 100%
rename from ansible/.gitignore
rename to ansible/inventories/.gitignore
diff --git a/ansible/check_droplet.py b/ansible/utils/check_droplet.py
similarity index 100%
rename from ansible/check_droplet.py
rename to ansible/utils/check_droplet.py
diff --git a/ansible/generate.py b/ansible/utils/generate.py
similarity index 100%
rename from ansible/generate.py
rename to ansible/utils/generate.py
diff --git a/terraform/digitalocean.tf b/terraform/digitalocean.tf
index dba5ee550..9fed5d45a 100644
--- a/terraform/digitalocean.tf
+++ b/terraform/digitalocean.tf
@@ -34,7 +34,7 @@ resource "digitalocean_droplet" "db-consul" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -51,7 +51,7 @@ resource "digitalocean_droplet" "www" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -69,7 +69,7 @@ resource "digitalocean_droplet" "app-django" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -87,7 +87,7 @@ resource "digitalocean_droplet" "app-counts" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -105,7 +105,7 @@ resource "digitalocean_droplet" "app-push" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -123,7 +123,7 @@ resource "digitalocean_droplet" "app-refresh" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -140,7 +140,7 @@ resource "digitalocean_droplet" "node-text" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -157,7 +157,7 @@ resource "digitalocean_droplet" "node-socket" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -174,7 +174,7 @@ resource "digitalocean_droplet" "node-favicons" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -191,7 +191,7 @@ resource "digitalocean_droplet" "node-images" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -208,7 +208,7 @@ resource "digitalocean_droplet" "node-page" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -225,7 +225,7 @@ resource "digitalocean_droplet" "db-elasticsearch" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -242,7 +242,7 @@ resource "digitalocean_droplet" "db-redis-user" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -259,7 +259,7 @@ resource "digitalocean_droplet" "db-redis-sessions" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -276,7 +276,7 @@ resource "digitalocean_droplet" "db-redis-story" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -293,7 +293,7 @@ resource "digitalocean_droplet" "db-redis-pubsub" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -310,7 +310,7 @@ resource "digitalocean_droplet" "db-postgres" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -328,7 +328,7 @@ resource "digitalocean_droplet" "db-mongo" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -346,7 +346,7 @@ resource "digitalocean_droplet" "task-celery" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -364,7 +364,7 @@ resource "digitalocean_droplet" "task-work" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -381,7 +381,7 @@ resource "digitalocean_droplet" "task-search" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@@ -398,7 +398,7 @@ resource "digitalocean_droplet" "task-beat" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 120"
+    command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"