diff --git a/src/app/docs/README.md b/src/app/docs/README.md
index afaca66c2370d2..234369e3d2f83b 100644
--- a/src/app/docs/README.md
+++ b/src/app/docs/README.md
@@ -29,6 +29,10 @@ Framework including the file you are reading right now.
 This directory contains all of the cluster implementations included in the CHIP
 ZCL Application Framework.
 
+### <code>/src/app/zap></code>
+
+This directory contains all of the templates and helpers specific to CHIP for the ZAP tool.
+
 ## Public APIs
 
 ### Attribute changes
diff --git a/third_party/zap/templates/README.md b/src/app/zap/README.md
similarity index 74%
rename from third_party/zap/templates/README.md
rename to src/app/zap/README.md
index 6819e1c4ea9e8c..ca29e9cf03cce2 100644
--- a/third_party/zap/templates/README.md
+++ b/src/app/zap/README.md
@@ -12,14 +12,14 @@ Run ZAP with UI to configure endpoints and clusters
 
 ```
 cd ./third_party/zap/repo/
-node src-script/zap-start.js --logToStdout  --gen ../templates/chip-templates.json
+node src-script/zap-start.js --logToStdout  --gen ../../../src/app/zap/chip-templates.json
 ```
 
 Generate files in headless mode
 
 ```
 cd ./third_party/zap/repo/
-node src-script/zap-generate.js -z ./zcl-builtin/silabs/zcl.json -g ../templates/chip_templates.json -i <path to *.zap file> -o <Path to /gen/ folder>
+node src-script/zap-generate.js -z ./zcl-builtin/silabs/zcl.json -g ../../../src/app/zap/chip-templates.json -i <path to *.zap file> -o <Path to /gen/ folder>
 ```
 
 For more information please see the documentation under
diff --git a/third_party/zap/templates/af-structs.zapt b/src/app/zap/af-structs.zapt
similarity index 100%
rename from third_party/zap/templates/af-structs.zapt
rename to src/app/zap/af-structs.zapt
diff --git a/third_party/zap/templates/att-storage.zapt b/src/app/zap/att-storage.zapt
similarity index 100%
rename from third_party/zap/templates/att-storage.zapt
rename to src/app/zap/att-storage.zapt
diff --git a/third_party/zap/templates/attribute-id.zapt b/src/app/zap/attribute-id.zapt
similarity index 100%
rename from third_party/zap/templates/attribute-id.zapt
rename to src/app/zap/attribute-id.zapt
diff --git a/third_party/zap/templates/attribute-type.zapt b/src/app/zap/attribute-type.zapt
similarity index 100%
rename from third_party/zap/templates/attribute-type.zapt
rename to src/app/zap/attribute-type.zapt
diff --git a/third_party/zap/templates/call-command-handler-src.zapt b/src/app/zap/call-command-handler-src.zapt
similarity index 100%
rename from third_party/zap/templates/call-command-handler-src.zapt
rename to src/app/zap/call-command-handler-src.zapt
diff --git a/third_party/zap/templates/call-command-handler.zapt b/src/app/zap/call-command-handler.zapt
similarity index 100%
rename from third_party/zap/templates/call-command-handler.zapt
rename to src/app/zap/call-command-handler.zapt
diff --git a/third_party/zap/templates/callback-stub-src.zapt b/src/app/zap/callback-stub-src.zapt
similarity index 100%
rename from third_party/zap/templates/callback-stub-src.zapt
rename to src/app/zap/callback-stub-src.zapt
diff --git a/third_party/zap/templates/callback.zapt b/src/app/zap/callback.zapt
similarity index 100%
rename from third_party/zap/templates/callback.zapt
rename to src/app/zap/callback.zapt
diff --git a/third_party/zap/templates/chip-templates.json b/src/app/zap/chip-templates.json
similarity index 100%
rename from third_party/zap/templates/chip-templates.json
rename to src/app/zap/chip-templates.json
diff --git a/third_party/zap/templates/client-command-macro.zapt b/src/app/zap/client-command-macro.zapt
similarity index 100%
rename from third_party/zap/templates/client-command-macro.zapt
rename to src/app/zap/client-command-macro.zapt
diff --git a/third_party/zap/templates/cluster-id.zapt b/src/app/zap/cluster-id.zapt
similarity index 100%
rename from third_party/zap/templates/cluster-id.zapt
rename to src/app/zap/cluster-id.zapt
diff --git a/third_party/zap/templates/command-id.zapt b/src/app/zap/command-id.zapt
similarity index 100%
rename from third_party/zap/templates/command-id.zapt
rename to src/app/zap/command-id.zapt
diff --git a/third_party/zap/templates/endpoint_config.zapt b/src/app/zap/endpoint_config.zapt
similarity index 100%
rename from third_party/zap/templates/endpoint_config.zapt
rename to src/app/zap/endpoint_config.zapt
diff --git a/third_party/zap/templates/enums.zapt b/src/app/zap/enums.zapt
similarity index 100%
rename from third_party/zap/templates/enums.zapt
rename to src/app/zap/enums.zapt
diff --git a/third_party/zap/templates/gen_config.zapt b/src/app/zap/gen_config.zapt
similarity index 100%
rename from third_party/zap/templates/gen_config.zapt
rename to src/app/zap/gen_config.zapt
diff --git a/third_party/zap/templates/helper-chip.js b/src/app/zap/helper-chip.js
similarity index 100%
rename from third_party/zap/templates/helper-chip.js
rename to src/app/zap/helper-chip.js
diff --git a/third_party/zap/templates/print-cluster.zapt b/src/app/zap/print-cluster.zapt
similarity index 100%
rename from third_party/zap/templates/print-cluster.zapt
rename to src/app/zap/print-cluster.zapt