diff --git a/docs/building/run_tfm_examples_on_arm_platforms.rst b/docs/building/run_tfm_examples_on_arm_platforms.rst
index e9f3acb..5574110 100644
--- a/docs/building/run_tfm_examples_on_arm_platforms.rst
+++ b/docs/building/run_tfm_examples_on_arm_platforms.rst
@@ -221,7 +221,7 @@
 .. Note::
 
     Before executing any images on Musca-B1 board, please check the
-    :doc:`target platform readme </platform/ext/target/arm/musca_b1/sse_200/readme>`
+    :doc:`target platform readme </platform/arm/musca_b1/sse_200/readme>`
     to have the correct setup.
 
     Install SRecord for Musca test chip boards.
@@ -418,7 +418,7 @@
 ============================================================================
 
 Follow the above procedures, but to create a unified hex please check the
-:doc:`Musca-B1 Secure Enclave readme </platform/ext/target/arm/musca_b1/secure_enclave/readme>`.
+:doc:`Musca-B1 Secure Enclave readme </platform/arm/musca_b1/secure_enclave/readme>`.
 
 ********************************************************
 Execute TF-M example and regression tests on MPS3 boards
diff --git a/docs/conf.py b/docs/conf.py
index 425f1a6..2a8deb5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -82,7 +82,7 @@
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'readme.rst',
-                    'platform/ext/target/cypress/psoc64/security/keys/readme.rst',
+                    'platform/cypress/psoc64/security/keys/readme.rst',
                     'lib/ext/**']
 
 # The name of the Pygments (syntax highlighting) style to use.
diff --git a/docs/contributing/doc_guidelines.rst b/docs/contributing/doc_guidelines.rst
index dcc9732..8c7b3b6 100644
--- a/docs/contributing/doc_guidelines.rst
+++ b/docs/contributing/doc_guidelines.rst
@@ -62,8 +62,8 @@
 The Documentation Build system provides an interface with the platform directory
 allowing maintainers to bundle platform specific documentation. **This behaviour
 needs to be explicitly enabled for each platform's space** by
-modifying the `platform/ext/index.rst` (responsible for generating the
-:doc:`Platform Index File </platform/ext/index>`) and adding a table of
+modifying the `platform/index.rst` (responsible for generating the
+:doc:`Platform Index File </platform/index>`) and adding a table of
 contents entry for the corresponding platform space.
 
 The format and structure of this entry is not strictly defined, and allows
@@ -77,7 +77,7 @@
         :caption: PLATFORM_X_CAPTION
         :glob:
 
