diff --git a/Bootstrap.md b/Bootstrap.md
index 0576476..383e32b 100644
--- a/Bootstrap.md
+++ b/Bootstrap.md
@@ -49,6 +49,7 @@ $ argocd app create main \
     --dest-server https://kubernetes.default.svc \
     --repo git@github.com:gorilych/gf-k8s.git \
     --path main \
+    --directory-recurse \
     --sync-policy automated \
     --self-heal --auto-prune
 ```
diff --git a/main/Chart.yaml b/main/Chart.yaml
deleted file mode 100644
index bbef53c..0000000
--- a/main/Chart.yaml
+++ /dev/null
@@ -1 +0,0 @@
-name: main
diff --git a/main/templates/argocd.yaml b/main/apps/argocd.yaml
similarity index 100%
rename from main/templates/argocd.yaml
rename to main/apps/argocd.yaml
diff --git a/main/templates/cert-manager.yaml b/main/apps/cert-manager.yaml
similarity index 100%
rename from main/templates/cert-manager.yaml
rename to main/apps/cert-manager.yaml
diff --git a/main/templates/grafana.yaml b/main/apps/grafana.yaml
similarity index 100%
rename from main/templates/grafana.yaml
rename to main/apps/grafana.yaml
diff --git a/main/templates/nginx-ingress.yaml b/main/apps/nginx-ingress.yaml
similarity index 100%
rename from main/templates/nginx-ingress.yaml
rename to main/apps/nginx-ingress.yaml
diff --git a/main/templates/oauth2-proxy.yaml b/main/apps/oauth2-proxy.yaml
similarity index 100%
rename from main/templates/oauth2-proxy.yaml
rename to main/apps/oauth2-proxy.yaml
diff --git a/main/templates/prometheus-operator.yaml b/main/apps/prometheus-operator.yaml
similarity index 100%
rename from main/templates/prometheus-operator.yaml
rename to main/apps/prometheus-operator.yaml
diff --git a/main/templates/services.yaml b/main/apps/services.yaml
similarity index 100%
rename from main/templates/services.yaml
rename to main/apps/services.yaml
diff --git a/main/templates/namespace-argocd.yaml b/main/namespaces/argocd.yaml
similarity index 100%
rename from main/templates/namespace-argocd.yaml
rename to main/namespaces/argocd.yaml
diff --git a/main/templates/namespace-cert-manager.yaml b/main/namespaces/cert-manager.yaml
similarity index 100%
rename from main/templates/namespace-cert-manager.yaml
rename to main/namespaces/cert-manager.yaml
diff --git a/main/templates/namespace-grafana.yaml b/main/namespaces/grafana.yaml
similarity index 100%
rename from main/templates/namespace-grafana.yaml
rename to main/namespaces/grafana.yaml
diff --git a/main/templates/namespace-monitoring.yaml b/main/namespaces/monitoring.yaml
similarity index 100%
rename from main/templates/namespace-monitoring.yaml
rename to main/namespaces/monitoring.yaml
diff --git a/main/templates/namespace-nginx-ingress.yaml b/main/namespaces/nginx-ingress.yaml
similarity index 100%
rename from main/templates/namespace-nginx-ingress.yaml
rename to main/namespaces/nginx-ingress.yaml
diff --git a/main/templates/namespace-oauth2-proxy.yaml b/main/namespaces/oauth2-proxy.yaml
similarity index 100%
rename from main/templates/namespace-oauth2-proxy.yaml
rename to main/namespaces/oauth2-proxy.yaml
diff --git a/main/templates/namespace-prometheus-operator.yaml b/main/namespaces/prometheus-operator.yaml
similarity index 100%
rename from main/templates/namespace-prometheus-operator.yaml
rename to main/namespaces/prometheus-operator.yaml