diff --git a/docs/cluster_and_device_type_dev/cluster_and_device_type_dev.md b/docs/cluster_and_device_type_dev/cluster_and_device_type_dev.md
index e2460ff5a0a2b2..32a4ee044726b8 100644
--- a/docs/cluster_and_device_type_dev/cluster_and_device_type_dev.md
+++ b/docs/cluster_and_device_type_dev/cluster_and_device_type_dev.md
@@ -48,11 +48,11 @@ Note that the output should also be verified against the spec using the
 -   Goal: get zap to understand the new cluster so it can be used on devices
     (XML and glue)
 
-![](../getting_started/img/zap_compiler.png)
+![](../zap_and_codegen/img/zap_compiler.png)
 
 ### Cluster definitions and ZAP
 
-Please see [ZAP](../getting_started/zap.md) for an introduction to ZAP.
+Please see [ZAP](../zap_and_codegen/zap_intro.md) for an introduction to ZAP.
 
 After implementing the changes outlined in the wiki article, your cluster and
 device type should show up in zap. you can check this by running zaptool with
@@ -64,17 +64,17 @@ To ensure the cluster and device type are correctly implemented for ZAP, open
 the endpoint configuration and ensure the device type appears in the device type
 list.
 
-![](../getting_started/img/zap3.png)
+![](../zap_and_codegen/img/zap3.png)
 
 Next, check your cluster. The "domain" parameter in the XML controls which group
 the cluster is in. It should have all the expected attributes, commands and
 events.
 
-![](../getting_started/img/zap4.png)
+![](../zap_and_codegen/img/zap4.png)
 
 Last, ensure that your attributes have the storage option set appropriately.
 
-![](../getting_started/img/zap5.png)
+![](../zap_and_codegen/img/zap5.png)
 
 ### Cluster implementation - Ember and overrides
 
diff --git a/docs/getting_started/first_example.md b/docs/getting_started/first_example.md
index fefa1916c2ef83..e459be49daec41 100644
--- a/docs/getting_started/first_example.md
+++ b/docs/getting_started/first_example.md
@@ -121,3 +121,23 @@ where:
 -   on is the attribute name
 -   0x12344321 is the node ID you used for commissioning
 -   1 is the endpoint
+
+## Making changes to the example app composition
+
+Most of the examples use a static definition of the device composition. This
+composition is defined in a .zap file, that is intended to be read and managed
+through the ZAP tool. Example apps most commonly store their zap configuration
+files in a -common subdirectory which is shared across all the platform
+implementations.
+
+The basic steps involved in making changes to example apps are as follows:
+
+-   Open the .zap file in the zap tool and make the required changes
+-   Run generate.py to generate the .matter file from the .zap file
+-   Re-build the application to incorporate the changes
+-   Run device composition tests to ensure the new composition is spec compliant
+
+Information on updating with ZAP can be found in
+[Updating an application ZAP file](../zap_and_codegen/code_generation.md#flow-for-updating-an-application-zap-file).
+
+Information on testing can be found in [Testing](../testing/index.md).
diff --git a/docs/getting_started/index.md b/docs/getting_started/index.md
index ea881141ff43ec..1d928bb0bfb60b 100644
--- a/docs/getting_started/index.md
+++ b/docs/getting_started/index.md
@@ -12,5 +12,4 @@ The following docs are a brief introduction to SDK development.
 ```
 
 -   [Running your first example](./first_example.md)
--   [SDK Basics](./SDKBasics.md)
--   [ZAP](./zap.md)
+-   [SDK Architecture Basics](./SDKBasics.md)
diff --git a/docs/index.md b/docs/index.md
index 37caa6c993085b..ab6902d515cdb9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,8 +18,8 @@ product_considerations/index
 testing/index
 tips_and_troubleshooting/index
 tools/index
+zap_and_codegen/index
 BUG_REPORT
-code_generation
 upgrading
 
 ```
diff --git a/docs/code_generation.md b/docs/zap_and_codegen/code_generation.md
similarity index 98%
rename from docs/code_generation.md
rename to docs/zap_and_codegen/code_generation.md
index bf5b6f3036963a..ea51e1f76b8089 100644
--- a/docs/code_generation.md
+++ b/docs/zap_and_codegen/code_generation.md
@@ -197,6 +197,11 @@ via `-o/--output-dir`.
 ./scripts/tools/zap/generate.py $PATH_TO_ZAP_FILE
 ```
 
+Rebuild the application.
+
+It is also recommended to run device composition tests to ensure the selected
+composition is spec compliant (see [Testing](../testing/index.md))
+
 ### Compile-time code generation / pre-generated code
 
 A subset of code generation (both `codegen.py` and `zap-cli`) is done at compile
diff --git a/docs/getting_started/img/zap1.png b/docs/zap_and_codegen/img/zap1.png
similarity index 100%
rename from docs/getting_started/img/zap1.png
rename to docs/zap_and_codegen/img/zap1.png
diff --git a/docs/getting_started/img/zap2.png b/docs/zap_and_codegen/img/zap2.png
similarity index 100%
rename from docs/getting_started/img/zap2.png
rename to docs/zap_and_codegen/img/zap2.png
diff --git a/docs/getting_started/img/zap3.png b/docs/zap_and_codegen/img/zap3.png
similarity index 100%
rename from docs/getting_started/img/zap3.png
rename to docs/zap_and_codegen/img/zap3.png
diff --git a/docs/getting_started/img/zap4.png b/docs/zap_and_codegen/img/zap4.png
similarity index 100%
rename from docs/getting_started/img/zap4.png
rename to docs/zap_and_codegen/img/zap4.png
diff --git a/docs/getting_started/img/zap5.png b/docs/zap_and_codegen/img/zap5.png
similarity index 100%
rename from docs/getting_started/img/zap5.png
rename to docs/zap_and_codegen/img/zap5.png
diff --git a/docs/getting_started/img/zap6.png b/docs/zap_and_codegen/img/zap6.png
similarity index 100%
rename from docs/getting_started/img/zap6.png
rename to docs/zap_and_codegen/img/zap6.png
diff --git a/docs/getting_started/img/zap_compiler.png b/docs/zap_and_codegen/img/zap_compiler.png
similarity index 100%
rename from docs/getting_started/img/zap_compiler.png
rename to docs/zap_and_codegen/img/zap_compiler.png
diff --git a/docs/zap_and_codegen/index.md b/docs/zap_and_codegen/index.md
new file mode 100644
index 00000000000000..7301f03b2147d7
--- /dev/null
+++ b/docs/zap_and_codegen/index.md
@@ -0,0 +1,8 @@
+# ZAP and Codegen
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+*
+```
diff --git a/docs/getting_started/zap.md b/docs/zap_and_codegen/zap_intro.md
similarity index 100%
rename from docs/getting_started/zap.md
rename to docs/zap_and_codegen/zap_intro.md