-        target/PLATFORM_X/**
+        PLATFORM_X/**
 
 ****************
 Common Use Cases
diff --git a/docs/index.rst b/docs/index.rst
index add4ec2..17eebd6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -85,7 +85,7 @@
     :maxdepth: 1
     :hidden:
 
-    Platform Selection<platform/ext/index>
+    Platform Selection<platform/index>
     building/tfm_build_instruction
     integration_guide/index
     technical_references/design_docs/index
diff --git a/docs/introduction/readme.rst b/docs/introduction/readme.rst
index a822508..efffcf9 100644
--- a/docs/introduction/readme.rst
+++ b/docs/introduction/readme.rst
@@ -34,7 +34,7 @@
 secure connection with edge gateways and IoT cloud services. It also protects
 the critical security assets such as sensitive data, keys and certificates on
 the platform. TF-M is supported on several Cortex-M based
-:doc:`Microcontrollers </platform/ext/index>` and Real Time Operating
+:doc:`Microcontrollers </platform/index>` and Real Time Operating
 Systems (RTOS).
 
 Terms ``TFM`` and ``TF-M`` are commonly used in documents and code and both
@@ -60,9 +60,9 @@
 - The ``platform`` folder currently contains platforms support imported from
   the external project and the files may have different licenses.
 
-.. include:: /platform/ext/platform_introduction.rst
+.. include:: /platform/platform_introduction.rst
 
-The document :doc:`Supported Platforms </platform/ext/index>` lists the details.
+The document :doc:`Supported Platforms </platform/index>` lists the details.
 
 #########################
 Release Notes and Process
diff --git a/docs/platform/ext/target/arm/corstone1000/openamp/images/example_psa_call_workflow.png b/docs/platform/arm/corstone1000/openamp/images/example_psa_call_workflow.png
similarity index 100%
rename from docs/platform/ext/target/arm/corstone1000/openamp/images/example_psa_call_workflow.png
rename to docs/platform/arm/corstone1000/openamp/images/example_psa_call_workflow.png
Binary files differ
diff --git a/docs/platform/ext/target/arm/corstone1000/openamp/images/files_relationship.png b/docs/platform/arm/corstone1000/openamp/images/files_relationship.png
similarity index 100%
rename from docs/platform/ext/target/arm/corstone1000/openamp/images/files_relationship.png
rename to docs/platform/arm/corstone1000/openamp/images/files_relationship.png
Binary files differ
diff --git a/docs/platform/ext/target/arm/corstone1000/openamp/readme.rst b/docs/platform/arm/corstone1000/openamp/readme.rst
similarity index 100%
rename from docs/platform/ext/target/arm/corstone1000/openamp/readme.rst
rename to docs/platform/arm/corstone1000/openamp/readme.rst
diff --git a/docs/platform/ext/target/arm/corstone1000/readme.rst b/docs/platform/arm/corstone1000/readme.rst
similarity index 97%
rename from docs/platform/ext/target/arm/corstone1000/readme.rst
rename to docs/platform/arm/corstone1000/readme.rst
index 10c9c58..3925455 100644
--- a/docs/platform/ext/target/arm/corstone1000/readme.rst
+++ b/docs/platform/arm/corstone1000/readme.rst
@@ -1,6 +1,6 @@
-##################
-ARM: Corstone-1000
-##################
+#############
+Corstone-1000
+#############
 
 ************
 Introduction
@@ -21,6 +21,12 @@
 The communication between NSPE and SPE is based on PSA IPC protocol running on
 top of FF-A/OpenAMP.
 
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    openamp/**
+
 The secure enclave subsystem has ARM's CC-312 (Crypto Cell) hardware to
 accelerate cryptographic operations. Additionaly, platform supports Secure Debug
 using SDC-600 as the communication interface between host debugger and platform
diff --git a/docs/platform/arm/index.rst b/docs/platform/arm/index.rst
new file mode 100755
index 0000000..48a8223
--- /dev/null
+++ b/docs/platform/arm/index.rst
@@ -0,0 +1,18 @@
+#############
+Arm platforms
+#############
+
+.. toctree::
+    :maxdepth: 1
+
+    Corstone-1000 <corstone1000/readme.rst>
+    Corstone-300 FPGA (AN547) <mps3/an547/README.rst>
+    Corstone-300 FPGA and FVP (AN552) <mps3/an552/README.rst>
+    Corstone-310 FVP <mps3/corstone310_fvp/README.rst>
+    Musca-B1 <musca_b1/sse_200/readme.rst>
+    Musca-B1 Secure Enclave <musca_b1/secure_enclave/readme.rst>
+    Runtime Security Subsystem <rss/readme.rst>
+
+--------------
+
+*Copyright (c) 2022, Arm Limited. All rights reserved.*
diff --git a/docs/platform/ext/target/arm/mps3/an547/README.rst b/docs/platform/arm/mps3/an547/README.rst
similarity index 98%
rename from docs/platform/ext/target/arm/mps3/an547/README.rst
rename to docs/platform/arm/mps3/an547/README.rst
index 7506703..c2e7667 100644
--- a/docs/platform/ext/target/arm/mps3/an547/README.rst
+++ b/docs/platform/arm/mps3/an547/README.rst
@@ -20,7 +20,7 @@
    They can also be run on the Corstone-300 Ethos-U55 Ecosystem FVP
    (FVP_SSE300_MPS3) up until version 11.15. From version 11.16, the FVP
    is aligned with the AN552 FPGA platform. For build information check
-   :doc:`AN552 platform </platform/ext/target/arm/mps3/an552/README>`.
+   :doc:`AN552 platform </platform/arm/mps3/an552/README>`.
 
 To run the example code on Corstone SSE-300 with Ethos-U55 Example Subsystem for MPS3 (AN547)
 ---------------------------------------------------------------------------------------------
diff --git a/docs/platform/ext/target/arm/mps3/an552/README.rst b/docs/platform/arm/mps3/an552/README.rst
similarity index 100%
rename from docs/platform/ext/target/arm/mps3/an552/README.rst
rename to docs/platform/arm/mps3/an552/README.rst
diff --git a/docs/platform/ext/target/arm/mps3/corstone310_fvp/README.rst b/docs/platform/arm/mps3/corstone310_fvp/README.rst
similarity index 100%
rename from docs/platform/ext/target/arm/mps3/corstone310_fvp/README.rst
rename to docs/platform/arm/mps3/corstone310_fvp/README.rst
diff --git a/docs/platform/ext/target/arm/musca_b1/secure_enclave/readme.rst b/docs/platform/arm/musca_b1/secure_enclave/readme.rst
similarity index 100%
rename from docs/platform/ext/target/arm/musca_b1/secure_enclave/readme.rst
rename to docs/platform/arm/musca_b1/secure_enclave/readme.rst
diff --git a/docs/platform/ext/target/arm/musca_b1/sse_200/readme.rst b/docs/platform/arm/musca_b1/sse_200/readme.rst
similarity index 100%
rename from docs/platform/ext/target/arm/musca_b1/sse_200/readme.rst
rename to docs/platform/arm/musca_b1/sse_200/readme.rst
diff --git a/docs/platform/ext/target/arm/rss/readme.rst b/docs/platform/arm/rss/readme.rst
similarity index 100%
rename from docs/platform/ext/target/arm/rss/readme.rst
rename to docs/platform/arm/rss/readme.rst
diff --git a/docs/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst b/docs/platform/cypress/psoc64/cypress_psoc64_spec.rst
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
rename to docs/platform/cypress/psoc64/cypress_psoc64_spec.rst
diff --git a/docs/platform/ext/target/cypress/psoc64/index.rst b/docs/platform/cypress/psoc64/index.rst
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/index.rst
rename to docs/platform/cypress/psoc64/index.rst
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/README.md b/docs/platform/cypress/psoc64/libs/core-lib/README.md
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/README.md
rename to docs/platform/cypress/psoc64/libs/core-lib/README.md
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/RELEASE.md b/docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/RELEASE.md
rename to docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/bc_s.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/bc_s.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/bc_s.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/bc_s.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/bdwn.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/bdwn.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/bdwn.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/bdwn.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/closed.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/closed.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/closed.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/closed.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/doc.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/doc.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/doc.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/doc.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/doxygen.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/doxygen.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/doxygen.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/doxygen.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/folderclosed.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/folderclosed.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/folderclosed.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/folderclosed.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/folderopen.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/folderopen.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/folderopen.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/folderopen.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/logo.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/logo.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/logo.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/logo.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_f.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_f.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_f.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_f.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_g.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_g.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_g.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_g.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_h.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_h.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/nav_h.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/nav_h.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/open.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/open.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/open.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/open.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/close.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/close.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/close.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/close.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/mag_sel.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/mag_sel.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/mag_sel.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/mag_sel.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_l.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_l.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_l.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_l.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_m.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_m.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_m.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_m.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_r.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_r.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/search/search_r.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/search/search_r.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/splitbar.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/splitbar.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/splitbar.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/splitbar.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/sync_off.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/sync_off.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/sync_off.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/sync_off.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/sync_on.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/sync_on.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/sync_on.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/sync_on.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_a.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_a.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_a.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_a.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_b.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_b.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_b.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_b.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_h.png b/docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_h.png
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/libs/core-lib/docs/html/tab_h.png
rename to docs/platform/cypress/psoc64/libs/core-lib/docs/html/tab_h.png
Binary files differ
diff --git a/docs/platform/ext/target/cypress/psoc64/security/keys/readme.rst b/docs/platform/cypress/psoc64/security/keys/readme.rst
similarity index 100%
rename from docs/platform/ext/target/cypress/psoc64/security/keys/readme.rst
rename to docs/platform/cypress/psoc64/security/keys/readme.rst
diff --git a/docs/platform/ext/target/arm/corstone1000/index.rst b/docs/platform/ext/target/arm/corstone1000/index.rst
deleted file mode 100755
index 9e3136b..0000000
--- a/docs/platform/ext/target/arm/corstone1000/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Arm Corstone-1000
-=================
-
-.. toctree::
-    :maxdepth: 1
-    :glob:
-
-    readme.rst
-    openamp/**
-
---------------
-
-*Copyright (c) 2022, Arm Limited. All rights reserved.*
diff --git a/docs/platform/ext/target/arm/index.rst b/docs/platform/ext/target/arm/index.rst
deleted file mode 100755
index 866d6df..0000000
--- a/docs/platform/ext/target/arm/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Arm platforms
-=============
-
-.. toctree::
-    :maxdepth: 1
-    :glob:
-
-    corstone1000/index
-    mps3/**
-    musca_b1/**
-    rss/**
-
---------------
-
-*Copyright (c) 2022, Arm Limited. All rights reserved.*
diff --git a/docs/platform/ext/index.rst b/docs/platform/index.rst
similarity index 68%
rename from docs/platform/ext/index.rst
rename to docs/platform/index.rst
index da883ef..4c53ebb 100644
--- a/docs/platform/ext/index.rst
+++ b/docs/platform/index.rst
@@ -1,54 +1,54 @@
+##############
 TF-M Platforms
-==============
+##############
 
 .. toctree::
     :maxdepth: 2
     :caption: arm
-    :glob:
 
-    target/arm/index
+    arm/index
 
 .. toctree::
     :maxdepth: 1
     :caption: NXP
     :glob:
 
-    target/nxp/**
+    nxp/**
 
 .. toctree::
     :maxdepth: 1
     :caption: Cypress
     :glob:
 
-    target/cypress/psoc64/index
+    cypress/psoc64/index
 
 .. toctree::
     :maxdepth: 2
     :caption: STM
     :glob:
 
-    target/stm/index
+    stm/index
 
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 1
     :caption: Nordic
     :glob:
 
-    target/nordic_nrf/**
+    nordic_nrf/**
 
 .. toctree::
-    :maxdepth: 2
+    :maxdepth: 1
     :caption: Laird Connectivity
     :glob:
 
-    target/lairdconnectivity/**
+    lairdconnectivity/**
 
 .. toctree::
     :maxdepth: 1
     :caption: Nuvoton
     :glob:
 
-    target/nuvoton/**
+    nuvoton/**
 
 --------------
 
diff --git a/docs/platform/ext/target/lairdconnectivity/bl5340_dvk_cpuapp/README.rst b/docs/platform/lairdconnectivity/bl5340_dvk_cpuapp/README.rst
similarity index 100%
rename from docs/platform/ext/target/lairdconnectivity/bl5340_dvk_cpuapp/README.rst
rename to docs/platform/lairdconnectivity/bl5340_dvk_cpuapp/README.rst
diff --git a/docs/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/README.rst b/docs/platform/nordic_nrf/nrf5340dk_nrf5340_cpuapp/README.rst
similarity index 100%
rename from docs/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/README.rst
rename to docs/platform/nordic_nrf/nrf5340dk_nrf5340_cpuapp/README.rst
diff --git a/docs/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/README.rst b/docs/platform/nordic_nrf/nrf9160dk_nrf9160/README.rst
similarity index 100%
rename from docs/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/README.rst
rename to docs/platform/nordic_nrf/nrf9160dk_nrf9160/README.rst
diff --git a/docs/platform/ext/target/nuvoton/m2351/README.rst b/docs/platform/nuvoton/m2351/README.rst
similarity index 100%
rename from docs/platform/ext/target/nuvoton/m2351/README.rst
rename to docs/platform/nuvoton/m2351/README.rst
diff --git a/docs/platform/ext/target/nuvoton/m2354/README.rst b/docs/platform/nuvoton/m2354/README.rst
similarity index 100%
rename from docs/platform/ext/target/nuvoton/m2354/README.rst
rename to docs/platform/nuvoton/m2354/README.rst
diff --git a/docs/platform/ext/target/nxp/lpcxpresso55s69/README.rst b/docs/platform/nxp/lpcxpresso55s69/README.rst
similarity index 100%
rename from docs/platform/ext/target/nxp/lpcxpresso55s69/README.rst
rename to docs/platform/nxp/lpcxpresso55s69/README.rst
diff --git a/docs/platform/ext/platform_introduction.rst b/docs/platform/platform_introduction.rst
similarity index 95%
rename from docs/platform/ext/platform_introduction.rst
rename to docs/platform/platform_introduction.rst
index b6fecda..1e215e9 100644
--- a/docs/platform/ext/platform_introduction.rst
+++ b/docs/platform/platform_introduction.rst
@@ -60,11 +60,11 @@
 
     - Secure Enclave system:
 
-        - :doc:`Musca-B1 Secure Enclave. </platform/ext/target/arm/musca_b1/secure_enclave/readme>`
+        - :doc:`Musca-B1 Secure Enclave. </platform/arm/musca_b1/secure_enclave/readme>`
 
     - Runtime Security Subsystem (RSS):
 
-        - :doc:`RSS. </platform/ext/target/arm/rss/readme>`
+        - :doc:`RSS. </platform/arm/rss/readme>`
 
 The document :doc:`Platform Deprecation and Removal </integration_guide/platform/platform_deprecation>`
 lists the deprecated platforms, removed from the upstream.
diff --git a/docs/platform/ext/target/stm/b_u585i_iot02a/readme.rst b/docs/platform/stm/b_u585i_iot02a/readme.rst
similarity index 100%
rename from docs/platform/ext/target/stm/b_u585i_iot02a/readme.rst
rename to docs/platform/stm/b_u585i_iot02a/readme.rst
diff --git a/docs/platform/ext/target/stm/common/stm32l5xx/readme.rst b/docs/platform/stm/common/stm32l5xx/readme.rst
similarity index 100%
rename from docs/platform/ext/target/stm/common/stm32l5xx/readme.rst
rename to docs/platform/stm/common/stm32l5xx/readme.rst
diff --git a/docs/platform/ext/target/stm/common/stm32u5xx/readme.rst b/docs/platform/stm/common/stm32u5xx/readme.rst
similarity index 100%
rename from docs/platform/ext/target/stm/common/stm32u5xx/readme.rst
rename to docs/platform/stm/common/stm32u5xx/readme.rst
diff --git a/docs/platform/ext/target/stm/index.rst b/docs/platform/stm/index.rst
similarity index 100%
rename from docs/platform/ext/target/stm/index.rst
rename to docs/platform/stm/index.rst
diff --git a/docs/platform/ext/target/stm/nucleo_l552ze_q/readme.rst b/docs/platform/stm/nucleo_l552ze_q/readme.rst
similarity index 100%
rename from docs/platform/ext/target/stm/nucleo_l552ze_q/readme.rst
rename to docs/platform/stm/nucleo_l552ze_q/readme.rst
diff --git a/docs/platform/ext/target/stm/stm32l562e_dk/readme.rst b/docs/platform/stm/stm32l562e_dk/readme.rst
similarity index 100%
rename from docs/platform/ext/target/stm/stm32l562e_dk/readme.rst
rename to docs/platform/stm/stm32l562e_dk/readme.rst
diff --git a/docs/releases/1.3.0.rst b/docs/releases/1.3.0.rst
index 5b73b6c..752343d 100644
--- a/docs/releases/1.3.0.rst
+++ b/docs/releases/1.3.0.rst
@@ -50,7 +50,7 @@
 
   - Secure Enclave system:
 
-    - :doc:`Musca-B1 Secure Enclave. </platform/ext/target/arm/musca_b1/secure_enclave/readme>`
+    - :doc:`Musca-B1 Secure Enclave. </platform/arm/musca_b1/secure_enclave/readme>`
 
 Deprecated platforms
 ====================
diff --git a/docs/releases/1.5.0.rst b/docs/releases/1.5.0.rst
index f53c955..06580b9 100644
--- a/docs/releases/1.5.0.rst
+++ b/docs/releases/1.5.0.rst
@@ -41,11 +41,11 @@
 New platforms supported
 =======================
 
-  - :doc:`Corstone-1000 </platform/ext/target/arm/corstone1000/readme>`
+  - :doc:`Corstone-1000 </platform/arm/corstone1000/readme>`
 
-  - :doc:`Corstone-Polaris </platform/ext/target/arm/mps3/corstone310_fvp/README>`
+  - :doc:`Corstone-Polaris </platform/arm/mps3/corstone310_fvp/README>`
 
-  - :doc:`B-U585I-IOT02A </platform/ext/target/stm/b_u585i_iot02a/readme>`
+  - :doc:`B-U585I-IOT02A </platform/stm/b_u585i_iot02a/readme>`
 
 Deprecated platforms
 ====================
diff --git a/docs/releases/1.6.0.rst b/docs/releases/1.6.0.rst
index 9bd8e2a..305e253 100644
--- a/docs/releases/1.6.0.rst
+++ b/docs/releases/1.6.0.rst
@@ -35,7 +35,7 @@
 New platforms supported
 =======================
 
-  - :doc:`AN552. </platform/ext/target/arm/mps3/an552/README>`
+  - :doc:`AN552. </platform/arm/mps3/an552/README>`
 
 Deprecated platforms
 ====================