Docs: Move platform docs into their own directory and separate into subfolders (#34233) * Move files and add indexes * Fix references for new paths * Fix references * Fix up some new references * move darwin back into guides * remove darwin from platforms * Restyled by prettier-markdown * whoops, didn't save * Restyled by prettier-markdown * fix dishwasher readme * fix boufallolabs readme * fix links --------- Co-authored-by: Restyled.io <commits@restyled.io>

commit: 32a375c6ac7b18d3b4231d3d81a3a090e05f96fe [log] [tgz]
author: C Freeman <cecille@google.com> Mon Oct 14 23:05:15 2024 -0400
committer: GitHub <noreply@github.com> Tue Oct 15 03:05:15 2024 +0000
tree: e1c5d370a3cd9352ede8fab0cb12393077f8996d
parent: 0c59ebf6b37cd16f196db42e43f5f6269727db6c [diff]
diff --git a/docs/guides/repl/Matter_Access_Control.ipynb b/docs/development_controllers/chip-repl/Matter_Access_Control.ipynb
similarity index 100%
rename from docs/guides/repl/Matter_Access_Control.ipynb
rename to docs/development_controllers/chip-repl/Matter_Access_Control.ipynb


diff --git a/docs/guides/repl/Matter_Basic_Interactions.ipynb b/docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb
similarity index 100%
rename from docs/guides/repl/Matter_Basic_Interactions.ipynb
rename to docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb


diff --git a/docs/guides/repl/Matter_Multi_Fabric_Commissioning.ipynb b/docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb
similarity index 100%
rename from docs/guides/repl/Matter_Multi_Fabric_Commissioning.ipynb
rename to docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb


diff --git a/docs/guides/repl/Matter_REPL_Intro.ipynb b/docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb
similarity index 100%
rename from docs/guides/repl/Matter_REPL_Intro.ipynb
rename to docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb


diff --git a/docs/development_controllers/chip-repl/index.md b/docs/development_controllers/chip-repl/index.md
new file mode 100644
index 0000000..b17962a
--- /dev/null
+++ b/docs/development_controllers/chip-repl/index.md

@@ -0,0 +1,15 @@
+# chip-repl
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+-   [Matter REPL](./matter-repl.md)
+-   [Intro](./Matter_REPL_Intro.ipynb)
+-   [Access Control](./Matter_Access_Control.ipynb)
+-   [Basic interactions](./Matter_Basic_Interactions.ipynb)
+-   [Fabric Commissioning](./Matter_Multi_Fabric_Commissioning.ipynb)

diff --git a/docs/guides/matter-repl.md b/docs/development_controllers/chip-repl/matter-repl.md
similarity index 100%
rename from docs/guides/matter-repl.md
rename to docs/development_controllers/chip-repl/matter-repl.md


diff --git a/docs/guides/python_chip_controller_advanced_usage.md b/docs/development_controllers/chip-repl/python_chip_controller_advanced_usage.md
similarity index 100%
rename from docs/guides/python_chip_controller_advanced_usage.md
rename to docs/development_controllers/chip-repl/python_chip_controller_advanced_usage.md


diff --git a/docs/guides/python_chip_controller_building.md b/docs/development_controllers/chip-repl/python_chip_controller_building.md
similarity index 98%
rename from docs/guides/python_chip_controller_building.md
rename to docs/development_controllers/chip-repl/python_chip_controller_building.md
index 62e60b8..aa49ada 100644
--- a/docs/guides/python_chip_controller_building.md
+++ b/docs/development_controllers/chip-repl/python_chip_controller_building.md

@@ -39,7 +39,7 @@
 To build and run the Python CHIP controller:
 
 1. Install all necessary packages and prepare the build system. For more
-   details, see the [Building Matter](BUILDING.md) documentation:
+   details, see the [Building Matter](../../guides/BUILDING.md) documentation:
 
     ```
     sudo apt-get update

diff --git a/docs/guides/chip_tool_guide.md b/docs/development_controllers/chip-tool/chip_tool_guide.md
similarity index 99%
rename from docs/guides/chip_tool_guide.md
rename to docs/development_controllers/chip-tool/chip_tool_guide.md
index 31aa293..8aac8da 100644
--- a/docs/guides/chip_tool_guide.md
+++ b/docs/development_controllers/chip-tool/chip_tool_guide.md

@@ -38,7 +38,8 @@
 To build and run the CHIP Tool:
 
 1. Install all required packages for Matter and prepare the source code and the
-   build system. Read the [Building Matter](BUILDING.md) guide for instructions.
+   build system. Read the [Building Matter](../../guides/BUILDING.md) guide for
+   instructions.
 2. Open a command prompt in the `connectedhomeip` directory.
 3. Run the following command:
 

diff --git a/docs/development_controllers/chip-tool/index.md b/docs/development_controllers/chip-tool/index.md
new file mode 100644
index 0000000..69dc7dc
--- /dev/null
+++ b/docs/development_controllers/chip-tool/index.md

@@ -0,0 +1,11 @@
+# chip-tool
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+-   [chip-tool guide](./chip_tool_guide.md)

diff --git a/docs/development_controllers/index.md b/docs/development_controllers/index.md
new file mode 100644
index 0000000..dfc6b33
--- /dev/null
+++ b/docs/development_controllers/index.md

@@ -0,0 +1,13 @@
+# Development Controllers
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+chip-repl/index
+chip-tool/index
+```
+
+-   [chip-tool](./chip-tool)
+-   [chip-repl](./chip-repl)

diff --git a/docs/getting_started/first_example.md b/docs/getting_started/first_example.md
index 89ab7d4..14fe239 100644
--- a/docs/getting_started/first_example.md
+++ b/docs/getting_started/first_example.md

@@ -26,7 +26,7 @@
 
 [chip-tool](../../examples/chip-tool/) is a C++ command line controller with an
 interactive shell. More information on chip-tool can be found in the
-[chip-tool guide](../guides/chip_tool_guide.md).
+[chip-tool guide](../development_controllers/chip-tool/chip_tool_guide.md).
 
 [chip-repl](../../src/controller/python/chip-repl.py) is a shell for the python
 controller. The chip-repl is part of the python controller framework, often used

diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md
index 00165e6..4692c0b 100644
--- a/docs/guides/darwin.md
+++ b/docs/guides/darwin.md

@@ -292,17 +292,17 @@
 -   [ESP32 Lighting](/examples/lighting-app/esp32/README.md)
 -   [ESP32 Temperature Sensor](/examples/temperature-measurement-app/esp32/README.md)
 -   [mbedOS](/examples/all-clusters-app/mbed/README.md)
--   [nRF Connect All Clusters](./nrfconnect_examples_configuration.md)
+-   [nRF Connect All Clusters](../platforms/nrf/nrfconnect_examples_configuration.md)
 -   [nRF Connect Pump](/examples/pump-app/nrfconnect/README.md)
--   [NXP Examples](./nxp/nxp_imx8m_linux_examples.md)
+-   [NXP Examples](../platforms/nxp/nxp_imx8m_linux_examples.md)
 -   [NXP](/examples/all-clusters-app/nxp/mw320/README.md)
 -   [Infineon CYW30739 Lighting](/examples/lighting-app/infineon/cyw30739/README.md)
 -   [Infineon PSoC6](/examples/all-clusters-app/infineon/psoc6/README.md)
 -   [Qorvo](/examples/lighting-app/qpg/README.md)
--   [Silicon Labs](./silabs_getting_started.md)
+-   [Silicon Labs](../platforms/silabs/silabs_getting_started.md)
 -   [Simulated Linux](./simulated_device_linux.md)
 -   [Telink](/examples/lighting-app/telink/README.md)
--   [TI Platform](./ti/ti_matter_overview.md)
+-   [TI Platform](../platforms/ti/ti_matter_overview.md)
 -   [Tizen](/examples/lighting-app/tizen/README.md)
 
 ## Providing Feedback to Apple

diff --git a/docs/guides/index.md b/docs/guides/index.md
index c1a8792..97167c8 100644
--- a/docs/guides/index.md
+++ b/docs/guides/index.md

@@ -9,56 +9,13 @@
 :hidden:
 
 *
-bouffalolab/matter_factory_data
-esp32/README
-nxp/README
-ti/ti_matter_overview
 ```
 
 ## Build Guides
 
 -   [Building](./BUILDING.md)
 
-## Platform Guides
-
--   [Android - Building](./android_building.md)
--   [Apple - Testing with iPhone, iPad, macOS, Apple TV, HomePod, Watch, etc](./darwin.md)
--   [ASR - Getting Started Guide](./asr_getting_started_guide.md)
--   [Bouffalo Lab - Matter factory data generation](./bouffalolab/matter_factory_data.md)
--   [Espressif (ESP32) - Getting Started Guide](./esp32/README.md)
--   [Infineon PSoC6 - Software Update](./infineon_psoc6_software_update.md)
--   [Linux - Simulated Devices](./simulated_device_linux.md)
--   [mbedOS - Adding a new target](./mbedos_add_new_target.md)
--   [mbedOS - Commissioning](./mbedos_commissioning.md)
--   [mbedOS - Platform Overview](./mbedos_platform_overview.md)
--   [nRF Connect - Android Commissioning](./nrfconnect_android_commissioning.md)
--   [nRF Connect - CLI Guide](./nrfconnect_examples_cli.md)
--   [nRF Connect - Configuration](./nrfconnect_examples_configuration.md)
--   [nRF Connect - Factory Data Configuration](./nrfconnect_factory_data_configuration.md)
--   [nRF Connect - Platform Overview](./nrfconnect_platform_overview.md)
--   [nRF Connect - Software Update](./nrfconnect_examples_software_update.md)
--   [NXP - Getting Started Guide](./nxp/README.md)
--   [Silicon Labs - Documentation](https://siliconlabs.github.io/matter/latest/index.html)
--   [Silicon Labs - Getting Started](./silabs_getting_started.md)
--   [Silicon Labs - Software Update](./silabs_efr32_software_update.md)
--   [Silicon Labs - CLI Guide](./silabs_cli_guide.md)
--   [TI - Platform Overview](./ti/ti_matter_overview.md)
-
-## Tool Guides
-
--   [CHIP Tool](./chip_tool_guide.md)
--   [Python Matter-Repl](./matter-repl.md)
--   [python-chip-controller - Advanced](./python_chip_controller_advanced_usage.md)
--   [python-chip-controller - Building](./python_chip_controller_building.md)
--   [CHEF test devices](../../examples/chef/README.md)
-    -   [New device type adding](../../examples/chef/NEW_CHEF_DEVICES.md)
-
 ## Development Guides
 
 -   [Access Control](./access-control-guide.md)
 -   [Matter IDL tooling and validation](./matter_idl_tooling.md)
-
-## Setup Guides
-
--   [Open Thread - Hardware suggestions](./openthread_rcp_nrf_dongle.md)
--   [Open Thread - Setting up a Raspberry Pi as a Border Router](./openthread_border_router_pi.md)

diff --git a/docs/index.md b/docs/index.md
index f4b4062..6b7553f 100644
--- a/docs/index.md
+++ b/docs/index.md

@@ -8,9 +8,11 @@
 PROJECT_FLOW
 VSCODE_DEVELOPMENT
 ci-cd/index
+development_controllers/index
 getting_started/index
 cluster_and_device_type_dev/index
 guides/index
+platforms/index
 style/index
 examples/index
 product_considerations/index

diff --git a/docs/guides/android_building.md b/docs/platforms/android/android_building.md
similarity index 100%
rename from docs/guides/android_building.md
rename to docs/platforms/android/android_building.md


diff --git a/docs/platforms/android/index.md b/docs/platforms/android/index.md
new file mode 100644
index 0000000..a8bdd37
--- /dev/null
+++ b/docs/platforms/android/index.md

@@ -0,0 +1,11 @@
+# Android
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Android - Building](./android_building.md)

diff --git a/docs/guides/asr_getting_started_guide.md b/docs/platforms/asr/asr_getting_started_guide.md
similarity index 97%
rename from docs/guides/asr_getting_started_guide.md
rename to docs/platforms/asr/asr_getting_started_guide.md
index e47cc55..e5a4bac 100644
--- a/docs/guides/asr_getting_started_guide.md
+++ b/docs/platforms/asr/asr_getting_started_guide.md

@@ -33,7 +33,7 @@
 
 ## Building the Example Application
 
--   [Setup Matter Environment](./BUILDING.md)
+-   [Setup Matter Environment](../../guides/BUILDING.md)
 
 -   Setup toolchain
     -   for ASR582X and ASR550X
@@ -140,7 +140,7 @@
    `build_examples.py` script. For example:
    `./scripts/build/build_examples.py --target asr-$ASR_BOARD-lighting-ota build`
 2. For more usage details, please refer to the
-   [OTA example](../../examples/ota-requestor-app/asr/README.md)
+   [OTA example](../../../examples/ota-requestor-app/asr/README.md)
 
 ## Factory
 

diff --git a/docs/platforms/asr/index.md b/docs/platforms/asr/index.md
new file mode 100644
index 0000000..f4748a4
--- /dev/null
+++ b/docs/platforms/asr/index.md

@@ -0,0 +1,11 @@
+# ASR
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[ASR - Getting Started Guide](./asr_getting_started_guide.md)

diff --git a/docs/platforms/bouffalolab/index.md b/docs/platforms/bouffalolab/index.md
new file mode 100644
index 0000000..bacc0e6
--- /dev/null
+++ b/docs/platforms/bouffalolab/index.md

@@ -0,0 +1,11 @@
+# Bouffalolab
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Bouffalo Lab - Matter factory data generation](./matter_factory_data.md)

diff --git a/docs/guides/bouffalolab/matter_factory_data.md b/docs/platforms/bouffalolab/matter_factory_data.md
similarity index 100%
rename from docs/guides/bouffalolab/matter_factory_data.md
rename to docs/platforms/bouffalolab/matter_factory_data.md


diff --git a/docs/guides/esp32/ble_settings.md b/docs/platforms/esp32/ble_settings.md
similarity index 100%
rename from docs/guides/esp32/ble_settings.md
rename to docs/platforms/esp32/ble_settings.md


diff --git a/docs/guides/esp32/build_app_and_commission.md b/docs/platforms/esp32/build_app_and_commission.md
similarity index 98%
rename from docs/guides/esp32/build_app_and_commission.md
rename to docs/platforms/esp32/build_app_and_commission.md
index 942cb6a..df295cc 100644
--- a/docs/guides/esp32/build_app_and_commission.md
+++ b/docs/platforms/esp32/build_app_and_commission.md

@@ -168,7 +168,7 @@
 #### Commissioning the Thread device (ESP32H2)
 
 -   For ESP32-H2, firstly start OpenThread Border Router, you can either use
-    [Raspberry Pi OpenThread Border Router](../openthread_border_router_pi.md)
+    [Raspberry Pi OpenThread Border Router](../openthread/openthread_border_router_pi.md)
     OR
     [ESP32 OpenThread Border Router](../../../examples/thread-br-app/esp32/README.md)
 

diff --git a/docs/guides/esp32/config_options.md b/docs/platforms/esp32/config_options.md
similarity index 100%
rename from docs/guides/esp32/config_options.md
rename to docs/platforms/esp32/config_options.md


diff --git a/docs/guides/esp32/factory_data.md b/docs/platforms/esp32/factory_data.md
similarity index 100%
rename from docs/guides/esp32/factory_data.md
rename to docs/platforms/esp32/factory_data.md


diff --git a/docs/guides/esp32/flash_nvs_encryption.md b/docs/platforms/esp32/flash_nvs_encryption.md
similarity index 100%
rename from docs/guides/esp32/flash_nvs_encryption.md
rename to docs/platforms/esp32/flash_nvs_encryption.md


diff --git a/docs/guides/esp32/README.md b/docs/platforms/esp32/index.md
similarity index 100%
rename from docs/guides/esp32/README.md
rename to docs/platforms/esp32/index.md


diff --git a/docs/guides/esp32/ota.md b/docs/platforms/esp32/ota.md
similarity index 100%
rename from docs/guides/esp32/ota.md
rename to docs/platforms/esp32/ota.md


diff --git a/docs/guides/esp32/providers.md b/docs/platforms/esp32/providers.md
similarity index 100%
rename from docs/guides/esp32/providers.md
rename to docs/platforms/esp32/providers.md


diff --git a/docs/guides/esp32/rpc_console.md b/docs/platforms/esp32/rpc_console.md
similarity index 100%
rename from docs/guides/esp32/rpc_console.md
rename to docs/platforms/esp32/rpc_console.md


diff --git a/docs/guides/esp32/secure_cert_partition.md b/docs/platforms/esp32/secure_cert_partition.md
similarity index 100%
rename from docs/guides/esp32/secure_cert_partition.md
rename to docs/platforms/esp32/secure_cert_partition.md


diff --git a/docs/guides/esp32/setup_idf_chip.md b/docs/platforms/esp32/setup_idf_chip.md
similarity index 100%
rename from docs/guides/esp32/setup_idf_chip.md
rename to docs/platforms/esp32/setup_idf_chip.md


diff --git a/docs/guides/esp32/vs_code_development.md b/docs/platforms/esp32/vs_code_development.md
similarity index 100%
rename from docs/guides/esp32/vs_code_development.md
rename to docs/platforms/esp32/vs_code_development.md


diff --git a/docs/platforms/index.md b/docs/platforms/index.md
new file mode 100644
index 0000000..4011f2e
--- /dev/null
+++ b/docs/platforms/index.md

@@ -0,0 +1,35 @@
+# Platform Guides
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+android/index
+asr/index
+bouffalolab/index
+esp32/index
+infineon/index
+mbedos/index
+nrf/index
+nxp/index
+openiotsdk/index
+openthread/index
+silabs/index
+stm32/index
+ti/index
+```
+
+-   [Android](./android/)
+-   [ASR](./asr/)
+-   [Bouffalo Lab](./bouffalolab)
+-   [ESP32](./esp32/)
+-   [Infineon](./infineon/)
+-   [MbedOS](./mbedos/)
+-   [NRF](./nrf/)
+-   [NXP](./nxp/)
+-   [OpenIoTSDK](./openiotsdk/)
+-   [OpenThread](./openthread/)
+-   [Silabs](./silabs/)
+-   [STM32](./stm32/)
+-   [TI](./ti/)

diff --git a/docs/platforms/infineon/index.md b/docs/platforms/infineon/index.md
new file mode 100644
index 0000000..7784db7
--- /dev/null
+++ b/docs/platforms/infineon/index.md

@@ -0,0 +1,12 @@
+# Infineon
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Provisioning](./infineon_psoc6_software_update.md)
+[Software update](./infineon_psoc6_software_update.md)

