diff --git a/.github/workflows/sanity-tests.yml b/.github/workflows/sanity-tests.yml
index 42836ba..019c169 100644
--- a/.github/workflows/sanity-tests.yml
+++ b/.github/workflows/sanity-tests.yml
@@ -14,4 +14,4 @@ on:
 
 jobs:
   sanity-tests:
-    uses: ansible-network/github_actions/.github/workflows/sanity.yml@main
\ No newline at end of file
+    uses: ansible-network/github_actions/.github/workflows/sanity.yml@main
diff --git a/integrations/dynatrace_setup/README.MD b/integrations/templates/dynatrace_setup/README.MD
similarity index 100%
rename from integrations/dynatrace_setup/README.MD
rename to integrations/templates/dynatrace_setup/README.MD
diff --git a/integrations/dynatrace_setup/bigip_next_WAF_Rapid-Template.json b/integrations/templates/dynatrace_setup/bigip_next_WAF_Rapid-Template.json
similarity index 100%
rename from integrations/dynatrace_setup/bigip_next_WAF_Rapid-Template.json
rename to integrations/templates/dynatrace_setup/bigip_next_WAF_Rapid-Template.json
diff --git a/integrations/dynatrace_setup/collector.yaml b/integrations/templates/dynatrace_setup/collector.yaml
similarity index 100%
rename from integrations/dynatrace_setup/collector.yaml
rename to integrations/templates/dynatrace_setup/collector.yaml
diff --git a/integrations/dynatrace_setup/deploy_all.sh b/integrations/templates/dynatrace_setup/deploy_all.sh
similarity index 88%
rename from integrations/dynatrace_setup/deploy_all.sh
rename to integrations/templates/dynatrace_setup/deploy_all.sh
index fd83708..816b775 100644
--- a/integrations/dynatrace_setup/deploy_all.sh
+++ b/integrations/templates/dynatrace_setup/deploy_all.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
+
 # Replace [MyInstance_ID] and [MyAPIToken] with your Dynatrace Instance ID and Token (No Brackets)
 
 export DT_ENDPOINT="https://[MyInstance].live.dynatrace.com/api/v2/otlp"
 export API_TOKEN="[MyAPIToken]"
 
 podman pull dynatrace/edgeconnect:latest
-podman run --name dt-edgeconn --mount type=bind,src=${PWD}/edgeConnect.yaml,dst=/edgeConnect.yaml -d --restart always dynatrace/edgeconnect
+podman run --name dt-edgeconn --mount type=bind,src="$PWD"/edgeConnect.yaml,dst=/edgeConnect.yaml -d --restart always dynatrace/edgeconnect
 
-podman run --name dt-otelcol --env DT_ENDPOINT="$DT_ENDPOINT" --env API_TOKEN="$API_TOKEN" -p 5678:5678 -v /dynatrace/collector.yaml:/collector.yaml -d --restart always ghcr.io/dynatrace/dynatrace-otel-collector/dynatrace-otel-collector:latest --config collector.yaml
\ No newline at end of file
+podman run --name dt-otelcol --env DT_ENDPOINT="$DT_ENDPOINT" --env API_TOKEN="$API_TOKEN" -p 5678:5678 -v /dynatrace/collector.yaml:/collector.yaml -d --restart always ghcr.io/dynatrace/dynatrace-otel-collector/dynatrace-otel-collector:latest --config collector.yaml
diff --git a/integrations/dynatrace_setup/dynatrace_workflow_example.yaml b/integrations/templates/dynatrace_setup/dynatrace_workflow_example.yaml
similarity index 100%
rename from integrations/dynatrace_setup/dynatrace_workflow_example.yaml
rename to integrations/templates/dynatrace_setup/dynatrace_workflow_example.yaml
diff --git a/integrations/dynatrace_setup/edgeConnect.yaml b/integrations/templates/dynatrace_setup/edgeConnect.yaml
similarity index 100%
rename from integrations/dynatrace_setup/edgeConnect.yaml
rename to integrations/templates/dynatrace_setup/edgeConnect.yaml
diff --git a/integrations/elasticsearch_watcher/README.MD b/integrations/templates/elasticsearch_watcher/README.MD
similarity index 100%
rename from integrations/elasticsearch_watcher/README.MD
rename to integrations/templates/elasticsearch_watcher/README.MD
diff --git a/integrations/elasticsearch_watcher/watch_awaf_enable.json b/integrations/templates/elasticsearch_watcher/watch_awaf_enable.json
similarity index 100%
rename from integrations/elasticsearch_watcher/watch_awaf_enable.json
rename to integrations/templates/elasticsearch_watcher/watch_awaf_enable.json
diff --git a/integrations/elasticsearch_watcher/watch_blocked_ips.json b/integrations/templates/elasticsearch_watcher/watch_blocked_ips.json
similarity index 100%
rename from integrations/elasticsearch_watcher/watch_blocked_ips.json
rename to integrations/templates/elasticsearch_watcher/watch_blocked_ips.json