diff --git a/tasks/main.yml b/tasks/main.yml
index 803a65d..4a6a2c6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -66,14 +66,14 @@
       context: "{{ my_context }}"
       resource_definition: "{{ lookup('template', item) | from_yaml }}"
     with_items:
-    - psp.yaml.j2
-    - cluster-role-binding.yaml.j2
-    - cluster-role.yaml.j2
-    - sa.yaml.j2
-    - svc.yaml.j2
-    - ds.yaml.j2
-    - probe-deploy.yaml.j2
-    - deploy.yaml.j2
-    - weave_ingress.yaml.j2
+    - scope/psp.yaml.j2
+    - scope/cluster-role-binding.yaml.j2
+    - scope/cluster-role.yaml.j2
+    - scope/sa.yaml.j2
+    - scope/svc.yaml.j2
+    - scope/ds.yaml.j2
+    - scope/probe-deploy.yaml.j2
+    - scope/deploy.yaml.j2
+    - scope/weave_ingress.yaml.j2
     tags: weave
 
diff --git a/templates/cluster-role-binding.yaml.j2 b/templates/scope/cluster-role-binding.yaml.j2
similarity index 100%
rename from templates/cluster-role-binding.yaml.j2
rename to templates/scope/cluster-role-binding.yaml.j2
diff --git a/templates/cluster-role.yaml.j2 b/templates/scope/cluster-role.yaml.j2
similarity index 100%
rename from templates/cluster-role.yaml.j2
rename to templates/scope/cluster-role.yaml.j2
diff --git a/templates/deploy.yaml.j2 b/templates/scope/deploy.yaml.j2
similarity index 100%
rename from templates/deploy.yaml.j2
rename to templates/scope/deploy.yaml.j2
diff --git a/templates/ds.yaml.j2 b/templates/scope/ds.yaml.j2
similarity index 100%
rename from templates/ds.yaml.j2
rename to templates/scope/ds.yaml.j2
diff --git a/templates/probe-deploy.yaml.j2 b/templates/scope/probe-deploy.yaml.j2
similarity index 100%
rename from templates/probe-deploy.yaml.j2
rename to templates/scope/probe-deploy.yaml.j2
diff --git a/templates/psp.yaml.j2 b/templates/scope/psp.yaml.j2
similarity index 100%
rename from templates/psp.yaml.j2
rename to templates/scope/psp.yaml.j2
diff --git a/templates/sa.yaml.j2 b/templates/scope/sa.yaml.j2
similarity index 100%
rename from templates/sa.yaml.j2
rename to templates/scope/sa.yaml.j2
diff --git a/templates/svc.yaml.j2 b/templates/scope/svc.yaml.j2
similarity index 100%
rename from templates/svc.yaml.j2
rename to templates/scope/svc.yaml.j2
diff --git a/templates/weave_ingress.yaml.j2 b/templates/scope/weave_ingress.yaml.j2
similarity index 100%
rename from templates/weave_ingress.yaml.j2
rename to templates/scope/weave_ingress.yaml.j2