diff --git a/docs/guides/infineon_psoc6_software_update.md b/docs/platforms/infineon/infineon_psoc6_software_update.md
similarity index 100%
rename from docs/guides/infineon_psoc6_software_update.md
rename to docs/platforms/infineon/infineon_psoc6_software_update.md


diff --git a/docs/guides/infineon_trustm_provisioning.md b/docs/platforms/infineon/infineon_trustm_provisioning.md
similarity index 100%
rename from docs/guides/infineon_trustm_provisioning.md
rename to docs/platforms/infineon/infineon_trustm_provisioning.md


diff --git a/docs/guides/images/matter_mbedos_overview_simplified.png b/docs/platforms/mbedos/images/matter_mbedos_overview_simplified.png
similarity index 100%
rename from docs/guides/images/matter_mbedos_overview_simplified.png
rename to docs/platforms/mbedos/images/matter_mbedos_overview_simplified.png
Binary files differ

diff --git a/docs/platforms/mbedos/index.md b/docs/platforms/mbedos/index.md
new file mode 100644
index 0000000..5c29ab7
--- /dev/null
+++ b/docs/platforms/mbedos/index.md

@@ -0,0 +1,13 @@
+# MbedOS
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Add new target](./mbedos_add_new_target.md)
+[Commissioning](./mbedos_commissioning.md)
+[Platform overview](./mbedos_platform_overview.md)

diff --git a/docs/guides/mbedos_add_new_target.md b/docs/platforms/mbedos/mbedos_add_new_target.md
similarity index 100%
rename from docs/guides/mbedos_add_new_target.md
rename to docs/platforms/mbedos/mbedos_add_new_target.md


diff --git a/docs/guides/mbedos_commissioning.md b/docs/platforms/mbedos/mbedos_commissioning.md
similarity index 95%
rename from docs/guides/mbedos_commissioning.md
rename to docs/platforms/mbedos/mbedos_commissioning.md
index 8b69878..1d6dc72 100644
--- a/docs/guides/mbedos_commissioning.md
+++ b/docs/platforms/mbedos/mbedos_commissioning.md

@@ -58,7 +58,7 @@
 based smartphone, you must first build and install the CHIPTool application.
 
 To build the CHIPTool application for your smartphone, read
-[Android building guide](android_building.md).
+[Android building guide](../android/android_building.md).
 
 After building, install the application by completing the following steps:
 
@@ -154,7 +154,7 @@
 If **Lighting LED** is available then brightness change can be observed.
 
 > For more details about Android CHIPTool please visit
-> [CHIPTool](../../examples/android/CHIPTool/README.md)
+> [CHIPTool](../../../examples/android/CHIPTool/README.md)
 
 ## POSIX CLI CHIPTool
 
@@ -164,7 +164,7 @@
 device, you can build and run the Matter Client example application on it.
 
 To build the POSIX CLI CHIPTool application check the guide
-[POSIX CLI guide](../../examples/chip-tool/README.md).
+[POSIX CLI guide](../../../examples/chip-tool/README.md).
 
 ### Device commissioning for CLI
 
@@ -196,7 +196,7 @@
 The client will send a single command packet and then exit.
 
 > For more details about POSIX CLI CHIPTool please visit
-> [POSIX CLI CHIPTool](../../examples/chip-tool/README.md)
+> [POSIX CLI CHIPTool](../../../examples/chip-tool/README.md)
 
 ## Python Device Controller
 
@@ -206,7 +206,7 @@
 application, you can build and run the Python CHIP controller.
 
 To build and install the Python Device Controller application check the guide
-[Python Device Controller guide](python_chip_controller_building.md).
+[Python Device Controller guide](../../development_controllers/chip-repl/python_chip_controller_building.md).
 
 ### Device commissioning for Python Device Controller
 

diff --git a/docs/guides/mbedos_platform_overview.md b/docs/platforms/mbedos/mbedos_platform_overview.md
similarity index 94%
rename from docs/guides/mbedos_platform_overview.md
rename to docs/platforms/mbedos/mbedos_platform_overview.md
index b70d5ed..8cdce2c 100644
--- a/docs/guides/mbedos_platform_overview.md
+++ b/docs/platforms/mbedos/mbedos_platform_overview.md

@@ -85,11 +85,11 @@
 Sample Matter applications are provided for the Mbed OS platform. They can be
 used to speed up development:
 
--   [shell](../../examples/shell/mbed/README.md)
--   [all-clusters-app](../../examples/all-clusters-app/mbed/README.md)
--   [lock-app](../../examples/lock-app/mbed/README.md)
--   [lighting-app](../../examples/lighting-app/mbed/README.md)
--   [pigweed-app](../../examples/pigweed-app/mbed/README.md)
+-   [shell](../../../examples/shell/mbed/README.md)
+-   [all-clusters-app](../../../examples/all-clusters-app/mbed/README.md)
+-   [lock-app](../../../examples/lock-app/mbed/README.md)
+-   [lighting-app](../../../examples/lighting-app/mbed/README.md)
+-   [pigweed-app](../../../examples/pigweed-app/mbed/README.md)
 
 ### Example configuration
 

diff --git a/docs/guides/images/CHIPTool_device_commissioned.png b/docs/platforms/nrf/images/CHIPTool_device_commissioned.png
similarity index 100%
rename from docs/guides/images/CHIPTool_device_commissioned.png
rename to docs/platforms/nrf/images/CHIPTool_device_commissioned.png
Binary files differ

diff --git a/docs/guides/images/matter_nrfconnect_overview_simplified_ncs.svg b/docs/platforms/nrf/images/matter_nrfconnect_overview_simplified_ncs.svg
similarity index 100%
rename from docs/guides/images/matter_nrfconnect_overview_simplified_ncs.svg
rename to docs/platforms/nrf/images/matter_nrfconnect_overview_simplified_ncs.svg


diff --git a/docs/guides/images/nrfconnect_android_connectivity.png b/docs/platforms/nrf/images/nrfconnect_android_connectivity.png
similarity index 100%
rename from docs/guides/images/nrfconnect_android_connectivity.png
rename to docs/platforms/nrf/images/nrfconnect_android_connectivity.png
Binary files differ

diff --git a/docs/platforms/nrf/index.md b/docs/platforms/nrf/index.md
new file mode 100644
index 0000000..bf74c43
--- /dev/null
+++ b/docs/platforms/nrf/index.md

@@ -0,0 +1,16 @@
+# NRF
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Android Commissioning](./nrfconnect_android_commissioning.md)
+[Examples CLI](./nrfconnect_examples_cli.md)
+[Examples configuration](./nrfconnect_examples_configuration.md)
+[Examples Software update](./nrfconnect_examples_software_update.md)
+[Factory data](./nrfconnect_factory_data_configuration.md)
+[Platform overview](./nrfconnect_platform_overview.md)

diff --git a/docs/guides/nrfconnect_android_commissioning.md b/docs/platforms/nrf/nrfconnect_android_commissioning.md
similarity index 94%
rename from docs/guides/nrfconnect_android_commissioning.md
rename to docs/platforms/nrf/nrfconnect_android_commissioning.md
index 0c93f45..9c6358d 100644
--- a/docs/guides/nrfconnect_android_commissioning.md
+++ b/docs/platforms/nrf/nrfconnect_android_commissioning.md

@@ -1,7 +1,7 @@
 # Commissioning nRF Connect Accessory using Android CHIPTool
 
-You can use [CHIPTool](android_building.md) for Android smartphones to
-commission a Nordic Semiconductor's development kit programmed with a Matter
+You can use [CHIPTool](../android/android_building.md) for Android smartphones
+to commission a Nordic Semiconductor's development kit programmed with a Matter
 example for the nRF Connect platform into a Matter fabric.
 
 This guide references the nRF52840 DK and Matter nRF Connect Lighting Example
@@ -86,9 +86,10 @@
 > _Note:_ This step is only needed if you're testing a Thread device. Skip it if
 > the tested device operates in a Wi-Fi network.
 
