diff --git a/playbook.yml b/playbooks/app-install.yml
similarity index 84%
rename from playbook.yml
rename to playbooks/app-install.yml
index cb488b6..89147ad 100755
--- a/playbook.yml
+++ b/playbooks/app-install.yml
@@ -12,10 +12,10 @@
 
     - name: Build env file
       template:
-        src: .env.j2
+        src: ../templates/.env.j2
         dest: '{{ working_dir }}/{{ name }}/.env.pilot'
 
     - name: Build docker-compose file
       template:
-        src: docker-compose.yml.j2
+        src: ../templates/docker-compose.yml.j2
         dest: '{{ working_dir }}/{{ name }}/docker-compose.pilot.yml'
diff --git a/start-app.yml b/playbooks/app-start.yml
similarity index 100%
rename from start-app.yml
rename to playbooks/app-start.yml
diff --git a/stop-app.yml b/playbooks/app-stop.yml
similarity index 100%
rename from stop-app.yml
rename to playbooks/app-stop.yml
diff --git a/.env.j2 b/templates/.env.j2
similarity index 100%
rename from .env.j2
rename to templates/.env.j2
diff --git a/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
similarity index 100%
rename from docker-compose.yml.j2
rename to templates/docker-compose.yml.j2