diff --git a/boards/beagleplay/02-quick-start.rst b/boards/beagleplay/02-quick-start.rst
index ed0fc66a9db6d0c91e53b3abe6bb1d58c92e9935..b8fc2ead8f9f051f61b81489fdb277c323664ea9 100644
--- a/boards/beagleplay/02-quick-start.rst
+++ b/boards/beagleplay/02-quick-start.rst
@@ -55,110 +55,8 @@ to browse documents and start programming your BeaglePlay!
BeaglePlay VSCode IDE (192.168.7.2:3000)
-.. raw:: latex
-
- \begin{comment}
-
-.. _beagleplay-demos-and-tutorials:
-
-.. dropdown:: **Demos & Tutorials**
- :margin: 4 4 2 2
- :open:
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-connect-wifi
- :link-type: ref
-
- **01. Connect WiFi**
- ^^^
-
- Connect to wifi using wpa_gui & wpa_cli tools.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-serial-console
- :link-type: ref
-
- **02. Using serial console**
- ^^^
-
- Use USB-UART adaptor to access boot console.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-mikrobus
- :link-type: ref
-
- **03. Using mikroBUS**
- ^^^
-
- Use mikroBUS interface for expansion.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-qwiic
- :link-type: ref
-
- **04. Using qwiic interface**
- ^^^
-
- Use qwiic I2C interface to connect 1000s of qwiic enabled boards.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-grove
- :link-type: ref
-
- **05. Using grove modules**
- ^^^
-
- Learn to use grove modules.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-csi
- :link-type: ref
-
- **06. Using CSI interface**
- ^^^
-
- Connect and use cameras via CSI interface.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-oldi
- :link-type: ref
-
- **07. Using oldi**
- ^^^
-
- Learn to use oldi display interface.
-
- .. card::
- :margin: 4 4 2 2
- :link: beagleplay-zephyr-development
- :link-type: ref
-
- **08. Zephyr Development**
- ^^^
-
- Setup zephyr development environment.
-
-.. raw:: latex
-
- \end{comment}
-
-.. toctree::
- :maxdepth: 1
- :hidden:
-
- demos-and-tutorials/connect-wifi
- demos-and-tutorials/using-serial-console
- demos-and-tutorials/using-mikrobus
- demos-and-tutorials/using-qwiic
- demos-and-tutorials/using-grove
- demos-and-tutorials/using-csi
- demos-and-tutorials/using-oldi
- demos-and-tutorials/zephyr-cc1352-development
+.. tip::
+ Next few chapters are all about the beagleplay hardware design, specifications, connectors, pinouts, and expansion.
+ If you just want to start experimenting with the board without focusing on the technical details, there are various
+ demos and tutorials available for you to try out in :ref:`beagleplay-demos-and-tutorials` chapter.
\ No newline at end of file
diff --git a/boards/beagleplay/03-design-and-specifications.rst b/boards/beagleplay/03-design-and-specifications.rst
index 12739f49cd02d99fbcec98467c40a1923a63c6c4..811df5fd473d878366b686a7ea49fa20b2acb686 100644
--- a/boards/beagleplay/03-design-and-specifications.rst
+++ b/boards/beagleplay/03-design-and-specifications.rst
@@ -64,3 +64,146 @@ JTAG pads
Serial debug port
******************
+.. _beagleplay-detailed-hardware-design:
+
+Detailed hardware design
+*************************
+
+
+
+Power supply
+**************
+
+.. figure:: images/hardware-design/dcdc-pmic.jpg
+ :alt: DCDC & PMIC
+
+ DCDC & PMIC
+
+.. figure:: images/hardware-design/soc-power.jpg
+ :alt: SoC Power
+
+ SoC Power
+
+.. figure:: images/hardware-design/soc-dcaps.jpg
+ :alt: SoC DCAPs
+
+ SoC DCAPs
+
+eMMC & microSD
+**************
+
+.. figure:: images/hardware-design/emmc-microsd.jpg
+ :alt: eMMC & microSD
+
+ eMMC & microSD
+
+Ethernet
+*********
+
+.. figure:: images/hardware-design/gigabit-ethernet.jpg
+ :alt: Gigabit Ethernet
+
+ Gigabit Ethernet
+
+.. figure:: images/hardware-design/single-pair-ethernet.jpg
+ :alt: Single-pair Ethernet
+
+ Single-pair Ethernet
+
+HDMI
+*****
+
+.. figure:: images/hardware-design/hdmi.jpg
+ :alt: HDMI
+
+ HDMI
+
+USB-A & USB-C
+**************
+
+.. figure:: images/hardware-design/uab-a-and-usb-c.jpg
+ :alt: USB-A & USB-C
+
+OLDI & CSI
+***********
+
+.. figure:: images/hardware-design/oldi-and-csi.jpg
+ :alt: OLDI & CSI
+
+ OLDI & CSI
+
+RTC, ID, and Debug
+******************
+
+.. figure:: images/hardware-design/rtc-id-debug.jpg
+ :alt: RTC, ID, and Debug
+
+DDR4 & SoC DDR controller
+**************************
+
+.. figure:: images/hardware-design/ddr4-soc-ddr.jpg
+ :alt: DDR4 & SoC DDR controller
+
+ DDR4 & SoC DDR controller
+
+CC1352P7
+*********
+
+.. figure:: images/hardware-design/cc1352p7.jpg
+ :alt: CC1352P7 wireless MCU
+
+ CC1352P7 wireless MCU
+
+WiFi 2.4G/5G
+*************
+
+.. figure:: images/hardware-design/wifi.jpg
+ :alt: WiFi 2.4G/5G
+
+ WiFi 2.4G/5G
+
+Buttons & LEDs
+***************
+
+.. figure:: images/hardware-design/buttons-and-leds.jpg
+ :alt: Buttons & LEDs
+
+ Buttons & LEDs
+
+Expansion connector & ADC
+**************************
+
+.. figure:: images/hardware-design/expansion-and-adc.jpg
+ :alt: Expansion connectors & ADC
+
+ Expansion connectors & ADC
+
+
+.. _beagleplay-mechanical-specifications:
+
+Mechanical Specifications
+##########################
+
+Dimensions & weight
+*******************
+
+.. table:: Dimensions & weight
+
+ +--------------------+----------------------------------------------------+
+ | Parameter | Value |
+ +====================+====================================================+
+ | Size | 82.5x80x20mm |
+ +--------------------+----------------------------------------------------+
+ | Max heigh | 20mm |
+ +--------------------+----------------------------------------------------+
+ | PCB Size | 80x80mm |
+ +--------------------+----------------------------------------------------+
+ | PCB Layers | 8 layers |
+ +--------------------+----------------------------------------------------+
+ | PCB Thickness | 1.6mm |
+ +--------------------+----------------------------------------------------+
+ | RoHS compliant | Yes |
+ +--------------------+----------------------------------------------------+
+ | Weight | 55.3g |
+ +--------------------+----------------------------------------------------+
+
diff --git a/boards/beagleplay/08-expansion.rst b/boards/beagleplay/04-connectors-and-pinouts.rst
similarity index 62%
rename from boards/beagleplay/08-expansion.rst
rename to boards/beagleplay/04-connectors-and-pinouts.rst
index 3a3b88d90d295101ba02958ab78258875a164176..f322d5fa70912086b45803b794982ce9fb600cce 100644
--- a/boards/beagleplay/08-expansion.rst
+++ b/boards/beagleplay/04-connectors-and-pinouts.rst
@@ -1,3 +1,21 @@
+.. _beagleplay-connectors-and-pinouts:
+
+Connectors & Pinouts
+#####################
+
+mikroBUS
+*********
+
+Grove
+******
+
+microSD
+********
+
+QWIIC
+******
+
+
.. _beagleplay-expansion:
Expansion
diff --git a/boards/beagleplay/05-demos-and-tutorials.rst b/boards/beagleplay/05-demos-and-tutorials.rst
new file mode 100644
index 0000000000000000000000000000000000000000..84799ed88a7a5c21902b01b7c54a7893ea2bd71b
--- /dev/null
+++ b/boards/beagleplay/05-demos-and-tutorials.rst
@@ -0,0 +1,109 @@
+.. _beagleplay-demos-and-tutorials:
+
+Demos and Tutorials
+####################
+
+.. raw:: latex
+
+ \begin{comment}
+
+.. dropdown:: **Demos & Tutorials**
+ :margin: 4 4 2 2
+ :open:
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-connect-wifi
+ :link-type: ref
+
+ **01. Connect WiFi**
+ ^^^
+
+ Connect to wifi using wpa_gui & wpa_cli tools.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-serial-console
+ :link-type: ref
+
+ **02. Using serial console**
+ ^^^
+
+ Use USB-UART adaptor to access boot console.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-mikrobus
+ :link-type: ref
+
+ **03. Using mikroBUS**
+ ^^^
+
+ Use mikroBUS interface for expansion.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-qwiic
+ :link-type: ref
+
+ **04. Using qwiic interface**
+ ^^^
+
+ Use qwiic I2C interface to connect 1000s of qwiic enabled boards.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-grove
+ :link-type: ref
+
+ **05. Using grove modules**
+ ^^^
+
+ Learn to use grove modules.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-csi
+ :link-type: ref
+
+ **06. Using CSI interface**
+ ^^^
+
+ Connect and use cameras via CSI interface.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-oldi
+ :link-type: ref
+
+ **07. Using oldi**
+ ^^^
+
+ Learn to use oldi display interface.
+
+ .. card::
+ :margin: 4 4 2 2
+ :link: beagleplay-zephyr-development
+ :link-type: ref
+
+ **08. Zephyr Development**
+ ^^^
+
+ Setup zephyr development environment.
+
+.. raw:: latex
+
+ \end{comment}
+
+.. toctree::
+ :maxdepth: 1
+ :hidden:
+
+ demos-and-tutorials/connect-wifi
+ demos-and-tutorials/using-serial-console
+ demos-and-tutorials/using-mikrobus
+ demos-and-tutorials/using-qwiic
+ demos-and-tutorials/using-grove
+ demos-and-tutorials/using-csi
+ demos-and-tutorials/using-oldi
+ demos-and-tutorials/zephyr-cc1352-development
\ No newline at end of file
diff --git a/boards/beagleplay/06-detailed-hardware-design.rst b/boards/beagleplay/06-detailed-hardware-design.rst
deleted file mode 100644
index 61527f989e3b29a156e38350ac51a424c51dc86a..0000000000000000000000000000000000000000
--- a/boards/beagleplay/06-detailed-hardware-design.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-.. _beagleplay-detailed-hardware-design:
-
-Detailed hardware design
-#########################
-
-
-
-Power supply
-**************
-
-.. figure:: images/hardware-design/dcdc-pmic.jpg
- :alt: DCDC & PMIC
-
- DCDC & PMIC
-
-.. figure:: images/hardware-design/soc-power.jpg
- :alt: SoC Power
-
- SoC Power
-
-.. figure:: images/hardware-design/soc-dcaps.jpg
- :alt: SoC DCAPs
-
- SoC DCAPs
-
-eMMC & microSD
-**************
-
-.. figure:: images/hardware-design/emmc-microsd.jpg
- :alt: eMMC & microSD
-
- eMMC & microSD
-
-Ethernet
-*********
-
-.. figure:: images/hardware-design/gigabit-ethernet.jpg
- :alt: Gigabit Ethernet
-
- Gigabit Ethernet
-
-.. figure:: images/hardware-design/single-pair-ethernet.jpg
- :alt: Single-pair Ethernet
-
- Single-pair Ethernet
-
-HDMI
-*****
-
-.. figure:: images/hardware-design/hdmi.jpg
- :alt: HDMI
-
- HDMI
-
-USB-A & USB-C
-**************
-
-.. figure:: images/hardware-design/uab-a-and-usb-c.jpg
- :alt: USB-A & USB-C
-
-OLDI & CSI
-***********
-
-.. figure:: images/hardware-design/oldi-and-csi.jpg
- :alt: OLDI & CSI
-
- OLDI & CSI
-
-RTC, ID, and Debug
-******************
-
-.. figure:: images/hardware-design/rtc-id-debug.jpg
- :alt: RTC, ID, and Debug
-
-DDR4 & SoC DDR controller
-**************************
-
-.. figure:: images/hardware-design/ddr4-soc-ddr.jpg
- :alt: DDR4 & SoC DDR controller
-
- DDR4 & SoC DDR controller
-
-CC1352P7
-*********
-
-.. figure:: images/hardware-design/cc1352p7.jpg
- :alt: CC1352P7 wireless MCU
-
- CC1352P7 wireless MCU
-
-WiFi 2.4G/5G
-*************
-
-.. figure:: images/hardware-design/wifi.jpg
- :alt: WiFi 2.4G/5G
-
- WiFi 2.4G/5G
-
-Buttons & LEDs
-***************
-
-.. figure:: images/hardware-design/buttons-and-leds.jpg
- :alt: Buttons & LEDs
-
- Buttons & LEDs
-
-Expansion connector & ADC
-**************************
-
-.. figure:: images/hardware-design/expansion-and-adc.jpg
- :alt: Expansion connectors & ADC
-
- Expansion connectors & ADC
-
diff --git a/boards/beagleplay/10-support-documents.rst b/boards/beagleplay/06-support-documents.rst
similarity index 100%
rename from boards/beagleplay/10-support-documents.rst
rename to boards/beagleplay/06-support-documents.rst
diff --git a/boards/beagleplay/07-connectors-and-pinouts.rst b/boards/beagleplay/07-connectors-and-pinouts.rst
deleted file mode 100644
index de02b216760998853c6f17513bfd937a47e006a1..0000000000000000000000000000000000000000
--- a/boards/beagleplay/07-connectors-and-pinouts.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. _beagleplay-connectors-and-pinouts:
-
-Connectors & Pinouts
-#####################
-
-mikroBUS
-*********
-
-Grove
-******
-
-microSD
-********
-
-QWIIC
-******
\ No newline at end of file
diff --git a/boards/beagleplay/11-mechanical-specifications.rst b/boards/beagleplay/11-mechanical-specifications.rst
deleted file mode 100644
index a585f173324875350e1d0029f2d298e166f0c0e6..0000000000000000000000000000000000000000
--- a/boards/beagleplay/11-mechanical-specifications.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-.. _beagleplay-mechanical-specifications:
-
-Mechanical Specifications
-##########################
-
-Dimensions & weight
-*******************
-
-.. table:: Dimensions & weight
-
- +--------------------+----------------------------------------------------+
- | Parameter | Value |
- +====================+====================================================+
- | Size | 82.5x80x20mm |
- +--------------------+----------------------------------------------------+
- | Max heigh | 20mm |
- +--------------------+----------------------------------------------------+
- | PCB Size | 80x80mm |
- +--------------------+----------------------------------------------------+
- | PCB Layers | 8 layers |
- +--------------------+----------------------------------------------------+
- | PCB Thickness | 1.6mm |
- +--------------------+----------------------------------------------------+
- | RoHS compliant | Yes |
- +--------------------+----------------------------------------------------+
- | Weight | 55.3g |
- +--------------------+----------------------------------------------------+
-
-Additional Pictures
-###################
-
-.. image:: images/45back.png
- :align: center
- :width: 700
- :alt: BeaglePlay back image (45 degree rotated)
-
-.. image:: images/45front.png
- :align: center
- :width: 700
- :alt: BeaglePlay front image (45 degree rotated)
diff --git a/boards/beagleplay/12-additional-pictures.rst b/boards/beagleplay/12-additional-pictures.rst
deleted file mode 100644
index 1dbc1db60136de5ca241a1392e88cafc47977a0e..0000000000000000000000000000000000000000
--- a/boards/beagleplay/12-additional-pictures.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _beagleplay-additional-pictures:
-
-Additional Pictures
-###################
-
-.. image:: images/45back.png
- :align: center
- :width: 700
- :alt: BeaglePlay back image (45 degree rotated)
-
-.. image:: images/45front.png
- :align: center
- :width: 700
- :alt: BeaglePlay front image (45 degree rotated)
\ No newline at end of file
diff --git a/boards/beagleplay/images/chapter-thumbnails/07-connectors-and-pinouts.jpg b/boards/beagleplay/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
similarity index 100%
rename from boards/beagleplay/images/chapter-thumbnails/07-connectors-and-pinouts.jpg
rename to boards/beagleplay/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
diff --git a/boards/beagleplay/images/chapter-thumbnails/09-demos-and-tutorials.jpg b/boards/beagleplay/images/chapter-thumbnails/05-demos-and-tutorials.jpg
similarity index 100%
rename from boards/beagleplay/images/chapter-thumbnails/09-demos-and-tutorials.jpg
rename to boards/beagleplay/images/chapter-thumbnails/05-demos-and-tutorials.jpg
diff --git a/boards/beagleplay/images/chapter-thumbnails/06-detailed-hardware-design.jpg b/boards/beagleplay/images/chapter-thumbnails/06-detailed-hardware-design.jpg
deleted file mode 100644
index f9f228f56f53830d37ad62cfd5a47f127625dda9..0000000000000000000000000000000000000000
Binary files a/boards/beagleplay/images/chapter-thumbnails/06-detailed-hardware-design.jpg and /dev/null differ
diff --git a/boards/beagleplay/images/chapter-thumbnails/10-support-documents.jpg b/boards/beagleplay/images/chapter-thumbnails/06-support-documents.jpg
similarity index 100%
rename from boards/beagleplay/images/chapter-thumbnails/10-support-documents.jpg
rename to boards/beagleplay/images/chapter-thumbnails/06-support-documents.jpg
diff --git a/boards/beagleplay/images/chapter-thumbnails/08-expansion.jpg b/boards/beagleplay/images/chapter-thumbnails/08-expansion.jpg
deleted file mode 100644
index f1ccbd334b4e296bc7eb56eeeefd1bb1cdf4594e..0000000000000000000000000000000000000000
Binary files a/boards/beagleplay/images/chapter-thumbnails/08-expansion.jpg and /dev/null differ
diff --git a/boards/beagleplay/images/chapter-thumbnails/11-mechanical-specifications.jpg b/boards/beagleplay/images/chapter-thumbnails/11-mechanical-specifications.jpg
deleted file mode 100644
index 215df637417dbdd2899b5d715e9e5176f6153807..0000000000000000000000000000000000000000
Binary files a/boards/beagleplay/images/chapter-thumbnails/11-mechanical-specifications.jpg and /dev/null differ
diff --git a/boards/beagleplay/images/chapter-thumbnails/12-additional-pictures.jpg b/boards/beagleplay/images/chapter-thumbnails/12-additional-pictures.jpg
deleted file mode 100644
index 05bee40bd5991acad352f990426c6c5f7ace5c0e..0000000000000000000000000000000000000000
Binary files a/boards/beagleplay/images/chapter-thumbnails/12-additional-pictures.jpg and /dev/null differ
diff --git a/boards/beagleplay/index.rst b/boards/beagleplay/index.rst
index cf2772efe54095a1e38cfd74bfc4059d71368ac6..3a4eb812c3b770c204a3dcd16cca75d0b1e07844 100644
--- a/boards/beagleplay/index.rst
+++ b/boards/beagleplay/index.rst
@@ -40,7 +40,8 @@ BeaglePlay
+++
- Introduction to BeaglePlay board.
+ Introduction to BeaglePlay board with information on each component
+ location on both front and back of the board.
.. grid-item-card::
:link: beagleplay-quick-start
@@ -55,7 +56,8 @@ BeaglePlay
+++
- Getting started guide.
+ Getting started guide to enable you to start building your projects
+ in no time.
.. grid-item-card::
:link: beagleplay-design-and-specifications
@@ -70,97 +72,56 @@ BeaglePlay
+++
- High level specifications.
+ Hardware and Mechanical design and specifications of the BeaglePlay board
+ for those who want to know their board inside out.
.. grid-item-card::
- :link: beagleplay-detailed-hardware-design
+ :link: beagleplay-connectors-pinouts-extensions
:link-type: ref
- **06. Detailed hardware design**
+ **04. Connectors and pinouts**
^^^
- .. image:: images/chapter-thumbnails/06-detailed-hardware-design.jpg
+ .. image:: images/chapter-thumbnails/04-connectors-and-pinouts.jpg
:align: center
- :alt: BeaglePlay Chapter06 thumbnail
+ :alt: BeaglePlay Chapter04 thumbnail
+++
- Detailed hardware design.
+ Connectors and pinout diagrams with expansion details so that you can
+ easily debug your connections and crate custom expansion hardware.
.. grid-item-card::
- :link: beagleplay-connectors-and-pinouts
+ :link: beagleplay-demos-and-tutorials
:link-type: ref
- **07. Connectors & Pinouts**
+ **05. Demos and tutorials**
^^^
- .. image:: images/chapter-thumbnails/07-connectors-and-pinouts.jpg
+ .. image:: images/chapter-thumbnails/05-demos-and-tutorials.jpg
:align: center
:alt: BeaglePlay Chapter07 thumbnail
+++
- Connectors pinout diagrams and more.
-
- .. grid-item-card::
- :link: beagleplay-expansion
- :link-type: ref
-
- **08. Expansion**
- ^^^
-
- .. image:: images/chapter-thumbnails/08-expansion.jpg
- :align: center
- :alt: BeaglePlay Chapter08 thumbnail
-
- +++
-
- BeaglePlay board expansion interface
+ Demos and tutorials for easy testing capabilities of the available
+ hardware elements of the board.
.. grid-item-card::
:link: beagleplay-support-documents
:link-type: ref
- **10. Support**
+ **06. Support documents**
^^^
- .. image:: images/chapter-thumbnails/10-support-documents.jpg
+ .. image:: images/chapter-thumbnails/06-support-documents.jpg
:align: center
:alt: BeaglePlay Chapter10 thumbnail
+++
- User support document for easy development.
-
- .. grid-item-card::
- :link: beagleplay-mechanical-specifications
- :link-type: ref
-
- **11. Mechanical Specifications**
- ^^^
-
- .. image:: images/chapter-thumbnails/11-mechanical-specifications.jpg
- :align: center
- :alt: BeaglePlay Chapter11 thumbnail
-
- +++
-
- Mechanical dimensions.
-
- .. grid-item-card::
- :link: beagleplay-additional-pictures
- :link-type: ref
-
- **12. Additional Pictures**
- ^^^
-
- .. image:: images/chapter-thumbnails/12-additional-pictures.jpg
- :align: center
- :alt: BeaglePlay Chapter12 thumbnail
-
- +++
-
- BeaglePlay Additional Pictures
+ User support documents with hardware & software repositories and
+ information what might be missing in the docs.
.. raw:: latex
@@ -173,12 +134,6 @@ BeaglePlay
01-introduction
02-quick-start
03-design-and-specifications.rst
- 04-detailed-overview
- 05-high-level-specifications
- 06-detailed-hardware-design
- 07-connectors-and-pinouts
- 08-expansion
- 10-support-documents
- 11-mechanical-specifications
- 12-additional-pictures
-
+ 04-connectors-and-pinouts
+ 05-demos-and-tutorials
+ 06-support-documents