-Follow the [OpenThread Border Router](openthread_border_router_pi.md) article to
-set up OpenThread Border Router on the Raspberry Pi, with either the nRF52840 DK
-or the nRF52840 Dongle acting as the
+Follow the
+[OpenThread Border Router](../openthread/openthread_border_router_pi.md) article
+to set up OpenThread Border Router on the Raspberry Pi, with either the nRF52840
+DK or the nRF52840 Dongle acting as the
 [OpenThread Radio Co-Processor](https://openthread.io/platforms/co-processor).
 During the setup, make sure that the Raspberry Pi is connected to your Wi-Fi
 Access Point.
@@ -107,7 +108,7 @@
 ## Building and installing Android CHIPTool
 
 To build the CHIPTool application for your smartphone, read the
-[Building Android](android_building.md) guide.
+[Building Android](../android/android_building.md) guide.
 
 After building, install the application by completing the following steps:
 

diff --git a/docs/guides/nrfconnect_examples_cli.md b/docs/platforms/nrf/nrfconnect_examples_cli.md
similarity index 100%
rename from docs/guides/nrfconnect_examples_cli.md
rename to docs/platforms/nrf/nrfconnect_examples_cli.md


diff --git a/docs/guides/nrfconnect_examples_configuration.md b/docs/platforms/nrf/nrfconnect_examples_configuration.md
similarity index 100%
rename from docs/guides/nrfconnect_examples_configuration.md
rename to docs/platforms/nrf/nrfconnect_examples_configuration.md


diff --git a/docs/guides/nrfconnect_examples_software_update.md b/docs/platforms/nrf/nrfconnect_examples_software_update.md
similarity index 98%
rename from docs/guides/nrfconnect_examples_software_update.md
rename to docs/platforms/nrf/nrfconnect_examples_software_update.md
index d295bae..5f3ab20 100644
--- a/docs/guides/nrfconnect_examples_software_update.md
+++ b/docs/platforms/nrf/nrfconnect_examples_software_update.md

@@ -17,7 +17,7 @@
 
 > **_NOTE:_** The procedure presented below requires that you have OpenThread
 > Border Router (OTBR) set up either in Docker or on a Raspberry Pi. Read
-> [Setup OpenThread Border Router on Raspberry Pi](openthread_border_router_pi.md)
+> [Setup OpenThread Border Router on Raspberry Pi](../openthread/openthread_border_router_pi.md)
 > to learn how to install the OTBR on a Raspberry Pi.
 
 The DFU over Matter involves two kinds of nodes:
@@ -94,7 +94,6 @@
 
 10. Initiate the DFU procedure in one of the following ways:
 
-
     -   If you have built the device firmware with `-DCONFIG_CHIP_LIB_SHELL=y`
         option, which enables Matter shell commands, run the following command
         on the device shell:

diff --git a/docs/guides/nrfconnect_factory_data_configuration.md b/docs/platforms/nrf/nrfconnect_factory_data_configuration.md
similarity index 99%
rename from docs/guides/nrfconnect_factory_data_configuration.md
rename to docs/platforms/nrf/nrfconnect_factory_data_configuration.md
index 886acc9..0c3f6c1 100644
--- a/docs/guides/nrfconnect_factory_data_configuration.md
+++ b/docs/platforms/nrf/nrfconnect_factory_data_configuration.md

@@ -813,8 +813,8 @@
 You can edit all configuration options using the interactive Kconfig interface.
 
 See the
-[Configuring nRF Connect examples](../guides/nrfconnect_examples_configuration.md)
-page for information about how to configure Kconfig options.
+[Configuring nRF Connect examples](./nrfconnect_examples_configuration.md) page
+for information about how to configure Kconfig options.
 
 In the configuration window, expand the items
 `Modules -> connectedhomeip (/home/arbl/matter/connectedhomeip/config/nrfconnect/chip-module) -> Connected Home over IP protocol stack`.

diff --git a/docs/guides/nrfconnect_platform_overview.md b/docs/platforms/nrf/nrfconnect_platform_overview.md
similarity index 100%
rename from docs/guides/nrfconnect_platform_overview.md
rename to docs/platforms/nrf/nrfconnect_platform_overview.md


diff --git a/docs/guides/nxp/README.md b/docs/platforms/nxp/index.md
similarity index 100%
rename from docs/guides/nxp/README.md
rename to docs/platforms/nxp/index.md


diff --git a/docs/guides/nxp/nxp_imx8m_linux_examples.md b/docs/platforms/nxp/nxp_imx8m_linux_examples.md
similarity index 100%
rename from docs/guides/nxp/nxp_imx8m_linux_examples.md
rename to docs/platforms/nxp/nxp_imx8m_linux_examples.md


diff --git a/docs/guides/nxp/nxp_k32w0_ota_guide.md b/docs/platforms/nxp/nxp_k32w0_ota_guide.md
similarity index 100%
rename from docs/guides/nxp/nxp_k32w0_ota_guide.md
rename to docs/platforms/nxp/nxp_k32w0_ota_guide.md


diff --git a/docs/guides/nxp/nxp_k32w_android_commissioning.md b/docs/platforms/nxp/nxp_k32w_android_commissioning.md
similarity index 100%
rename from docs/guides/nxp/nxp_k32w_android_commissioning.md
rename to docs/platforms/nxp/nxp_k32w_android_commissioning.md


diff --git a/docs/guides/nxp/nxp_manufacturing_flow.md b/docs/platforms/nxp/nxp_manufacturing_flow.md
similarity index 100%
rename from docs/guides/nxp/nxp_manufacturing_flow.md
rename to docs/platforms/nxp/nxp_manufacturing_flow.md


diff --git a/docs/guides/nxp/nxp_mcxw71_ota_guide.md b/docs/platforms/nxp/nxp_mcxw71_ota_guide.md
similarity index 100%
rename from docs/guides/nxp/nxp_mcxw71_ota_guide.md
rename to docs/platforms/nxp/nxp_mcxw71_ota_guide.md


diff --git a/docs/guides/nxp/nxp_otbr_guide.md b/docs/platforms/nxp/nxp_otbr_guide.md
similarity index 100%
rename from docs/guides/nxp/nxp_otbr_guide.md
rename to docs/platforms/nxp/nxp_otbr_guide.md


diff --git a/docs/guides/nxp/nxp_rw61x_ota_software_update.md b/docs/platforms/nxp/nxp_rw61x_ota_software_update.md
similarity index 100%
rename from docs/guides/nxp/nxp_rw61x_ota_software_update.md
rename to docs/platforms/nxp/nxp_rw61x_ota_software_update.md


diff --git a/docs/guides/nxp/nxp_zephyr_ota_software_update.md b/docs/platforms/nxp/nxp_zephyr_ota_software_update.md
similarity index 100%
rename from docs/guides/nxp/nxp_zephyr_ota_software_update.md
rename to docs/platforms/nxp/nxp_zephyr_ota_software_update.md


diff --git a/docs/platforms/openiotsdk/index.md b/docs/platforms/openiotsdk/index.md
new file mode 100644
index 0000000..8bd73c4
--- /dev/null
+++ b/docs/platforms/openiotsdk/index.md

@@ -0,0 +1,15 @@
+# OpenIoTSDK
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Commissioning](./openiotsdk_commissioning.md)
+[Examples software update](./openiotsdk_examples_software_update.md)
+[Examples](./openiotsdk_examples.md)
+[Platform overview](./openiotsdk_platform_overview.md)
+[Unit tests](./openiotsdk_unit_tests.md)

diff --git a/docs/guides/openiotsdk_commissioning.md b/docs/platforms/openiotsdk/openiotsdk_commissioning.md
similarity index 90%
rename from docs/guides/openiotsdk_commissioning.md
rename to docs/platforms/openiotsdk/openiotsdk_commissioning.md
index 520cff0..969b304 100644
--- a/docs/guides/openiotsdk_commissioning.md
+++ b/docs/platforms/openiotsdk/openiotsdk_commissioning.md

@@ -9,11 +9,11 @@
 
 ## Building Matter controller
 
-The [Matter controller](../../src/controller/README.md) is a client application
-that allows commission and control of the Matter node.
+The [Matter controller](../../../src/controller/README.md) is a client
+application that allows commission and control of the Matter node.
 
-The [POSIX CLI chip-tool](../../examples/chip-tool/README.md) is the recommended
-Matter controller to use with Open IoT SDK devices.
+The [POSIX CLI chip-tool](../../../examples/chip-tool/README.md) is the
+recommended Matter controller to use with Open IoT SDK devices.
 
 To build `chip-tool` execute command:
 

diff --git a/docs/guides/openiotsdk_examples.md b/docs/platforms/openiotsdk/openiotsdk_examples.md
similarity index 98%
rename from docs/guides/openiotsdk_examples.md
rename to docs/platforms/openiotsdk/openiotsdk_examples.md
index b80ce63..c91863a 100644
--- a/docs/guides/openiotsdk_examples.md
+++ b/docs/platforms/openiotsdk/openiotsdk_examples.md

@@ -22,7 +22,7 @@
 The VSCode devcontainer has all the dependencies pre-installed. It is the
 recommended way to build, run and develop with the Open IoT SDK port of the
 Matter Project. Please read this
-[VSCode development guide](../VSCODE_DEVELOPMENT.md) for more information.
+[VSCode development guide](../../VSCODE_DEVELOPMENT.md) for more information.
 
 Before building the examples, check out the Matter repository and sync Open IoT
 SDK submodules using the following command:
@@ -347,11 +347,11 @@
 
 Open IoT SDK port supports two crypto backend implementations:
 
--   [Mbed TLS](../guides/openiotsdk_platform_overview.md#mbed-tls) - it's the
-    default option
+-   [Mbed TLS](./openiotsdk_platform_overview.md#mbed-tls) - it's the default
+    option
 -   [PSA crypto service](https://tf-m-user-guide.trustedfirmware.org/integration_guide/services/tfm_crypto_integration_guide.html)
     from the
-    [TrustedFirmware-M (TF-M)](../guides/openiotsdk_platform_overview.md#trusted-firmware-m)
+    [TrustedFirmware-M (TF-M)](./openiotsdk_platform_overview.md#trusted-firmware-m)
     component
 
 The CMake variable `CONFIG_CHIP_CRYPTO` controls how cryptographic operations

diff --git a/docs/guides/openiotsdk_examples_software_update.md b/docs/platforms/openiotsdk/openiotsdk_examples_software_update.md
similarity index 95%
rename from docs/guides/openiotsdk_examples_software_update.md
rename to docs/platforms/openiotsdk/openiotsdk_examples_software_update.md
index 73129b8..686d95b 100644
--- a/docs/guides/openiotsdk_examples_software_update.md
+++ b/docs/platforms/openiotsdk/openiotsdk_examples_software_update.md

@@ -19,12 +19,12 @@
 nodes and manages the entire software update process.
 
 In the procedure described below, the `OTA Provider` will be a
-[Linux application](../../examples/ota-provider-app/linux/README.md) and the
+[Linux application](../../../examples/ota-provider-app/linux/README.md) and the
 Open IoT SDK example with
 [DFU support](./openiotsdk_examples.md#device-firmware-update) will work as the
-OTA Requestor. The [chip-tool](../../examples/chip-tool/README.md) application
-used as the Matter controller. Each application should be launched in a separate
-terminal.
+OTA Requestor. The [chip-tool](../../../examples/chip-tool/README.md)
+application used as the Matter controller. Each application should be launched
+in a separate terminal.
 
 List of `OIS` examples that currently support the `DFU` over Matter:
 
@@ -41,7 +41,7 @@
     ```
 
     More details about the `OTA provider` application can be found
-    [here](../../examples/ota-provider-app/linux/README.md).
+    [here](../../../examples/ota-provider-app/linux/README.md).
 
 3.  Build `chip-tool`:
 
@@ -50,7 +50,7 @@
     ```
 
     More details about the `chip-tool` application can be found
-    [here](../../examples/chip-tool/README.md).
+    [here](../../../examples/chip-tool/README.md).
 
 4.  Build `OIS` example application
 

diff --git a/docs/guides/openiotsdk_platform_overview.md b/docs/platforms/openiotsdk/openiotsdk_platform_overview.md
similarity index 100%
rename from docs/guides/openiotsdk_platform_overview.md
rename to docs/platforms/openiotsdk/openiotsdk_platform_overview.md


diff --git a/docs/guides/openiotsdk_unit_tests.md b/docs/platforms/openiotsdk/openiotsdk_unit_tests.md
similarity index 100%
rename from docs/guides/openiotsdk_unit_tests.md
rename to docs/platforms/openiotsdk/openiotsdk_unit_tests.md


diff --git a/docs/platforms/openthread/index.md b/docs/platforms/openthread/index.md
new file mode 100644
index 0000000..a492681
--- /dev/null
+++ b/docs/platforms/openthread/index.md

@@ -0,0 +1,12 @@
+# OpenThread
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Border Router](./openthread_border_router_pi.md)
+[NRF dongle](./openthread_rcp_nrf_dongle.md)

diff --git a/docs/guides/openthread_border_router_pi.md b/docs/platforms/openthread/openthread_border_router_pi.md
similarity index 100%
rename from docs/guides/openthread_border_router_pi.md
rename to docs/platforms/openthread/openthread_border_router_pi.md


diff --git a/docs/guides/openthread_rcp_nrf_dongle.md b/docs/platforms/openthread/openthread_rcp_nrf_dongle.md
similarity index 100%
rename from docs/guides/openthread_rcp_nrf_dongle.md
rename to docs/platforms/openthread/openthread_rcp_nrf_dongle.md


diff --git a/docs/guides/images/silabs_logo.png b/docs/platforms/silabs/images/silabs_logo.png
similarity index 100%
rename from docs/guides/images/silabs_logo.png
rename to docs/platforms/silabs/images/silabs_logo.png
Binary files differ

diff --git a/docs/platforms/silabs/index.md b/docs/platforms/silabs/index.md
new file mode 100644
index 0000000..3e743df
--- /dev/null
+++ b/docs/platforms/silabs/index.md

@@ -0,0 +1,14 @@
+# Silabs
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[CLI guide](./silabs_cli_guide.md)
+[Common app behavior](./silabs_common_app_behavior.md)
+[EFR32 software update](./silabs_efr32_software_update.md)
+[Getting Started](./silabs_getting_started.md)

diff --git a/docs/guides/silabs_cli_guide.md b/docs/platforms/silabs/silabs_cli_guide.md
similarity index 100%
rename from docs/guides/silabs_cli_guide.md
rename to docs/platforms/silabs/silabs_cli_guide.md


diff --git a/docs/guides/silabs_common_app_behavior.md b/docs/platforms/silabs/silabs_common_app_behavior.md
similarity index 100%
rename from docs/guides/silabs_common_app_behavior.md
rename to docs/platforms/silabs/silabs_common_app_behavior.md


diff --git a/docs/guides/silabs_efr32_software_update.md b/docs/platforms/silabs/silabs_efr32_software_update.md
similarity index 98%
rename from docs/guides/silabs_efr32_software_update.md
rename to docs/platforms/silabs/silabs_efr32_software_update.md
index 9f94753..6bdce3d 100644
--- a/docs/guides/silabs_efr32_software_update.md
+++ b/docs/platforms/silabs/silabs_efr32_software_update.md

@@ -118,7 +118,7 @@
 Starting the ota-provider-app with the --otaImageList command line option allows
 the user to supply a JSON file specifying the Software Version, Vendor and
 Product ID that identify the image served by the Provider, see
-[ota-provider-app](../../examples/ota-provider-app/linux/README.md)
+[ota-provider-app](../../../examples/ota-provider-app/linux/README.md)
 
 Example provider configuration file:
 

diff --git a/docs/guides/silabs_getting_started.md b/docs/platforms/silabs/silabs_getting_started.md
similarity index 100%
rename from docs/guides/silabs_getting_started.md
rename to docs/platforms/silabs/silabs_getting_started.md


diff --git a/docs/platforms/stm32/index.md b/docs/platforms/stm32/index.md
new file mode 100644
index 0000000..7b0d56c
--- /dev/null
+++ b/docs/platforms/stm32/index.md

@@ -0,0 +1,11 @@
+# ESP32
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+```
+
+[Getting Started Guide](./stm32_getting_started_guide.md)

diff --git a/docs/guides/stm32_getting_started_guide.md b/docs/platforms/stm32/stm32_getting_started_guide.md
similarity index 97%
rename from docs/guides/stm32_getting_started_guide.md
rename to docs/platforms/stm32/stm32_getting_started_guide.md
index 55f856c..954dde3 100644
--- a/docs/guides/stm32_getting_started_guide.md
+++ b/docs/platforms/stm32/stm32_getting_started_guide.md

@@ -28,7 +28,7 @@
 
 ## Building the Example Application
 
--   [Set Up Matter Environment](./BUILDING.md)
+-   [Set Up Matter Environment](../../guides/BUILDING.md)
 
 -   Set up STLINK tools
 

diff --git a/docs/guides/images/matter_ti_overview_simplified.png b/docs/platforms/ti/images/matter_ti_overview_simplified.png
similarity index 100%
rename from docs/guides/images/matter_ti_overview_simplified.png
rename to docs/platforms/ti/images/matter_ti_overview_simplified.png
Binary files differ

diff --git a/docs/guides/images/matter_ti_overview_wifi.png b/docs/platforms/ti/images/matter_ti_overview_wifi.png
similarity index 100%
rename from docs/guides/images/matter_ti_overview_wifi.png
rename to docs/platforms/ti/images/matter_ti_overview_wifi.png
Binary files differ

diff --git a/docs/platforms/ti/index.md b/docs/platforms/ti/index.md
new file mode 100644
index 0000000..aa49ab9
--- /dev/null
+++ b/docs/platforms/ti/index.md

@@ -0,0 +1,17 @@
+# TI
+
+```{toctree}
+:glob:
+:maxdepth: 1
+:hidden:
+
+*
+matter-migration-guide/*
+matter-syscfg/*
+matter-users-guide/*
+```
+
+-   [Overview](./ti_matter_overview.md)
+-   [Matter migration guide](./matter-migration-guide/)
+-   [Syscfg](./matter-syscfg/)
+-   [User guide](./matter-users-guide/)

diff --git a/docs/guides/ti/matter-migration-guide/matter_cc2674_migration.md b/docs/platforms/ti/matter-migration-guide/matter_cc2674_migration.md
similarity index 100%
rename from docs/guides/ti/matter-migration-guide/matter_cc2674_migration.md
rename to docs/platforms/ti/matter-migration-guide/matter_cc2674_migration.md


diff --git a/docs/guides/ti/matter-syscfg/getting-started.md b/docs/platforms/ti/matter-syscfg/getting-started.md
similarity index 100%
rename from docs/guides/ti/matter-syscfg/getting-started.md
rename to docs/platforms/ti/matter-syscfg/getting-started.md


diff --git a/docs/guides/ti/matter-syscfg/images/board_view.png b/docs/platforms/ti/matter-syscfg/images/board_view.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/board_view.png
rename to docs/platforms/ti/matter-syscfg/images/board_view.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/images/generated_files_ble.png b/docs/platforms/ti/matter-syscfg/images/generated_files_ble.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/generated_files_ble.png
rename to docs/platforms/ti/matter-syscfg/images/generated_files_ble.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/images/hardware_view.png b/docs/platforms/ti/matter-syscfg/images/hardware_view.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/hardware_view.png
rename to docs/platforms/ti/matter-syscfg/images/hardware_view.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/images/reserve-gpio.png b/docs/platforms/ti/matter-syscfg/images/reserve-gpio.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/reserve-gpio.png
rename to docs/platforms/ti/matter-syscfg/images/reserve-gpio.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/images/reserve-peripheral-panel.png b/docs/platforms/ti/matter-syscfg/images/reserve-peripheral-panel.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/reserve-peripheral-panel.png
rename to docs/platforms/ti/matter-syscfg/images/reserve-peripheral-panel.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/images/show_generated_files_tab.png b/docs/platforms/ti/matter-syscfg/images/show_generated_files_tab.png
similarity index 100%
rename from docs/guides/ti/matter-syscfg/images/show_generated_files_tab.png
rename to docs/platforms/ti/matter-syscfg/images/show_generated_files_tab.png
Binary files differ

diff --git a/docs/guides/ti/matter-syscfg/sysconfig-board.md b/docs/platforms/ti/matter-syscfg/sysconfig-board.md
similarity index 100%
rename from docs/guides/ti/matter-syscfg/sysconfig-board.md
rename to docs/platforms/ti/matter-syscfg/sysconfig-board.md


diff --git a/docs/guides/ti/matter-users-guide/enabling_icd_on_ti_devices.md b/docs/platforms/ti/matter-users-guide/enabling_icd_on_ti_devices.md
similarity index 100%
rename from docs/guides/ti/matter-users-guide/enabling_icd_on_ti_devices.md
rename to docs/platforms/ti/matter-users-guide/enabling_icd_on_ti_devices.md


diff --git a/docs/guides/ti/matter-users-guide/images/cc13x4_memmap.png b/docs/platforms/ti/matter-users-guide/images/cc13x4_memmap.png
similarity index 100%
rename from docs/guides/ti/matter-users-guide/images/cc13x4_memmap.png
rename to docs/platforms/ti/matter-users-guide/images/cc13x4_memmap.png
Binary files differ

diff --git a/docs/guides/ti/matter-users-guide/images/factory_data_overview.png b/docs/platforms/ti/matter-users-guide/images/factory_data_overview.png
similarity index 100%
rename from docs/guides/ti/matter-users-guide/images/factory_data_overview.png
rename to docs/platforms/ti/matter-users-guide/images/factory_data_overview.png
Binary files differ

diff --git a/docs/guides/ti/matter-users-guide/ti_factory_data_user_guide.md b/docs/platforms/ti/matter-users-guide/ti_factory_data_user_guide.md
similarity index 100%
rename from docs/guides/ti/matter-users-guide/ti_factory_data_user_guide.md
rename to docs/platforms/ti/matter-users-guide/ti_factory_data_user_guide.md


diff --git a/docs/guides/ti/matter-users-guide/ti_openthread_library_usage.md b/docs/platforms/ti/matter-users-guide/ti_openthread_library_usage.md
similarity index 100%
rename from docs/guides/ti/matter-users-guide/ti_openthread_library_usage.md
rename to docs/platforms/ti/matter-users-guide/ti_openthread_library_usage.md


diff --git a/docs/guides/ti/ti_matter_overview.md b/docs/platforms/ti/ti_matter_overview.md
similarity index 98%
rename from docs/guides/ti/ti_matter_overview.md
rename to docs/platforms/ti/ti_matter_overview.md
index 44943fa..176ea26 100644
--- a/docs/guides/ti/ti_matter_overview.md
+++ b/docs/platforms/ti/ti_matter_overview.md

@@ -103,7 +103,7 @@
 Below are several resources available for Matter development:
 
 -   [Matter Protocol Overview](https://handbook.buildwithmatter.com/howitworks/roles/)
--   [Matter Build Guide](../BUILDING.md)
+-   [Matter Build Guide](../../guides/BUILDING.md)
 -   [Matter over Thread Getting Started](https://dev.ti.com/tirex/explore/node?node=A__AciOYyNq9gli.nsvJzBtQg__com.ti.SIMPLELINK_ACADEMY_CC13XX_CC26XX_SDK__AfkT0vQ__LATEST)
 -   [TI Matter over Wi-Fi Getting Started](https://e2e.ti.com/support/wireless-connectivity/wi-fi-group/wifi/f/wi-fi-forum/1122413/faq-cc3235sf-matter----getting-started-guide)
 -   [TI Matter Application Development](https://dev.ti.com/tirex/explore/node?node=A__AXNOPYikmtBCHJ-L6eRivA__com.ti.SIMPLELINK_ACADEMY_CC13XX_CC26XX_SDK__AfkT0vQ__LATEST)

diff --git a/examples/air-purifier-app/linux/README.md b/examples/air-purifier-app/linux/README.md
index 2d771bd..377d53a 100644
--- a/examples/air-purifier-app/linux/README.md
+++ b/examples/air-purifier-app/linux/README.md

@@ -11,7 +11,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/air-quality-sensor-app/linux/README.md b/examples/air-quality-sensor-app/linux/README.md
index ef90a4b..158cd0d 100644
--- a/examples/air-quality-sensor-app/linux/README.md
+++ b/examples/air-quality-sensor-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/air-quality-sensor-app/silabs/README.md b/examples/air-quality-sensor-app/silabs/README.md
index d0e89d3..7279e23 100644
--- a/examples/air-quality-sensor-app/silabs/README.md
+++ b/examples/air-quality-sensor-app/silabs/README.md

@@ -330,7 +330,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/all-clusters-app/asr/README.md b/examples/all-clusters-app/asr/README.md
index bde062f..6e31c18 100755
--- a/examples/all-clusters-app/asr/README.md
+++ b/examples/all-clusters-app/asr/README.md

@@ -15,7 +15,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/all-clusters-app/esp32/README.md b/examples/all-clusters-app/esp32/README.md
index 0a3145d..8e6ef5a 100644
--- a/examples/all-clusters-app/esp32/README.md
+++ b/examples/all-clusters-app/esp32/README.md

@@ -4,16 +4,16 @@
 control.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---
 
 -   [Cluster control](#cluster-control)
--   [Matter OTA guide](../../../docs/guides/esp32/ota.md)
--   [RPC console and Device Tracing](../../../docs/guides/esp32/rpc_console.md)
+-   [Matter OTA guide](../../../docs/platforms/esp32/ota.md)
+-   [RPC console and Device Tracing](../../../docs/platforms/esp32/rpc_console.md)
 -   [Multiple Network Interfaces](#multiple-network-interfaces)
 
 ---

diff --git a/examples/all-clusters-app/infineon/psoc6/README.md b/examples/all-clusters-app/infineon/psoc6/README.md
index 138f132..b4faa2e 100644
--- a/examples/all-clusters-app/infineon/psoc6/README.md
+++ b/examples/all-clusters-app/infineon/psoc6/README.md

@@ -126,4 +126,4 @@
 
 For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/platforms/infineon/infineon_psoc6_software_update.md)

diff --git a/examples/all-clusters-app/mbed/README.md b/examples/all-clusters-app/mbed/README.md
index 0952e18..f5d0a78 100644
--- a/examples/all-clusters-app/mbed/README.md
+++ b/examples/all-clusters-app/mbed/README.md

@@ -225,7 +225,8 @@
 
 #### CHIP Tools
 
-Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+Read the
+[MbedCommissioning](../../../docs/platforms/mbedos/mbedos_commissioning.md) to
 see how to use different CHIP tools to commission and control the application
 within a WiFi network.
 
@@ -239,7 +240,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `all-clusters-app/mbed/mbed_app.json`. Information about this file syntax
     and its meaning in mbed-os project can be found here:

diff --git a/examples/all-clusters-app/nrfconnect/README.md b/examples/all-clusters-app/nrfconnect/README.md
index 3a58e44..4c51e52 100644
--- a/examples/all-clusters-app/nrfconnect/README.md
+++ b/examples/all-clusters-app/nrfconnect/README.md

@@ -43,7 +43,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -183,7 +183,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 <hr>
 
@@ -379,7 +379,7 @@
     those platforms support the DFU.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -414,19 +414,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread network.

diff --git a/examples/all-clusters-app/nxp/linux-imx/imx8m/README.md b/examples/all-clusters-app/nxp/linux-imx/imx8m/README.md
index e20ff10..01941f5 100644
--- a/examples/all-clusters-app/nxp/linux-imx/imx8m/README.md
+++ b/examples/all-clusters-app/nxp/linux-imx/imx8m/README.md

@@ -1,4 +1,4 @@
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../../../docs/guides/nxp/nxp_imx8m_linux_examples.md)
+[README document](../../../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md)
 for details.

diff --git a/examples/all-clusters-app/nxp/rt/rw61x/README.md b/examples/all-clusters-app/nxp/rt/rw61x/README.md
index 61d3f00..df760e8 100644
--- a/examples/all-clusters-app/nxp/rt/rw61x/README.md
+++ b/examples/all-clusters-app/nxp/rt/rw61x/README.md

@@ -149,7 +149,7 @@
 Optional GN options that can be added when building an application:
 
 -   To enable the
-    [secondary network commissioning interface](../../../../../docs/guides/nxp/nxp_otbr_guide.md#using-the-secondary-network-commissioning-interface),
+    [secondary network commissioning interface](../../../../../docs/platforms/nxp/nxp_otbr_guide.md#using-the-secondary-network-commissioning-interface),
     the arguments `chip_enable_secondary_nwk_if=true` and
     `chip_device_config_thread_network_endpoint_id=2` must be added to the _gn
     gen_ command. Note that this is only supported when building the Matter over
@@ -167,16 +167,16 @@
 -   To build with the option to have Matter certificates/keys pre-loaded in a
     specific flash area the argument `chip_with_factory_data=1` must be added to
     the _gn gen_ command. (for more information see
-    [Guide for writing manufacturing data on NXP devices](../../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+    [Guide for writing manufacturing data on NXP devices](../../../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 -   To build the application with the OTA Requestor enabled, the arguments
     `chip_enable_ota_requestor=true no_mcuboot=false` must be added to the _gn
     gen_ command. (More information about the OTA Requestor feature in
-    [OTA Requestor README](../../../../../docs/guides/nxp/nxp_rw61x_ota_software_update.md)
+    [OTA Requestor README](../../../../../docs/platforms/nxp/nxp_rw61x_ota_software_update.md)
 
 ## Manufacturing data
 
 See
-[Guide for writing manufacturing data on NXP devices](../../../../../docs/guides/nxp/nxp_manufacturing_flow.md)
+[Guide for writing manufacturing data on NXP devices](../../../../../docs/platforms/nxp/nxp_manufacturing_flow.md)
 
 Other comments:
 
@@ -252,7 +252,7 @@
 CHIP Tool is a Matter controller which can be used to commission a Matter device
 into the network. For more information regarding how to use the CHIP Tool
 controller, please refer to the
-[CHIP Tool guide](../../../../../docs/guides/chip_tool_guide.md).
+[CHIP Tool guide](../../../../../docs/development_controllers/chip-tool/chip_tool_guide.md).
 
 To know how to commission a device over BLE, follow the instructions from
 [chip-tool's README.md 'Commission a device over
@@ -281,7 +281,7 @@
 In order to create or join a Thread network on the Matter Border Router, the TBR
 management cluster or the `otcli` commands from the matter CLI can be used. For
 more information about using the TBR management cluster follow instructions from
-['Using the TBR management cluster'](../../../../../docs/guides/nxp/nxp_otbr_guide.md#using-the-thread-border-router-management-cluster).
+['Using the TBR management cluster'](../../../../../docs/platforms/nxp/nxp_otbr_guide.md#using-the-thread-border-router-management-cluster).
 For more information about using the matter shell, follow instructions from
 ['Testing the all-clusters application with Matter CLI'](#testing-the-all-clusters-application-with-matter-cli-enabled).
 
@@ -407,7 +407,7 @@
 Over-The-Air software updates are supported with the RW61x all-clusters example.
 The process to follow in order to perform a software update is described in the
 dedicated guide
-['Matter Over-The-Air Software Update with NXP RW61x example applications'](../../../../../docs/guides/nxp/nxp_rw61x_ota_software_update.md).
+['Matter Over-The-Air Software Update with NXP RW61x example applications'](../../../../../docs/platforms/nxp/nxp_rw61x_ota_software_update.md).
 
 <a name="thread-border-router-overview"></a>
 
@@ -417,4 +417,4 @@
 section.
 
 The complete Border Router guide is located
-[here](../../../../../docs/guides/nxp/nxp_otbr_guide.md).
+[here](../../../../../docs/platforms/nxp/nxp_otbr_guide.md).

diff --git a/examples/all-clusters-app/nxp/zephyr/README.md b/examples/all-clusters-app/nxp/zephyr/README.md
index 54a06c6..d9038b0 100644
--- a/examples/all-clusters-app/nxp/zephyr/README.md
+++ b/examples/all-clusters-app/nxp/zephyr/README.md

@@ -201,14 +201,14 @@
 #### Manually
 
 See
-[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md)
+[Guide for writing manufacturing data on NXP devices](../../../../docs/platforms/nxp/nxp_manufacturing_flow.md)
 
 <a name="ota-software-update"></a>
 
 ## OTA Software Update
 
 See
-[Guide for OTA Software Update on NXP devices using Zephyr SDK](../../../../docs/guides/nxp/nxp_zephyr_ota_software_update.md)
+[Guide for OTA Software Update on NXP devices using Zephyr SDK](../../../../docs/platforms/nxp/nxp_zephyr_ota_software_update.md)
 
 <a name="testing-the-example"></a>
 

diff --git a/examples/all-clusters-app/openiotsdk/README.md b/examples/all-clusters-app/openiotsdk/README.md
index 269411f..661c331 100644
--- a/examples/all-clusters-app/openiotsdk/README.md
+++ b/examples/all-clusters-app/openiotsdk/README.md

@@ -11,7 +11,7 @@
 
 For information on how to build, run, test and debug this example and further
 information about the platform it is run on see
-[Open IoT SDK examples](../../../docs/guides/openiotsdk_examples.md).
+[Open IoT SDK examples](../../../docs/platforms/openiotsdk/openiotsdk_examples.md).
 
 The example name to use in the scripts is `all-clusters-app`.
 
@@ -31,7 +31,7 @@
 ### Commissioning
 
 Read the
-[Open IoT SDK commissioning guide](../../../docs/guides/openiotsdk_commissioning.md)
+[Open IoT SDK commissioning guide](../../../docs/platforms/openiotsdk/openiotsdk_commissioning.md)
 to see how to use the Matter controller to commission and control the
 application.
 

diff --git a/examples/all-clusters-minimal-app/asr/README.md b/examples/all-clusters-minimal-app/asr/README.md
index 5160ef5..2a411c7 100755
--- a/examples/all-clusters-minimal-app/asr/README.md
+++ b/examples/all-clusters-minimal-app/asr/README.md

@@ -14,7 +14,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/all-clusters-minimal-app/esp32/README.md b/examples/all-clusters-minimal-app/esp32/README.md
index 6cb3f90..4b5ca4e 100644
--- a/examples/all-clusters-minimal-app/esp32/README.md
+++ b/examples/all-clusters-minimal-app/esp32/README.md

@@ -4,16 +4,16 @@
 control.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---
 
 -   [Cluster control](#cluster-control)
--   [Matter OTA guide](../../../docs/guides/esp32/ota.md)
--   [RPC console and Device Tracing](../../../docs/guides/esp32/rpc_console.md)
+-   [Matter OTA guide](../../../docs/platforms/esp32/ota.md)
+-   [RPC console and Device Tracing](../../../docs/platforms/esp32/rpc_console.md)
 
 ---
 

diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/README.md b/examples/all-clusters-minimal-app/infineon/psoc6/README.md
index 80b8e1c..7dc9fcc 100644
--- a/examples/all-clusters-minimal-app/infineon/psoc6/README.md
+++ b/examples/all-clusters-minimal-app/infineon/psoc6/README.md

@@ -126,4 +126,4 @@
 
 For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/platforms/infineon/infineon_psoc6_software_update.md)

diff --git a/examples/all-clusters-minimal-app/mbed/README.md b/examples/all-clusters-minimal-app/mbed/README.md
index d4096cb..8622654 100644
--- a/examples/all-clusters-minimal-app/mbed/README.md
+++ b/examples/all-clusters-minimal-app/mbed/README.md

@@ -225,7 +225,8 @@
 
 ### CHIP Tools
 
-Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+Read the
+[MbedCommissioning](../../../docs/platforms/mbedos/mbedos_commissioning.md) to
 see how to use different CHIP tools to commission and control the application
 within a WiFi network.
 
@@ -239,7 +240,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `all-clusters-minimal-app/mbed/mbed_app.json`.  
     Information about this file syntax and its meaning in mbed-os project can be

diff --git a/examples/all-clusters-minimal-app/nrfconnect/README.md b/examples/all-clusters-minimal-app/nrfconnect/README.md
index 932db10..b9d44a8 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/README.md
+++ b/examples/all-clusters-minimal-app/nrfconnect/README.md

@@ -41,7 +41,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -144,7 +144,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 <hr>
 
@@ -371,7 +371,7 @@
     those platforms support the DFU.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -406,19 +406,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread network.

diff --git a/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md b/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md
index e20ff10..01941f5 100644
--- a/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md
+++ b/examples/all-clusters-minimal-app/nxp/linux-imx/imx8m/README.md

@@ -1,4 +1,4 @@
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../../../docs/guides/nxp/nxp_imx8m_linux_examples.md)
+[README document](../../../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md)
 for details.

diff --git a/examples/android/CHIPTool/README.md b/examples/android/CHIPTool/README.md
index cbd0caa..415dc46 100644
--- a/examples/android/CHIPTool/README.md
+++ b/examples/android/CHIPTool/README.md

@@ -15,4 +15,5 @@
 > pairing is implemented.
 
 For information about how to build the application, see the
-[Building Android CHIPTool](../../../docs/guides/android_building.md) guide.
+[Building Android CHIPTool](../../../docs/platforms/android/android_building.md)
+guide.

diff --git a/examples/bridge-app/asr/README.md b/examples/bridge-app/asr/README.md
index 1986037..1d29b4f 100755
--- a/examples/bridge-app/asr/README.md
+++ b/examples/bridge-app/asr/README.md

@@ -26,7 +26,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/bridge-app/esp32/README.md b/examples/bridge-app/esp32/README.md
index ac22c7f..1d34ac6 100644
--- a/examples/bridge-app/esp32/README.md
+++ b/examples/bridge-app/esp32/README.md

@@ -1,9 +1,9 @@
 # Matter ESP32 Bridge App Example
 
 Please
-[setup ESP-IDF and Matter Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and Matter Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/chip-tool/README.md b/examples/chip-tool/README.md
index f702e20..b9d5f14 100644
--- a/examples/chip-tool/README.md
+++ b/examples/chip-tool/README.md

@@ -599,4 +599,4 @@
 To learn more about the tool, how to build it, use its commands and advanced
 features, read the following guide:
 
--   [Working with the CHIP Tool](https://github.com/project-chip/connectedhomeip/tree/master/docs/guides/chip_tool_guide.md)
+-   [Working with the CHIP Tool](https://github.com/project-chip/connectedhomeip/tree/master/docs/development_controllers/chip-tool/chip_tool_guide.md)

diff --git a/examples/contact-sensor-app/linux/README.md b/examples/contact-sensor-app/linux/README.md
index e71ea89..ca5ca7b 100644
--- a/examples/contact-sensor-app/linux/README.md
+++ b/examples/contact-sensor-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on an x64 host and run it on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/contact-sensor-app/nxp/README.md b/examples/contact-sensor-app/nxp/README.md
index 20474be..803f067 100644
--- a/examples/contact-sensor-app/nxp/README.md
+++ b/examples/contact-sensor-app/nxp/README.md

@@ -136,7 +136,7 @@
 Use `chip_with_factory_data=1` in the gn build command to enable factory data.
 
 For a full guide on manufacturing flow, please see
-[Guide for writing manufacturing data on NXP devices](../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 ### Long Idle Time ICD Support
 

diff --git a/examples/contact-sensor-app/nxp/k32w0/README.md b/examples/contact-sensor-app/nxp/k32w0/README.md
index 305aa0b..bc39009 100644
--- a/examples/contact-sensor-app/nxp/k32w0/README.md
+++ b/examples/contact-sensor-app/nxp/k32w0/README.md

@@ -351,7 +351,7 @@
 ## Manufacturing data
 
 See
-[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 There are factory data generated binaries available in
 `third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data`
@@ -618,7 +618,7 @@
 The steps for building the SSBL binary with appropriate configuration and
 writing to the board the binary and other OTA related configurations are
 described in the
-[K32W0x1 OTA guide](../../../../docs/guides/nxp/nxp_k32w0_ota_guide.md).
+[K32W0x1 OTA guide](../../../../docs/platforms/nxp/nxp_k32w0_ota_guide.md).
 
 Note that the application needs to be built using the
 `chip_enable_ota_requestor=true` option. This is enabled in the configuration by

diff --git a/examples/contact-sensor-app/nxp/k32w1/README.md b/examples/contact-sensor-app/nxp/k32w1/README.md
index 5f47979..20feba0 100644
--- a/examples/contact-sensor-app/nxp/k32w1/README.md
+++ b/examples/contact-sensor-app/nxp/k32w1/README.md

@@ -165,4 +165,4 @@
 ## OTA
 
 Please see
-[k32w1 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[k32w1 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).

diff --git a/examples/contact-sensor-app/nxp/mcxw71/README.md b/examples/contact-sensor-app/nxp/mcxw71/README.md
index 50d33e1..d5b1927 100644
--- a/examples/contact-sensor-app/nxp/mcxw71/README.md
+++ b/examples/contact-sensor-app/nxp/mcxw71/README.md

@@ -191,4 +191,4 @@
 ## OTA
 
 Please see
-[mcxw71 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[mcxw71 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).

diff --git a/examples/dishwasher-app/linux/README.md b/examples/dishwasher-app/linux/README.md
index 6b84961..29432d4 100644
--- a/examples/dishwasher-app/linux/README.md
+++ b/examples/dishwasher-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/dishwasher-app/silabs/README.md b/examples/dishwasher-app/silabs/README.md
index e258644..9a8a102 100644
--- a/examples/dishwasher-app/silabs/README.md
+++ b/examples/dishwasher-app/silabs/README.md

@@ -228,7 +228,7 @@
 Silabs provides `chip-tool` as a wrapper function and more user-friendly method
 of using [chip-tool](../../chip-tool/README.md) within the pre-built Raspberry
 Pi image. For more info on using `chip-tool`, see
-[Chiptool](../../../docs/guides/chip_tool_guide.md).
+[Chiptool](../../../docs/development_controllers/chip-tool/chip_tool_guide.md).
 
 Here is an example using `chip-tool`:
 

diff --git a/examples/energy-management-app/esp32/README.md b/examples/energy-management-app/esp32/README.md
index 733ac5a..f1a2f12 100644
--- a/examples/energy-management-app/esp32/README.md
+++ b/examples/energy-management-app/esp32/README.md

@@ -5,9 +5,9 @@
 on ESP platforms.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ### Enabling ESP-Insights:
@@ -32,7 +32,7 @@
 ---
 
 -   [Cluster Control](#cluster-control)
--   [Matter OTA guide](../../../docs/guides/esp32/ota.md)
+-   [Matter OTA guide](../../../docs/platforms/esp32/ota.md)
 
 ---
 

diff --git a/examples/energy-management-app/linux/README.md b/examples/energy-management-app/linux/README.md
index 89b165c..615f1f5 100644
--- a/examples/energy-management-app/linux/README.md
+++ b/examples/energy-management-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/energy-management-app/silabs/README.md b/examples/energy-management-app/silabs/README.md
index 9623791..5c1955a 100644
--- a/examples/energy-management-app/silabs/README.md
+++ b/examples/energy-management-app/silabs/README.md

@@ -335,7 +335,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Group Communication (Multicast)
 

diff --git a/examples/light-switch-app/asr/README.md b/examples/light-switch-app/asr/README.md
index ed3b65b..5d2f575 100755
--- a/examples/light-switch-app/asr/README.md
+++ b/examples/light-switch-app/asr/README.md

@@ -13,7 +13,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/light-switch-app/esp32/README.md b/examples/light-switch-app/esp32/README.md
index 43a9d95..023f9bb 100644
--- a/examples/light-switch-app/esp32/README.md
+++ b/examples/light-switch-app/esp32/README.md

@@ -3,9 +3,9 @@
 This example demonstrates the Matter Light-switch application on ESP platforms.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/light-switch-app/genio/README.md b/examples/light-switch-app/genio/README.md
index 7961597..1a95318 100644
--- a/examples/light-switch-app/genio/README.md
+++ b/examples/light-switch-app/genio/README.md

@@ -88,7 +88,7 @@
     Chip tool standalone, Android or iOS app
 
     [CHIP
-    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/chip_tool_guide.md)
+    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-tool/chip_tool_guide.md)
 
 -   First of all, you have to commission with the light-switch-app (nodeID 1)
     and the lighting-app (nodeID 2) with the CHIP tool by following commands.

diff --git a/examples/light-switch-app/infineon/cyw30739/README.md b/examples/light-switch-app/infineon/cyw30739/README.md
index 0343563..cec7a2b 100644
--- a/examples/light-switch-app/infineon/cyw30739/README.md
+++ b/examples/light-switch-app/infineon/cyw30739/README.md

@@ -212,7 +212,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
 -   For this example to work, it is necessary to have a second CYW30739 device

diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md
index 9437597..11e5379 100644
--- a/examples/light-switch-app/nrfconnect/README.md
+++ b/examples/light-switch-app/nrfconnect/README.md

@@ -48,7 +48,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -236,9 +236,10 @@
 
 -   [Lighting Example Application](../../lighting-app/nrfconnect/README.md)
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to
-learn how to commission the lighting device to the same Matter network using the
-CHIP Tool.
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to learn how to commission the lighting device to the same Matter network using
+the CHIP Tool.
 
 <hr>
 
@@ -342,7 +343,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -375,7 +376,8 @@
     uart:~$ switch groups onoff off    : sends multicast Off command to  all bound devices in a group
     uart:~$ switch groups onoff toggle : sends multicast Toggle command to all bound devices in a group
 
-Check the [CLI user guide](../../../docs/guides/nrfconnect_examples_cli.md) to
+Check the
+[CLI user guide](../../../docs/platforms/nrf/nrfconnect_examples_cli.md) to
 learn how to use other CLI commands of the application.
 
 <hr>
@@ -570,7 +572,7 @@
     the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -602,7 +604,8 @@
 ### Commissioning the lighting device
 
 To commission the Lighting Example Application to the same Matter network, read
-the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md).
+the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md).
 
 ### Binding cluster and endpoints
 
@@ -617,7 +620,7 @@
 The ACL should contain information about all clusters that can be called by the
 light switch application. See the section about interacting with ZCL clusters in
 the
-[CHIP Tool's user guide](../../../docs/guides/chip_tool_guide.md#interacting-with-data-model-clusters)
+[CHIP Tool's user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#interacting-with-data-model-clusters)
 for more information about ACLs.
 
 You can perform the binding process to a single remote endpoint (unicast
@@ -635,7 +638,7 @@
 To perform the unicast binding process, complete the following steps:
 
 1.  Build the CHIP Tool according to the steps from the
-    [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md#building-and-running-the-chip-tool).
+    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-and-running-the-chip-tool).
 2.  Go to the CHIP Tool build directory.
 3.  Add an ACL to the development kit that is programmed with the
     [Lighting Application Example](../../lighting-app/nrfconnect/README.md) by
@@ -687,7 +690,7 @@
 To perform the unicast binding process, complete the following steps:
 
 1.  Build the CHIP Tool according to the steps from the
-    [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md#building-and-running-the-chip-tool).
+    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-and-running-the-chip-tool).
 2.  Go to the CHIP Tool build directory.
 
 3.  Add the light switch device to the multicast group by running the following
@@ -734,5 +737,5 @@
 ### Testing Device Firmware Upgrade
 
 Read the
-[DFU tutorial](../../../docs/guides/nrfconnect_examples_software_update.md) to
-see how to upgrade your device firmware.
+[DFU tutorial](../../../docs/platforms/nrf/nrfconnect_examples_software_update.md)
+to see how to upgrade your device firmware.

diff --git a/examples/light-switch-app/silabs/README.md b/examples/light-switch-app/silabs/README.md
index fe39610..898f8e8 100644
--- a/examples/light-switch-app/silabs/README.md
+++ b/examples/light-switch-app/silabs/README.md

@@ -210,7 +210,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -393,7 +393,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/lighting-app-data-mode-no-unique-id/linux/README.md b/examples/lighting-app-data-mode-no-unique-id/linux/README.md
index 3262e34..0fc9ebc 100644
--- a/examples/lighting-app-data-mode-no-unique-id/linux/README.md
+++ b/examples/lighting-app-data-mode-no-unique-id/linux/README.md

@@ -12,17 +12,21 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>
 
--   [CHIP Linux Lighting Example](#chip-linux-lighting-example-data-mode-no-unique-id)
+-   [CHIP Linux Lighting Example (Data Mode, No Unique ID)](#chip-linux-lighting-example-data-mode-no-unique-id)
     -   [Building](#building)
-    -   [Commandline Arguments](#commandline-arguments)
+    -   [Commandline arguments](#commandline-arguments)
     -   [Running the Complete Example on Raspberry Pi 4](#running-the-complete-example-on-raspberry-pi-4)
-    -   [Running RPC console](#running-rpc-console)
+    -   [Running RPC Console](#running-rpc-console)
     -   [Device Tracing](#device-tracing)
+    -   [Trigger event using lighting-app event named pipe](#trigger-event-using-lighting-app-event-named-pipe)
+        -   [Trigger `SoftwareFault` events](#trigger-softwarefault-events)
+        -   [Trigger `HardwareFault` events](#trigger-hardwarefault-events)
+        -   [Trigger Switch events](#trigger-switch-events)
 
 <hr>
 

diff --git a/examples/lighting-app/asr/README.md b/examples/lighting-app/asr/README.md
index 234154c..ade620e 100755
--- a/examples/lighting-app/asr/README.md
+++ b/examples/lighting-app/asr/README.md

@@ -14,7 +14,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/lighting-app/bouffalolab/README.md b/examples/lighting-app/bouffalolab/README.md
index b39f65b..4a5c8d7 100644
--- a/examples/lighting-app/bouffalolab/README.md
+++ b/examples/lighting-app/bouffalolab/README.md

@@ -132,7 +132,7 @@
 -   `-mfd`, enable Matter factory data feature, which load factory data from
     `MFD` partition
     -   Please refer to
-        [Bouffalo Lab Matter factory data guide](../../../docs/guides/bouffalolab/matter_factory_data.md)
+        [Bouffalo Lab Matter factory data guide](../../../docs/platforms/bouffalolab/matter_factory_data.md)
         or contact to `Bouffalo Lab` for support.
 -   `-shell`, enable command line
 -   `-rpc`, enable Pigweed RPC feature
@@ -175,12 +175,11 @@
 
         -   `BL602DK`, `BL704LDK` and `BL706DK`.
 
-
             ```shell
-          ./out/bouffalolab-bl602dk-light-littlefs/chip-bl602-lighting-example.flash.py --port /dev/ttyACM0
-          ./out/bouffalolab-bl616dk-light-wifi/chip-bl616dk-lighting-example.flash.py --port /dev/ttyACM0
-          ./out/bouffalolab-bl704ldk-light-littlefs/chip-bl702l-lighting-example.flash.py --port /dev/ttyACM0
-          ./out/bouffalolab-bl706dk-light-littlefs/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl602dk-light-littlefs/chip-bl602-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl616dk-light-wifi/chip-bl616dk-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl704ldk-light-littlefs/chip-bl702l-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl706dk-light-littlefs/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
             ```
 
         -   To wipe out flash and download image, please append `--erase`
@@ -212,15 +211,16 @@
 
 ## Test Commission and Control with chip-tool
 
-Please follow [chip_tool_guide](../../../docs/guides/chip_tool_guide.md) and
-[guide](../../chip-tool/README.md) to build and use chip-tool for test.
+Please follow
+[chip_tool_guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+and [guide](../../chip-tool/README.md) to build and use chip-tool for test.
 
 ### Prerequisite for Thread Protocol
 
 Thread wireless protocol runs on BL706, which needs a Thread border router to
 connect Thread network to Wi-Fi/Ethernet network. Please follow this
-[guide](../../../docs/guides/openthread_border_router_pi.md) to setup a
-raspberry Pi border router.
+[guide](../../../docs/platforms/openthread/openthread_border_router_pi.md) to
+setup a raspberry Pi border router.
 
 After Thread border router setup, please type following command on Thread border
 router to get Thread network credential.
@@ -303,11 +303,11 @@
     -   Add boot parameters, signature/encryption if specified
     -   And specify whether image has be compressed.
 -   Add Matter recognition header by
-    [ota_image_tool.py](../../../docs/guides/openthread_border_router_pi.md).
+    [ota_image_tool.py](../../../docs/platforms/openthread/openthread_border_router_pi.md).
 
 Script `*.flash.py` builds `Bouffalo Lab` bootable image and call
-[ota_image_tool.py](../../../docs/guides/openthread_border_router_pi.md) to add
-Matter recognition header. Take `BL602DK` as example.
+[ota_image_tool.py](../../../docs/platforms/openthread/openthread_border_router_pi.md)
+to add Matter recognition header. Take `BL602DK` as example.
 
 ```shell
 ./out/bouffalolab-bl602dk-light/chip-bl602-lighting-example.flash.py --build-ota --vendor-id <vendor id> --product-id <product id> --version <version> --version-str <version string> --digest-algorithm <digest algorithm>

diff --git a/examples/lighting-app/esp32/README.md b/examples/lighting-app/esp32/README.md
index 3e3dc5e..da74d54 100644
--- a/examples/lighting-app/esp32/README.md
+++ b/examples/lighting-app/esp32/README.md

@@ -3,9 +3,9 @@
 This example demonstrates the Matter Lighting application on ESP platforms.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ### Enabling ESP-Insights:
@@ -47,4 +47,4 @@
 ### Matter OTA
 
 For Matter OTA please take a look at
-[Matter OTA guide](../../../docs/guides/esp32/ota.md).
+[Matter OTA guide](../../../docs/platforms/esp32/ota.md).

diff --git a/examples/lighting-app/genio/README.md b/examples/lighting-app/genio/README.md
index 575d4ba..1b586c1 100644
--- a/examples/lighting-app/genio/README.md
+++ b/examples/lighting-app/genio/README.md

@@ -86,7 +86,7 @@
     Chip tool standalone, Android or iOS app
 
     [CHIP
-    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/chip_tool_guide.md)
+    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-tool/chip_tool_guide.md)
 
     Here is an example with the CHIP Tool controller:
 

diff --git a/examples/lighting-app/infineon/cyw30739/README.md b/examples/lighting-app/infineon/cyw30739/README.md
index a69ddb0..c27eaba 100644
--- a/examples/lighting-app/infineon/cyw30739/README.md
+++ b/examples/lighting-app/infineon/cyw30739/README.md

@@ -212,7 +212,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
 -   You can provision and control the device using the Python controller REPL,

diff --git a/examples/lighting-app/infineon/psoc6/README.md b/examples/lighting-app/infineon/psoc6/README.md
index 773a05a..8530005 100644
--- a/examples/lighting-app/infineon/psoc6/README.md
+++ b/examples/lighting-app/infineon/psoc6/README.md

@@ -138,4 +138,4 @@
 
 For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/platforms/infineon/infineon_psoc6_software_update.md)

diff --git a/examples/lighting-app/linux/README.md b/examples/lighting-app/linux/README.md
index e41799a..b5c3d2a 100644
--- a/examples/lighting-app/linux/README.md
+++ b/examples/lighting-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/lighting-app/mbed/README.md b/examples/lighting-app/mbed/README.md
index 0eafd74..d96ee52 100644
--- a/examples/lighting-app/mbed/README.md
+++ b/examples/lighting-app/mbed/README.md

@@ -240,7 +240,8 @@
 
 #### CHIP Tools
 
-Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+Read the
+[MbedCommissioning](../../../docs/platforms/mbedos/mbedos_commissioning.md) to
 see how to use different CHIP tools to commission and control the application
 within a WiFi network.
 
@@ -314,7 +315,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `lighting-app/mbed/mbed_app.json`. Information about this file syntax and
     its meaning in mbed-os project can be found here:

diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md
index 3ba3c74..62e4954 100644
--- a/examples/lighting-app/nrfconnect/README.md
+++ b/examples/lighting-app/nrfconnect/README.md

@@ -44,7 +44,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -267,7 +267,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -496,7 +496,7 @@
     DFU enabled by default.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -535,19 +535,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread network.
@@ -555,8 +556,8 @@
 ### Testing Device Firmware Upgrade
 
 Read the
-[DFU tutorial](../../../docs/guides/nrfconnect_examples_software_update.md) to
-see how to upgrade your device firmware.
+[DFU tutorial](../../../docs/platforms/nrf/nrfconnect_examples_software_update.md)
+to see how to upgrade your device firmware.
 
 ## Testing using the RPC console
 

diff --git a/examples/lighting-app/nxp/README.md b/examples/lighting-app/nxp/README.md
index d611b24..e0860a0 100644
--- a/examples/lighting-app/nxp/README.md
+++ b/examples/lighting-app/nxp/README.md

@@ -131,7 +131,7 @@
 Use `chip_with_factory_data=1` in the gn build command to enable factory data.
 
 For a full guide on manufacturing flow, please see
-[Guide for writing manufacturing data on NXP devices](../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 ## Flashing and debugging
 

diff --git a/examples/lighting-app/nxp/k32w0/README.md b/examples/lighting-app/nxp/k32w0/README.md
index 518e023..61f35a3 100644
--- a/examples/lighting-app/nxp/k32w0/README.md
+++ b/examples/lighting-app/nxp/k32w0/README.md

@@ -328,7 +328,7 @@
 ## Manufacturing data
 
 See
-[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 There are factory data generated binaries available in
 `third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data`
@@ -595,7 +595,7 @@
 The steps for building the SSBL binary with appropriate configuration and
 writing to the board the binary and other OTA related configurations are
 described in the
-[K32W0x1 OTA guide](../../../../docs/guides/nxp/nxp_k32w0_ota_guide.md).
+[K32W0x1 OTA guide](../../../../docs/platforms/nxp/nxp_k32w0_ota_guide.md).
 
 Note that the application needs to be built using the
 `chip_enable_ota_requestor=true` option. This is enabled in the configuration by

diff --git a/examples/lighting-app/nxp/k32w1/README.md b/examples/lighting-app/nxp/k32w1/README.md
index d61ab1e..61cec80 100644
--- a/examples/lighting-app/nxp/k32w1/README.md
+++ b/examples/lighting-app/nxp/k32w1/README.md

@@ -109,7 +109,7 @@
 
 If the feature is enabled, the LED brightness can be controlled using
 `LevelControl` cluster
-[commands](../../../../docs/guides/chip_tool_guide.md#step-7-control-application-data-model-clusters).
+[commands](../../../../docs/development_controllers/chip-tool/chip_tool_guide.md#step-7-control-application-data-model-clusters).
 
 ## Flashing
 
@@ -235,4 +235,4 @@
 ## OTA
 
 Please see
-[k32w1 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[k32w1 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).

diff --git a/examples/lighting-app/nxp/linux-imx/imx8m/README.md b/examples/lighting-app/nxp/linux-imx/imx8m/README.md
index e20ff10..01941f5 100644
--- a/examples/lighting-app/nxp/linux-imx/imx8m/README.md
+++ b/examples/lighting-app/nxp/linux-imx/imx8m/README.md

@@ -1,4 +1,4 @@
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../../../docs/guides/nxp/nxp_imx8m_linux_examples.md)
+[README document](../../../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md)
 for details.

diff --git a/examples/lighting-app/nxp/mcxw71/README.md b/examples/lighting-app/nxp/mcxw71/README.md
index 116fd61..3cded8b 100644
--- a/examples/lighting-app/nxp/mcxw71/README.md
+++ b/examples/lighting-app/nxp/mcxw71/README.md

@@ -109,7 +109,7 @@
 
 If the feature is enabled, the LED brightness can be controlled using
 `LevelControl` cluster
-[commands](../../../../docs/guides/chip_tool_guide.md#step-7-control-application-data-model-clusters).
+[commands](../../../../docs/development_controllers/chip-tool/chip_tool_guide.md#step-7-control-application-data-model-clusters).
 
 ## Flashing
 
@@ -267,4 +267,4 @@
 ## OTA
 
 Please see
-[mcxw71 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[mcxw71 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).

diff --git a/examples/lighting-app/silabs/README.md b/examples/lighting-app/silabs/README.md
index 606208a..7052d4f 100644
--- a/examples/lighting-app/silabs/README.md
+++ b/examples/lighting-app/silabs/README.md

@@ -200,7 +200,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -331,7 +331,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Group Communication (Multicast)
 

diff --git a/examples/lighting-app/stm32/README.md b/examples/lighting-app/stm32/README.md
index 26a6051..d69df7d 100644
--- a/examples/lighting-app/stm32/README.md
+++ b/examples/lighting-app/stm32/README.md

@@ -14,7 +14,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/stm32_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/stm32/stm32_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/lit-icd-app/esp32/README.md b/examples/lit-icd-app/esp32/README.md
index 405f208..9f36e17 100644
--- a/examples/lit-icd-app/esp32/README.md
+++ b/examples/lit-icd-app/esp32/README.md

@@ -3,9 +3,9 @@
 This example is meant to represent a power-save application.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 **Note**: Currently only Thread devices can run this example.

diff --git a/examples/lit-icd-app/nrfconnect/README.md b/examples/lit-icd-app/nrfconnect/README.md
index ff0f6b6..81503f9 100644
--- a/examples/lit-icd-app/nrfconnect/README.md
+++ b/examples/lit-icd-app/nrfconnect/README.md

@@ -42,7 +42,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -183,7 +183,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -376,7 +376,7 @@
     the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -400,17 +400,18 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing Device Firmware Upgrade
 
 Read the
-[DFU tutorial](../../../docs/guides/nrfconnect_examples_software_update.md) to
-see how to upgrade your device firmware.
+[DFU tutorial](../../../docs/platforms/nrf/nrfconnect_examples_software_update.md)
+to see how to upgrade your device firmware.

diff --git a/examples/lit-icd-app/silabs/README.md b/examples/lit-icd-app/silabs/README.md
index a38944b..4d1dee0 100644
--- a/examples/lit-icd-app/silabs/README.md
+++ b/examples/lit-icd-app/silabs/README.md

@@ -202,7 +202,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -317,7 +317,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/lock-app/asr/README.md b/examples/lock-app/asr/README.md
index 1da71f5..e81db2a 100755
--- a/examples/lock-app/asr/README.md
+++ b/examples/lock-app/asr/README.md

@@ -17,7 +17,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/lock-app/esp32/README.md b/examples/lock-app/esp32/README.md
index f7f020e..1194506 100644
--- a/examples/lock-app/esp32/README.md
+++ b/examples/lock-app/esp32/README.md

@@ -3,16 +3,16 @@
 This example demonstrates the mapping of OnOff cluster to lock/unlock logic.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---
 
 -   [Cluster control](#cluster-control)
 -   [Example Demo](#example-demo)
--   [RPC console and Device Tracing](../../../docs/guides/esp32/rpc_console.md)
+-   [RPC console and Device Tracing](../../../docs/platforms/esp32/rpc_console.md)
 
 ---
 

diff --git a/examples/lock-app/genio/README.md b/examples/lock-app/genio/README.md
index 7c4582f..051f6fa 100644
--- a/examples/lock-app/genio/README.md
+++ b/examples/lock-app/genio/README.md

@@ -86,7 +86,7 @@
     Chip tool standalone, Android or iOS app
 
     [CHIP
-    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/chip_tool_guide.md)
+    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-tool/chip_tool_guide.md)
 
     Here is an example with the CHIP Tool controller:
 

diff --git a/examples/lock-app/infineon/cyw30739/README.md b/examples/lock-app/infineon/cyw30739/README.md
index 0c9b769..c02d3a6 100644
--- a/examples/lock-app/infineon/cyw30739/README.md
+++ b/examples/lock-app/infineon/cyw30739/README.md

@@ -212,7 +212,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
 -   You can provision and control the device using the Python controller REPL,

diff --git a/examples/lock-app/infineon/psoc6/README.md b/examples/lock-app/infineon/psoc6/README.md
index 0c8e8eb..657b038 100644
--- a/examples/lock-app/infineon/psoc6/README.md
+++ b/examples/lock-app/infineon/psoc6/README.md

@@ -175,7 +175,7 @@
 
 For the description of OPTIGA™ Trust M Provisioning with test DAC generation and
 PAI and CD storage, please refer to
-[Infineon OPTIGA™ Trust M Provisioning](../../../../docs/guides/infineon_trustm_provisioning.md)
+[Infineon OPTIGA™ Trust M Provisioning](../../../../docs/platforms/infineon/infineon_trustm_provisioning.md)
 
 After completing OPTIGA™ Trust M Provisioning, proceed to
 [Flashing the Application](#flashing-the-application) section to continue with
@@ -185,4 +185,4 @@
 
 For the description of Software Update process with infineon PSoC6 example
 applications see
-[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md)
+[Infineon PSoC6 OTA Software Update](../../../../docs/platforms/infineon/infineon_psoc6_software_update.md)

diff --git a/examples/lock-app/mbed/README.md b/examples/lock-app/mbed/README.md
index 27eb422..1a8c34d 100644
--- a/examples/lock-app/mbed/README.md
+++ b/examples/lock-app/mbed/README.md

@@ -224,7 +224,8 @@
 
 #### CHIP Tools
 
-Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+Read the
+[MbedCommissioning](../../../docs/platforms/mbedos/mbedos_commissioning.md) to
 see how to use different CHIP tools to commission and control the application
 within a WiFi network.
 
@@ -288,7 +289,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `lock-app/mbed/mbed_app.json`. Information about this file syntax and its
     meaning in mbed-os project can be found here:

diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md
index 1438535..0a0743a 100644
--- a/examples/lock-app/nrfconnect/README.md
+++ b/examples/lock-app/nrfconnect/README.md

@@ -44,7 +44,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 By default, the Matter accessory device has IPv6 networking disabled. You must
@@ -255,7 +255,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -454,7 +454,7 @@
     the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -478,20 +478,21 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread or Wi-Fi
 network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread or Wi-Fi network.
@@ -499,5 +500,5 @@
 ### Testing Device Firmware Upgrade
 
 Read the
-[DFU tutorial](../../../docs/guides/nrfconnect_examples_software_update.md) to
-see how to upgrade your device firmware.
+[DFU tutorial](../../../docs/platforms/nrf/nrfconnect_examples_software_update.md)
+to see how to upgrade your device firmware.

diff --git a/examples/lock-app/nxp/README.md b/examples/lock-app/nxp/README.md
index c3cf4c1..a758ef5 100644
--- a/examples/lock-app/nxp/README.md
+++ b/examples/lock-app/nxp/README.md

@@ -126,7 +126,7 @@
 Use `chip_with_factory_data=1` in the gn build command to enable factory data.
 
 For a full guide on manufacturing flow, please see
-[Guide for writing manufacturing data on NXP devices](../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 ## Flashing and debugging
 

diff --git a/examples/lock-app/nxp/k32w1/README.md b/examples/lock-app/nxp/k32w1/README.md
index a085d94..88041b8 100644
--- a/examples/lock-app/nxp/k32w1/README.md
+++ b/examples/lock-app/nxp/k32w1/README.md

@@ -163,7 +163,7 @@
 ## OTA
 
 Please see
-[k32w1 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[k32w1 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).
 
 ## Multiple BLE connections
 

diff --git a/examples/lock-app/nxp/mcxw71/README.md b/examples/lock-app/nxp/mcxw71/README.md
index db877d0..92e177d 100644
--- a/examples/lock-app/nxp/mcxw71/README.md
+++ b/examples/lock-app/nxp/mcxw71/README.md

@@ -195,7 +195,7 @@
 ## OTA
 
 Please see
-[mcxw71 OTA guide](../../../../docs/guides/nxp/nxp_mcxw71_ota_guide.md).
+[mcxw71 OTA guide](../../../../docs/platforms/nxp/nxp_mcxw71_ota_guide.md).
 
 ## Multiple BLE connections
 

diff --git a/examples/lock-app/openiotsdk/README.md b/examples/lock-app/openiotsdk/README.md
index 69e569b..f81f2ad 100644
--- a/examples/lock-app/openiotsdk/README.md
+++ b/examples/lock-app/openiotsdk/README.md

@@ -10,7 +10,7 @@
 
 For information on how to build, run, test and debug this example and further
 information about the platform it is run on see
-[Open IoT SDK examples](../../../docs/guides/openiotsdk_examples.md).
+[Open IoT SDK examples](../../../docs/platforms/openiotsdk/openiotsdk_examples.md).
 
 The example name to use in the scripts is `lock-app`.
 
@@ -30,7 +30,7 @@
 ### Commissioning
 
 Read the
-[Open IoT SDK commissioning guide](../../../docs/guides/openiotsdk_commissioning.md)
+[Open IoT SDK commissioning guide](../../../docs/platforms/openiotsdk/openiotsdk_commissioning.md)
 to see how to use the Matter controller to commission and control the
 application.
 

diff --git a/examples/lock-app/silabs/README.md b/examples/lock-app/silabs/README.md
index 4a16af0..7b4f7fd 100644
--- a/examples/lock-app/silabs/README.md
+++ b/examples/lock-app/silabs/README.md

@@ -223,7 +223,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -367,7 +367,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/ota-provider-app/esp32/README.md b/examples/ota-provider-app/esp32/README.md
index 2102aab..7717aa1 100644
--- a/examples/ota-provider-app/esp32/README.md
+++ b/examples/ota-provider-app/esp32/README.md

@@ -3,7 +3,7 @@
 A prototype application that demonstrates OTA provider capabilities.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 
 ---
 
@@ -16,7 +16,7 @@
 ### Building and Commissioning
 
 Generate the OTA image as described
-[here](../../../docs/guides/esp32/ota.md#generate-chip-ota-image)
+[here](../../../docs/platforms/esp32/ota.md#generate-chip-ota-image)
 
 #### Configure OTA image to serve
 
@@ -36,7 +36,7 @@
     terminator.
 
 Follow
-[ESP32 Application Usage Guide](../../../docs/guides/esp32/build_app_and_commission.md)
+[ESP32 Application Usage Guide](../../../docs/platforms/esp32/build_app_and_commission.md)
 to Build, Flash, Monitor, and Commission the device.
 
 Once device is commissioned successfully, then please try below steps.

diff --git a/examples/ota-requestor-app/asr/README.md b/examples/ota-requestor-app/asr/README.md
index 7af3c25..d2cb6c8 100755
--- a/examples/ota-requestor-app/asr/README.md
+++ b/examples/ota-requestor-app/asr/README.md

@@ -13,7 +13,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/ota-requestor-app/esp32/README.md b/examples/ota-requestor-app/esp32/README.md
index 1951b45..0f8972d 100644
--- a/examples/ota-requestor-app/esp32/README.md
+++ b/examples/ota-requestor-app/esp32/README.md

@@ -3,9 +3,9 @@
 A prototype application that demonstrates OTA Requestor capabilities.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---
@@ -13,7 +13,7 @@
 -   [Prerequisite](#prerequisite)
 -   [Query for an OTA Image](#query-for-an-ota-image)
 -   [ESP32 OTA Requestor with Linux OTA Provider](#esp32-ota-requestor-with-linux-ota-provider)
--   [RPC console and Device Tracing](../../../docs/guides/esp32/rpc_console.md)
+-   [RPC console and Device Tracing](../../../docs/platforms/esp32/rpc_console.md)
 
 ---
 

diff --git a/examples/ota-requestor-app/genio/README.md b/examples/ota-requestor-app/genio/README.md
index e8675ad..487056c 100644
--- a/examples/ota-requestor-app/genio/README.md
+++ b/examples/ota-requestor-app/genio/README.md

@@ -86,7 +86,7 @@
     Chip tool standalone, Android or iOS app
 
     [CHIP
-    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/chip_tool_guide.md)
+    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-tool/chip_tool_guide.md)
 
     Here is an example with the CHIP Tool controller:
 

diff --git a/examples/ota-requestor-app/mbed/README.md b/examples/ota-requestor-app/mbed/README.md
index 6f8bcda..0de6729 100644
--- a/examples/ota-requestor-app/mbed/README.md
+++ b/examples/ota-requestor-app/mbed/README.md

@@ -231,7 +231,8 @@
 
 #### CHIP Tools
 
-Read the [MbedCommissioning](../../../docs/guides/mbedos_commissioning.md) to
+Read the
+[MbedCommissioning](../../../docs/platforms/mbedos/mbedos_commissioning.md) to
 see how to use different CHIP tools to commission and control the application
 within a WiFi network.
 
@@ -266,7 +267,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `ota-requestor-app/mbed/mbed_app.json`. Information about this file syntax
     and its meaning in mbed-os project can be found here:

diff --git a/examples/ota-requestor-app/openiotsdk/README.md b/examples/ota-requestor-app/openiotsdk/README.md
index d9a98c4..042c30d 100644
--- a/examples/ota-requestor-app/openiotsdk/README.md
+++ b/examples/ota-requestor-app/openiotsdk/README.md

@@ -9,8 +9,8 @@
 
 The application is configured to support:
 
--   [TF-M](../../../docs/guides/openiotsdk_examples.md#trusted-firmware-m)
--   [Device Firmware Update](../../../docs/guides/openiotsdk_examples.md#device-firmware-update)
+-   [TF-M](../../../docs/platforms/openiotsdk/openiotsdk_examples.md#trusted-firmware-m)
+-   [Device Firmware Update](../../../docs/platforms/openiotsdk/openiotsdk_examples.md#device-firmware-update)
 
 The example behaves as a Matter accessory, device that can be paired into an
 existing Matter network and can be controlled by it.
@@ -19,7 +19,7 @@
 
 For information on how to build, run, test and debug this example and further
 information about the platform it is run on see
-[Open IoT SDK examples](../../../docs/guides/openiotsdk_examples.md).
+[Open IoT SDK examples](../../../docs/platforms/openiotsdk/openiotsdk_examples.md).
 
 The example name to use in the scripts is `ota-requestor-app`.
 
@@ -39,14 +39,14 @@
 ### Commissioning
 
 Read the
-[Open IoT SDK commissioning guide](../../../docs/guides/openiotsdk_commissioning.md)
+[Open IoT SDK commissioning guide](../../../docs/platforms/openiotsdk/openiotsdk_commissioning.md)
 to see how to use the Matter controller to commission and control the
 application.
 
 ### Device Firmware Upgrade
 
 Read the
-[Matter Open IoT SDK Example Device Firmware Upgrade](../../../docs/guides/openiotsdk_examples_software_update.md)
+[Matter Open IoT SDK Example Device Firmware Upgrade](../../../docs/platforms/openiotsdk/openiotsdk_examples_software_update.md)
 to see how to use Matter OTA for firmware update.
 
 ### OtaSoftwareUpdateRequestor cluster usage
@@ -78,4 +78,4 @@
 installed and the application will be reboot.
 
 More details about device firmware update over Matter can be found
-[here](../../../docs/guides/openiotsdk_examples_software_update.md).
+[here](../../../docs/platforms/openiotsdk/openiotsdk_examples_software_update.md).

diff --git a/examples/persistent-storage/esp32/README.md b/examples/persistent-storage/esp32/README.md
index d87b894..e682050 100644
--- a/examples/persistent-storage/esp32/README.md
+++ b/examples/persistent-storage/esp32/README.md

@@ -3,9 +3,9 @@
 An example testing and demonstrating the key value storage API.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/pigweed-app/esp32/README.md b/examples/pigweed-app/esp32/README.md
index 8044fae..ebd63ed 100644
--- a/examples/pigweed-app/esp32/README.md
+++ b/examples/pigweed-app/esp32/README.md

@@ -1,9 +1,9 @@
 # CHIP ESP32 Pigweed Example Application
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/pigweed-app/mbed/README.md b/examples/pigweed-app/mbed/README.md
index 8ca7aca..3932e4f 100644
--- a/examples/pigweed-app/mbed/README.md
+++ b/examples/pigweed-app/mbed/README.md

@@ -249,7 +249,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `pigweed-app/mbed/mbed_app.json`. Information about this file syntax and its
     meaning in mbed-os project can be found here:

diff --git a/examples/pump-app/nrfconnect/README.md b/examples/pump-app/nrfconnect/README.md
index 16fbc2f..98d3e15 100644
--- a/examples/pump-app/nrfconnect/README.md
+++ b/examples/pump-app/nrfconnect/README.md

@@ -42,7 +42,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 The Matter device that runs the pump application is controlled by the Matter
@@ -213,7 +213,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -415,7 +415,7 @@
     the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -439,19 +439,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread network.

diff --git a/examples/pump-app/silabs/README.md b/examples/pump-app/silabs/README.md
index 7bde704..70d83e4 100644
--- a/examples/pump-app/silabs/README.md
+++ b/examples/pump-app/silabs/README.md

@@ -197,7 +197,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -307,7 +307,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Group Communication (Multicast)
 

diff --git a/examples/pump-controller-app/nrfconnect/README.md b/examples/pump-controller-app/nrfconnect/README.md
index 64f37c4..b492c3e 100644
--- a/examples/pump-controller-app/nrfconnect/README.md
+++ b/examples/pump-controller-app/nrfconnect/README.md

@@ -43,7 +43,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit CHIP's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 The Matter device that runs the pump application is controlled by the Matter
@@ -214,7 +214,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -415,7 +415,7 @@
     the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -439,19 +439,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 CHIP-enabled Thread network.

diff --git a/examples/refrigerator-app/linux/README.md b/examples/refrigerator-app/linux/README.md
index c969832..cf66321 100644
--- a/examples/refrigerator-app/linux/README.md
+++ b/examples/refrigerator-app/linux/README.md

@@ -7,7 +7,7 @@
 
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../docs/guides/nxp/nxp_imx8m_linux_examples.md) for
+[README document](../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md) for
 details.
 
 <hr>

diff --git a/examples/refrigerator-app/silabs/README.md b/examples/refrigerator-app/silabs/README.md
index 3396ee6..d063937 100644
--- a/examples/refrigerator-app/silabs/README.md
+++ b/examples/refrigerator-app/silabs/README.md

@@ -200,7 +200,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](../../../docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -338,7 +338,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 For the description of Software Update process with SiWx917 example applications
 see

diff --git a/examples/shell/mbed/README.md b/examples/shell/mbed/README.md
index 16a9f98..c299127 100644
--- a/examples/shell/mbed/README.md
+++ b/examples/shell/mbed/README.md

@@ -207,7 +207,7 @@
 
 -   More details and guidelines about porting new hardware into the Matter
     project with Mbed OS can be found in
-    [MbedNewTarget](../../../docs/guides/mbedos_add_new_target.md)
+    [MbedNewTarget](../../../docs/platforms/mbedos/mbedos_add_new_target.md)
 -   Some useful information about HW platform specific settings can be found in
     `shell/mbed/mbed_app.json`. Information about this file syntax and its
     meaning in mbed-os project can be found here:

diff --git a/examples/shell/openiotsdk/README.md b/examples/shell/openiotsdk/README.md
index b633fa7..7670c19 100644
--- a/examples/shell/openiotsdk/README.md
+++ b/examples/shell/openiotsdk/README.md

@@ -12,7 +12,7 @@
 
 For information on how to build, run, test and debug this example and further
 information about the platform it is run on see
-[Open IoT SDK examples](../../../docs/guides/openiotsdk_examples.md).
+[Open IoT SDK examples](../../../docs/platforms/openiotsdk/openiotsdk_examples.md).
 
 The example name to use in the scripts is `shell`.
 

diff --git a/examples/smoke-co-alarm-app/silabs/README.md b/examples/smoke-co-alarm-app/silabs/README.md
index e16621d..7928107 100644
--- a/examples/smoke-co-alarm-app/silabs/README.md
+++ b/examples/smoke-co-alarm-app/silabs/README.md

@@ -220,7 +220,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -317,7 +317,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/temperature-measurement-app/asr/README.md b/examples/temperature-measurement-app/asr/README.md
index 72c01f8..1382849 100755
--- a/examples/temperature-measurement-app/asr/README.md
+++ b/examples/temperature-measurement-app/asr/README.md

@@ -14,7 +14,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/temperature-measurement-app/esp32/README.md b/examples/temperature-measurement-app/esp32/README.md
index 7121010..a3276ae 100644
--- a/examples/temperature-measurement-app/esp32/README.md
+++ b/examples/temperature-measurement-app/esp32/README.md

@@ -3,9 +3,9 @@
 This example is meant to represent a minimal-sized application.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/thermostat/asr/README.md b/examples/thermostat/asr/README.md
index 0392b82..1422efe 100755
--- a/examples/thermostat/asr/README.md
+++ b/examples/thermostat/asr/README.md

@@ -14,7 +14,7 @@
 ## Building and Commissioning
 
 Please refer
-[Building and Commissioning](../../../docs/guides/asr_getting_started_guide.md#building-the-example-application)
+[Building and Commissioning](../../../docs/platforms/asr/asr_getting_started_guide.md#building-the-example-application)
 guides to get started
 
 ```

diff --git a/examples/thermostat/genio/README.md b/examples/thermostat/genio/README.md
index 4ae5bba..b9630f7 100644
--- a/examples/thermostat/genio/README.md
+++ b/examples/thermostat/genio/README.md

@@ -86,7 +86,7 @@
     Chip tool standalone, Android or iOS app
 
     [CHIP
-    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/chip_tool_guide.md)
+    Tool]](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-tool/chip_tool_guide.md)
 
     Here is an example with the CHIP Tool controller:
 

diff --git a/examples/thermostat/infineon/cyw30739/README.md b/examples/thermostat/infineon/cyw30739/README.md
index 0b94884..d514fef 100644
--- a/examples/thermostat/infineon/cyw30739/README.md
+++ b/examples/thermostat/infineon/cyw30739/README.md

@@ -212,7 +212,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
 -   For this example to work, it is necessary to have a second CYW30739 device

diff --git a/examples/thermostat/nxp/linux-imx/imx8m/README.md b/examples/thermostat/nxp/linux-imx/imx8m/README.md
index e20ff10..01941f5 100644
--- a/examples/thermostat/nxp/linux-imx/imx8m/README.md
+++ b/examples/thermostat/nxp/linux-imx/imx8m/README.md

@@ -1,4 +1,4 @@
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../../../docs/guides/nxp/nxp_imx8m_linux_examples.md)
+[README document](../../../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md)
 for details.

diff --git a/examples/thermostat/nxp/linux-se05x/README.md b/examples/thermostat/nxp/linux-se05x/README.md
index e20ff10..01941f5 100644
--- a/examples/thermostat/nxp/linux-se05x/README.md
+++ b/examples/thermostat/nxp/linux-se05x/README.md

@@ -1,4 +1,4 @@
 To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
 **EVK**, see the associated
-[README document](../../../../../docs/guides/nxp/nxp_imx8m_linux_examples.md)
+[README document](../../../../../docs/platforms/nxp/nxp_imx8m_linux_examples.md)
 for details.

diff --git a/examples/thermostat/silabs/README.md b/examples/thermostat/silabs/README.md
index 25ba478..3205352 100644
--- a/examples/thermostat/silabs/README.md
+++ b/examples/thermostat/silabs/README.md

@@ -206,7 +206,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -324,7 +324,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/examples/thread-br-app/esp32/README.md b/examples/thread-br-app/esp32/README.md
index 576339c..2578a10 100644
--- a/examples/thread-br-app/esp32/README.md
+++ b/examples/thread-br-app/esp32/README.md

@@ -4,9 +4,9 @@
 ESP32-H2 Thread Border Router DevKit Board.
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and CHIP Environment](../../../docs/platforms/esp32/setup_idf_chip.md)
 and refer
-[building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
+[building and commissioning](../../../docs/platforms/esp32/build_app_and_commission.md)
 guides to get started.
 
 ---

diff --git a/examples/tv-app/openiotsdk/README.md b/examples/tv-app/openiotsdk/README.md
index 8702f29..5a14826 100644
--- a/examples/tv-app/openiotsdk/README.md
+++ b/examples/tv-app/openiotsdk/README.md

@@ -19,7 +19,7 @@
 
 For information on how to build, run, test and debug this example and further
 information about the platform it is run on see
-[Open IoT SDK examples](../../../docs/guides/openiotsdk_examples.md).
+[Open IoT SDK examples](../../../docs/platforms/openiotsdk/openiotsdk_examples.md).
 
 The example name to use in the scripts is `tv-app`.
 
@@ -68,7 +68,7 @@
 ## Commissioning
 
 Read the
-[Open IoT SDK commissioning guide](../../../docs/guides/openiotsdk_commissioning.md)
+[Open IoT SDK commissioning guide](../../../docs/platforms/openiotsdk/openiotsdk_commissioning.md)
 to see how to use the Matter controller to commission and control the
 application.
 

diff --git a/examples/tv-casting-app/android/README.md b/examples/tv-casting-app/android/README.md
index b620c1a..047f960 100644
--- a/examples/tv-casting-app/android/README.md
+++ b/examples/tv-casting-app/android/README.md

@@ -21,7 +21,7 @@
 ## Requirements for building
 
 Refer to
-[this file](../../../docs/guides/android_building.md#requirements-for-building)
+[this file](../../../docs/platforms/android/android_building.md#requirements-for-building)
 to download the recommended version for the Android SDK and NDK for your
 machine. Set the `$ANDROID_HOME` environment variable to where the SDK is
 downloaded and the `$ANDROID_NDK_HOME` environment variable to point to where

diff --git a/examples/virtual-device-app/android/README.md b/examples/virtual-device-app/android/README.md
index a5a1ce3..2bb74a7 100644
--- a/examples/virtual-device-app/android/README.md
+++ b/examples/virtual-device-app/android/README.md

@@ -23,7 +23,7 @@
 ## Requirements for building
 
 For information about how to build the application, see the
-[Building Android](../../../docs/guides/android_building.md) guide.
+[Building Android](../../../docs/platforms/android/android_building.md) guide.
 
 ## Preparing for build
 

diff --git a/examples/window-app/nrfconnect/README.md b/examples/window-app/nrfconnect/README.md
index 964af0c..c743bb2 100644
--- a/examples/window-app/nrfconnect/README.md
+++ b/examples/window-app/nrfconnect/README.md

@@ -40,7 +40,7 @@
 Semiconductor's
 [nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
 and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
-[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
+[nRF Connect platform overview](../../../docs/platforms/nrf/nrfconnect_platform_overview.md)
 to read more about the platform structure and dependencies.
 
 The Matter device that runs the window shutter application is controlled by the
@@ -229,7 +229,7 @@
 
 **SEGGER J-Link USB port** can be used to get logs from the device or
 communicate with it using the
-[command line interface](../../../docs/guides/nrfconnect_examples_cli.md).
+[command line interface](../../../docs/platforms/nrf/nrfconnect_examples_cli.md).
 
 **NFC port with antenna attached** can be used to start the
 [rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
@@ -430,7 +430,7 @@
     only the necessary application functionalities to optimize its performance.
 
 For more information, see the
-[Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)
+[Configuring nRF Connect SDK examples](../../../docs/platforms/nrf/nrfconnect_examples_configuration.md)
 page.
 
 <hr>
@@ -454,19 +454,20 @@
 
 ## Testing the example
 
-Check the [CLI tutorial](../../../docs/guides/nrfconnect_examples_cli.md) to
-learn how to use command-line interface of the application.
+Check the [CLI tutorial](../../../docs/platforms/nrf/nrfconnect_examples_cli.md)
+to learn how to use command-line interface of the application.
 
 ### Testing using Linux CHIPTool
 
-Read the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md) to see
-how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
+Read the
+[CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md)
+to see how to use [CHIP Tool for Linux or mac OS](../../chip-tool/README.md) to
 commission and control the application within a Matter-enabled Thread network.
 
 ### Testing using Android CHIPTool
 
 Read the
-[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
+[Android commissioning guide](../../../docs/platforms/nrf/nrfconnect_android_commissioning.md)
 to see how to use [CHIPTool](../../../examples/android/CHIPTool/README.md) for
 Android smartphones to commission and control the application within a
 Matter-enabled Thread network.
@@ -474,5 +475,5 @@
 ### Testing Device Firmware Upgrade
 
 Read the
-[DFU tutorial](../../../docs/guides/nrfconnect_examples_software_update.md) to
-see how to upgrade your device firmware.
+[DFU tutorial](../../../docs/platforms/nrf/nrfconnect_examples_software_update.md)
+to see how to upgrade your device firmware.

diff --git a/examples/window-app/silabs/README.md b/examples/window-app/silabs/README.md
index 47dbb77..a5e985c 100644
--- a/examples/window-app/silabs/README.md
+++ b/examples/window-app/silabs/README.md

@@ -195,7 +195,7 @@
 
 -   It is assumed here that you already have an OpenThread border router
     configured and running. If not see the following guide
-    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/guides/openthread_border_router_pi.md)
+    [Openthread_border_router](https://github.com/project-chip/connectedhomeip/blob/master/docs/platforms/openthread/openthread_border_router_pi.md)
     for more information on how to setup a border router on a raspberryPi.
 
     Take note that the RCP code is available directly through
@@ -324,7 +324,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/platforms/silabs/silabs_efr32_software_update.md)
 
 ## Building options
 

diff --git a/scripts/tools/nxp/factory_data_generator/README.md b/scripts/tools/nxp/factory_data_generator/README.md
index 0aacaeb..e218e5f 100644
--- a/scripts/tools/nxp/factory_data_generator/README.md
+++ b/scripts/tools/nxp/factory_data_generator/README.md

@@ -1,7 +1,7 @@
 # NXP Factory Data Generator
 
 For usage of the tool, please see
-[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
+[Guide for writing manufacturing data on NXP devices](../../../../docs/platforms/nxp/nxp_manufacturing_flow.md).
 
 ## Tool implementation
 

diff --git a/src/controller/java/tests/README.md b/src/controller/java/tests/README.md
index 14aedc4..a389cfd 100644
--- a/src/controller/java/tests/README.md
+++ b/src/controller/java/tests/README.md

@@ -4,5 +4,6 @@
 
 ## Building & setting up emulator
 
-Please refer to [Building Android](../../../../docs/guides/android_building.md)
-guide to learn how to setup & run these tests in an android emulator.
+Please refer to
+[Building Android](../../../../docs/platforms/android/android_building.md) guide
+to learn how to setup & run these tests in an android emulator.
commit	32a375c6ac7b18d3b4231d3d81a3a090e05f96fe	[log] [tgz]
author	C Freeman <cecille@google.com>	Mon Oct 14 23:05:15 2024 -0400
committer	GitHub <noreply@github.com>	Tue Oct 15 03:05:15 2024 +0000
tree	e1c5d370a3cd9352ede8fab0cb12393077f8996d
parent	0c59ebf6b37cd16f196db42e43f5f6269727db6c [diff]