diff --git a/accessories/cables.rst b/accessories/cables.rst
index db2adbe1060a583af31d2c860400487303342355..4e646df8290159b19cf8ee681f56b5fbe7d95aeb 100644
--- a/accessories/cables.rst
+++ b/accessories/cables.rst
@@ -225,6 +225,8 @@ microHDMI to VGA
 
 `Cable Matters Micro HDMI to VGA Adapter <https://www.amazon.com/Cable-Matters-Active-Female-Adapter/dp/B00879EZJI/ref=sr_1_2?ie=UTF8&qid=1381610066&sr=8-2&keywords=micro-hdmi+to+vga>`_
 
+.. _accessories-cables_minidp_hdmi:
+
 miniDP to HDMI 
 ****************
 
diff --git a/boards/beaglebone/ai-64/01-introduction.rst b/boards/beaglebone/ai-64/01-introduction.rst
index 20c730710cea43b8dc6fbaca3c280f8b63e35948..5fd66f4ece011c43522f089039db0e4640d582c3 100644
--- a/boards/beaglebone/ai-64/01-introduction.rst
+++ b/boards/beaglebone/ai-64/01-introduction.rst
@@ -23,7 +23,7 @@ their own board or add their own circuitry.
    :widths: auto
 
    +----------------------------------------------------+---------------------------------------------------------+
-   | .. image:: media/front.*                           | .. image:: media/back.*                                 |
+   | .. image:: images/front.*                          | .. image:: images/back.*                                |
    |    :width: 700                                     |       :width: 700                                       |
    |    :align: center                                  |       :align: center                                    |
    |    :alt: BeagleBone AI-64 front                    |       :alt: BeagleBone AI-64 back                       |
@@ -155,7 +155,7 @@ This section describes the key components on the board, their location and funct
 
    .. group-tab:: Front components location
 
-    .. figure:: media/components/front.*
+    .. figure:: images/components/front.*
         :width: 1240
         :align: center
         :alt: BeagleBone AI-64 board front components location
@@ -198,7 +198,7 @@ This section describes the key components on the board, their location and funct
 
    .. group-tab:: Back components location
 
-    .. figure:: media/components/back.*
+    .. figure:: images/components/back.*
         :width: 1240
         :align: center
         :alt: BeagleBone AI-64 board back components location
diff --git a/boards/beaglebone/ai-64/02-quick-start.rst b/boards/beaglebone/ai-64/02-quick-start.rst
index 08a6a5eabb7db4204bfaa2a722129d74a3754d98..2f2929f480e93c606d82ea45f1d7016e6d4bc0fd 100644
--- a/boards/beaglebone/ai-64/02-quick-start.rst
+++ b/boards/beaglebone/ai-64/02-quick-start.rst
@@ -11,7 +11,7 @@ Recommended adapters can be found at :ref:`accessories-power-supplies` section.
 
 .. _BeagleBone AI-64 connections ports:
 
-.. figure:: media/ch03/ports.*
+.. figure:: images/ch03/ports.*
    :width: 740px
    :align: center 
    
@@ -32,7 +32,7 @@ a developer experience where the board can be used immediately with no other equ
 
 .. _bbai-64-pacakage:
 
-.. figure:: media/ch03/bbai64-in-box.*
+.. figure:: images/ch03/bbai64-in-box.*
    :width: 740px
    :align: center 
    
@@ -71,7 +71,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       In this configuration, the board is powered by the PC via a single USB cable. The board is accessed either as a USB storage drive or via the browser on the connected PC. You need to use either Firefox or Chrome on the PC, Internet Explorer will not work properly. 
 
-      .. figure:: media/ch03/usb-tethering.*
+      .. figure:: images/ch03/usb-tethering.*
          :width: 740px
          :align: center 
          
@@ -87,7 +87,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       1. Connect the type C USB cable to the board as shown in the figure below. The connector is on the top side of the board near barrel jack.
 
-      .. figure:: media/ch03/usb-c-connection.*
+      .. figure:: images/ch03/usb-c-connection.*
          :width: 740px
          :align: center 
          
@@ -95,7 +95,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       2.  Connect the USB-A end of the cable to your PC or laptop USB port as shown in the figure below.
 
-      .. figure:: media/ch03/usb-a-connection.*
+      .. figure:: images/ch03/usb-a-connection.*
          :width: 740px
          :align: center 
          
@@ -103,7 +103,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       3.  The board will power on and the power LED will be on as shown in the figure below.
 
-      .. figure:: media/ch03/power-led.*
+      .. figure:: images/ch03/power-led.*
          :width: 740px
          :align: center 
          
@@ -111,7 +111,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       4. When the board starts to the booting process started by the process of applying power, the LEDs will come on in sequence as shown in the figure below. It will take a few seconds for the status LEDs to come on, so be patient. The LEDs will be flashing in an erratic manner as it begins to boot the Linux kernel.
 
-      .. figure:: media/ch03/led-pattern.*
+      .. figure:: images/ch03/led-pattern.*
          :width: 740px
          :align: center 
          
@@ -130,7 +130,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       In this configuration, the board works more like a PC, totally free from any connection to a PC as shown in the figure below. It allows you to create your code to make the board do whatever you need it to do. It will however require certain common PC accessories. These accessories and instructions are described in the following section.
 
-      .. figure:: media/ch03/desktop-configuration.*
+      .. figure:: images/ch03/desktop-configuration.*
          :width: 740px
          :align: center 
          
@@ -153,7 +153,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       1. Connect the miniDP to DP or active miniDP to HDMI cable from your BeagleBone AI-64 to your monitor.
 
-      .. figure:: media/ch03/monitor-cable.*
+      .. figure:: images/ch03/monitor-cable.*
          :width: 740px
          :align: center 
          
@@ -161,7 +161,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       2. If you have an Display Port or HDMI monitor with HDMI-HDMI or DP-DP cable you can use adapters as shown in the figure below.
 
-      .. figure:: media/ch03/display-adapters.*
+      .. figure:: images/ch03/display-adapters.*
          :width: 740px
          :align: center 
          
@@ -169,7 +169,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       3. If you have wired/wireless USB keyboard and mouse such as seen in the figure below, you need to plug the receiver in the USB host port of the board as shown in the figure below.
 
-      .. figure:: media/ch03/mouse-keyboard.*
+      .. figure:: images/ch03/mouse-keyboard.*
          :width: 740px
          :align: center 
          
@@ -181,7 +181,7 @@ Each of these configurations is discussed in general terms in the following sect
       Connect the Ethernet Cable to the Ethernet port as shown in the figure below. Any 
       standard 100M Ethernet cable should work.
 
-      .. figure:: media/ch03/ethernet-cable.*
+      .. figure:: images/ch03/ethernet-cable.*
          :width: 740px
          :align: center 
          
@@ -190,7 +190,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       5. The final step is to plug in the DC power supply to the DC power jack as shown in the figure below.
 
-      .. figure:: media/ch03/barrel-jack.*
+      .. figure:: images/ch03/barrel-jack.*
          :width: 740px
          :align: center 
          
@@ -198,7 +198,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       6. The cable needed to connect to your display is a miniDP-DP or active miniDP-HDMI. Connect the miniDP connector end to the board at this time. The connector is on the top side of the board as shown in the figure below.
 
-      .. figure:: media/ch03/miniDP-connector.*
+      .. figure:: images/ch03/miniDP-connector.*
          :width: 740px
          :align: center 
          
@@ -210,7 +210,7 @@ Each of these configurations is discussed in general terms in the following sect
 
       As soon as the power is applied to the board, it will start the booting up process. When the board starts to boot the LEDs will come on. It will take a few seconds for the status LEDs to come on, so be patient. The LEDs will be flashing in an erratic manner as it boots the Linux kernel.
 
-      .. figure:: media/ch03/leds.*
+      .. figure:: images/ch03/leds.*
          :width: 740px
          :align: center 
          
@@ -232,7 +232,7 @@ Each of these configurations is discussed in general terms in the following sect
          c. After a minute or two the desktop will appear. It should be similar to the one shown in the figure below. HOWEVER, it will change from one release to the next, so do not expect your system to look exactly like the one in the figure, but it will be very similar.
          d. And at this point you are ready to go! The figure below shows the desktop after booting.
 
-      .. figure:: media/ch03/xfce-desktop.*
+      .. figure:: images/ch03/xfce-desktop.*
          :width: 740px
          :align: center 
          
diff --git a/boards/beaglebone/ai-64/03-design-and-specifications.rst b/boards/beaglebone/ai-64/03-design-and-specifications.rst
index 79cac43cd52dc335a23308b610cdb29267c37456..c7ab43bc65068dcf9c042d8787e60c2c36c9cd4a 100644
--- a/boards/beaglebone/ai-64/03-design-and-specifications.rst
+++ b/boards/beaglebone/ai-64/03-design-and-specifications.rst
@@ -15,7 +15,7 @@ diagram of BeagleBone AI-64 board surrounding TDA4VM SoC.
 
 .. _BeagleBone_AI-64-block-diagram:
 
-.. figure:: media/hardware-design/ai-64-block-diagram.*
+.. figure:: images/hardware-design/ai-64-block-diagram.*
    :width: 1040
    :align: center
    :alt: BeagleBone AI-64 key components
@@ -41,7 +41,7 @@ remaining of this section device, SoC, and processor will be used interchangeabl
 
 .. _soc-block-diagram:
 
-.. figure:: media/hardware-design/soc-block-diagram.*
+.. figure:: images/hardware-design/soc-block-diagram.*
   :width: 1040
   :align: center
   :alt: System on Chip (SoC) block diagram
@@ -203,21 +203,21 @@ A switch is provided to allow switching between the modes.
     
    Pressing the RESET button on the board will NOT result in a change of the boot mode. You MUST remove power and reapply power to change the boot mode. The boot pins are sampled during power on reset from the PMIC to the processor.The reset button on the board is a warm reset only and will not force a boot mode change.
 
-.. figure:: media/hardware-design/boot-config.*
+.. figure:: images/hardware-design/boot-config.*
   :width: 1040
   :align: center
   :alt: Boot config
 
   Boot config
 
-.. figure:: media/hardware-design/mcu-bootmode.*
+.. figure:: images/hardware-design/mcu-bootmode.*
   :width: 1040
   :align: center
   :alt: MCU Bootmode
 
   MCU Bootmode
 
-.. figure:: media/hardware-design/sys-bootmode.*
+.. figure:: images/hardware-design/sys-bootmode.*
   :width: 1040
   :align: center
   :alt: SYS Bootmode
@@ -275,7 +275,7 @@ high output voltage accuracy. The SS/TR pin allows setting the start-up time or
 output voltage to an external source. This feature allows external sequencing of different supply rails
 and limiting the inrush current during start-up.
 
-.. figure:: media/hardware-design/1v1-3a-ddr-buck.*
+.. figure:: images/hardware-design/1v1-3a-ddr-buck.*
   :width: 1040
   :align: center
   :alt: 1V1 @ 1A DDR power supply
@@ -293,14 +293,14 @@ for powering many different types of processors and ASICs. The enable input and
 allow easy sequencing with external regulators. This complete flexibility allows a solution to be configured
 that meets the sequencing requirements of FPGAs, DSPs, and other applications with special start-up requirements.
 
-.. figure:: media/hardware-design/1v1-usb3-ethernet-ldo.*
+.. figure:: images/hardware-design/1v1-usb3-ethernet-ldo.*
   :width: 1040
   :align: center
   :alt: 1V1 USB3 & Ethernet power supply
 
   1V1 USB3 & Ethernet power supply 
 
-.. figure:: media/hardware-design/2v5-ethernet-ldo.*
+.. figure:: images/hardware-design/2v5-ethernet-ldo.*
   :width: 1040
   :align: center
   :alt: 2V5 Ethernet power supply
@@ -320,7 +320,7 @@ The LM5141 has a high voltage bias regulator with automatic switch-over to an ex
 the IQ current from VIN. Additional features include frequency synchronization, cycle-by-cycle current
 limit, hiccup mode fault protection for sustained overload, and power good output.
 
-.. figure:: media/hardware-design/3v3-power-supply.*
+.. figure:: images/hardware-design/3v3-power-supply.*
   :width: 1040
   :align: center
   :alt: 3V3 power supply
@@ -338,7 +338,7 @@ TPS65941213 and TPS65941111 as PMIC-A and PMIC-B respectively as shown in AI-64
 TPS65941213 (PMIC-A)
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: media/hardware-design/pmic-a.*
+.. figure:: images/hardware-design/pmic-a.*
   :width: 1040
   :align: center
   :alt: PMIC A
@@ -348,7 +348,7 @@ TPS65941213 (PMIC-A)
 TPS65941111 (PMIC-B)
 ~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: media/hardware-design/pmic-b.*
+.. figure:: images/hardware-design/pmic-b.*
   :width: 1040
   :align: center
   :alt: PMIC B
@@ -369,7 +369,7 @@ the load with minimal hold-up capacitance. Current limiting is used during start
 to protect against overcurrent events, and also protects the device during normal operation. The
 output current limit can be adjusted with a single external resistor.
 
-.. figure:: media/hardware-design/power-mux.*
+.. figure:: images/hardware-design/power-mux.*
   :width: 1040
   :align: center
   :alt: Power mux
@@ -386,7 +386,7 @@ to 5.7 V and can support a maximum continuous current of 6 A. The switch is cont
 off input (ON), which is capable of interfacing directly with low-voltage control signals. In the TPS22965, a
 225-Ω on-chip load resistor is added for quick output discharge when switch is turned off
 
-.. figure:: media/hardware-design/3v3-load-switch.*
+.. figure:: images/hardware-design/3v3-load-switch.*
   :width: 1040
   :align: center
   :alt: 3V3 load switch
@@ -401,21 +401,21 @@ General connectivity and expansion
 USB type C
 ----------
 
-.. figure:: media/hardware-design/type-c.*
+.. figure:: images/hardware-design/type-c.*
   :width: 720 
   :align: center
   :alt: USB type c
 
   USB type c 
 
-.. figure:: media/hardware-design/type-c-cc-logic.*
+.. figure:: images/hardware-design/type-c-cc-logic.*
   :width: 940
   :align: center
   :alt: USB type c CC logic
 
   USB type c CC logic
 
-.. figure:: media/hardware-design/type-c-signals.*
+.. figure:: images/hardware-design/type-c-signals.*
   :width: 1040
   :align: center
   :alt: USB type c signals
@@ -429,21 +429,21 @@ On the board is a stacked dual USB 3.0 Type A female connector with full LS/FS/H
 The ports can provide power on/off control and up to 1.5A of current at 5V. Under USB
 power, the board will not be able to supply the full 1.5A.
 
-.. figure:: media/hardware-design/dual-usb3-ports.*
+.. figure:: images/hardware-design/dual-usb3-ports.*
   :width: 1040
   :align: center
   :alt: Dual USB3 ports
 
   Dual USB3 ports
 
-.. figure:: media/hardware-design/usb3-hub.*
+.. figure:: images/hardware-design/usb3-hub.*
   :width: 1040
   :align: center
   :alt: USB3 hub
 
   USB3 hub
 
-.. figure:: media/hardware-design/usb3-hub-oc-protection.*
+.. figure:: images/hardware-design/usb3-hub-oc-protection.*
   :width: 1040
   :align: center
   :alt: USB3 hub over-current protection
@@ -456,7 +456,7 @@ Cape headers
 P8 cape header
 ~~~~~~~~~~~~~~
 
-.. figure:: media/hardware-design/p8-cape-header.*
+.. figure:: images/hardware-design/p8-cape-header.*
   :width: 1040
   :align: center
   :alt: P8 cape header
@@ -466,7 +466,7 @@ P8 cape header
 P9 cape header
 ~~~~~~~~~~~~~~
 
-.. figure:: media/hardware-design/p9-cape-header.*
+.. figure:: images/hardware-design/p9-cape-header.*
   :width: 1040
   :align: center
   :alt: P9 cape header
@@ -476,7 +476,7 @@ P9 cape header
 Double pins (shorted)
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: media/hardware-design/cape-header-double-pins.*
+.. figure:: images/hardware-design/cape-header-double-pins.*
   :width: 1040
   :align: center
   :alt: P8 & P9 cape header pins that uses two pins of SoC
@@ -486,7 +486,7 @@ Double pins (shorted)
 Fan header
 ----------
 
-.. figure:: media/hardware-design/fan-header.*
+.. figure:: images/hardware-design/fan-header.*
   :width: 1040
   :align: center
   :alt: Fan header
@@ -506,7 +506,7 @@ cards. The microSD card is not provided with the board. Booting from
 MMC0 will be used to flash the eMMC in the production environment or can
 be used by the user to update the SW as needed.
 
-.. figure:: media/hardware-design/microsd-card.*
+.. figure:: images/hardware-design/microsd-card.*
   :width: 1040
   :align: center
   :alt: MicroSD card slot
@@ -516,7 +516,7 @@ be used by the user to update the SW as needed.
 MikroBus port
 --------------
 
-.. figure:: media/hardware-design/mikrobus-port.*
+.. figure:: images/hardware-design/mikrobus-port.*
   :width: 940
   :align: center
   :alt: MikroBus port
@@ -526,14 +526,14 @@ MikroBus port
 PCIe Key E
 ----------
 
-.. figure:: media/hardware-design/pcie-key-e.*
+.. figure:: images/hardware-design/pcie-key-e.*
   :width: 1040
   :align: center
   :alt: PCIE Key E connector
 
   PCIE Key E connector
 
-.. figure:: media/hardware-design/pcie-vlt-4ch.*
+.. figure:: images/hardware-design/pcie-vlt-4ch.*
   :width: 740
   :align: center
   :alt: PCIE Key E voltage translator (4ch)
@@ -541,7 +541,7 @@ PCIe Key E
   PCIE Key E voltage translator (4ch)
 
 
-.. figure:: media/hardware-design/pcie-vlt-8ch.*
+.. figure:: images/hardware-design/pcie-vlt-8ch.*
   :width: 740
   :align: center
   :alt: PCIE Key E voltage translator (8ch)
@@ -559,7 +559,7 @@ Reset & Power Button
 1. **Reset button:** When pressed and released, causes a reset of the board.
 2. **Power button:** This button takes advantage of the input to the PMIC for power down features.
 
-.. figure:: media/hardware-design/reset-power-buttons.*
+.. figure:: images/hardware-design/reset-power-buttons.*
   :width: 1040
   :align: center
   :alt: Reset & power button
@@ -569,7 +569,7 @@ Reset & Power Button
 Boot button
 -----------
 
-.. figure:: media/hardware-design/boot-button.*
+.. figure:: images/hardware-design/boot-button.*
   :width: 540
   :align: center
   :alt: Boot button
@@ -586,7 +586,7 @@ There are a total of six green LEDs on the board.
 * One green power LED indicates that power is applied and the power management IC is up.
 * Five blue LEDs that can be controlled via the SW by setting GPIO pins.
 
-.. figure:: media/hardware-design/leds.*
+.. figure:: images/hardware-design/leds.*
   :width: 540
   :align: center
   :alt: LED indicators
@@ -596,14 +596,14 @@ There are a total of six green LEDs on the board.
 Gigabit Ethernet
 ================
 
-.. figure:: media/hardware-design/gb-ethernet.*
+.. figure:: images/hardware-design/gb-ethernet.*
   :width: 1040
   :align: center
   :alt: Gigabit ethernet
 
   Gigabit ethernet
 
-.. figure:: media/hardware-design/gb-ethernet-connector.*
+.. figure:: images/hardware-design/gb-ethernet-connector.*
   :width: 540
   :align: center
   :alt: Gigabit ethernet connector
@@ -634,7 +634,7 @@ used by the Ethernet port. This does not interfere with SD card
 operation but it does make it unsuitable for use as an eMMC port if the
 8 bit feature is needed.
 
-.. figure:: media/hardware-design/16gb-emmc.*
+.. figure:: images/hardware-design/16gb-emmc.*
   :width: 1040
   :align: center
   :alt: 16GB eMMC storage
@@ -650,7 +650,7 @@ A single (1024M x 16bits x 2channels) LPDDR4 4Gb memory device is used. The memo
 
 * Kingston Q3222PM1WDGTK-U
 
-.. figure:: media/hardware-design/lpddr4.*
+.. figure:: images/hardware-design/lpddr4.*
   :width: 1040
   :align: center
   :alt: 4GB LPDDR4 RAM
@@ -664,7 +664,7 @@ A single (1024M x 16bits x 2channels) LPDDR4 4Gb memory device is used. The memo
 
 A single 4Kb EEPROM (24FC04HT-I/OT) is provided on I2C0 that holds the board information. This information includes board name, serial number, and revision information.
 
-.. figure:: media/hardware-design/board-id-eeprom.*
+.. figure:: images/hardware-design/board-id-eeprom.*
   :width: 1040
   :align: center
   :alt: Board ID EEPROM
@@ -676,28 +676,28 @@ A single 4Kb EEPROM (24FC04HT-I/OT) is provided on I2C0 that holds the board inf
 Multimedia I/O
 ===============
 
-.. figure:: media/hardware-design/csi0.*
+.. figure:: images/hardware-design/csi0.*
   :width: 740
   :align: center
   :alt: CSI0 MIPI camera0 input
 
   CSI0 MIPI camera0 input
 
-.. figure:: media/hardware-design/csi1.*
+.. figure:: images/hardware-design/csi1.*
   :width: 740
   :align: center
   :alt: CSI1 MIPI camera1 input
 
   CSI1 MIPI camera1 input
 
-.. figure:: media/hardware-design/dsi.*
+.. figure:: images/hardware-design/dsi.*
   :width: 740
   :align: center
   :alt:  DSI MIPI display output
 
   DSI MIPI display output
 
-.. figure:: media/hardware-design/mini-display-port.*
+.. figure:: images/hardware-design/mini-display-port.*
   :width: 1040
   :align: center
   :alt: Mini display port output
@@ -723,14 +723,14 @@ Two serial debug ports are provided on board via 3pin micro headers,
       is required with a 6 pin USB to TTL adapter. The header is compatible with the one provided by FTDI and can be purchased for about 
       $12 to $20 from various sources. Signals supported are TX and RX. None of the handshake signals are supported.
 
-.. figure:: media/hardware-design/wkup-uart0-debug-port.*
+.. figure:: images/hardware-design/wkup-uart0-debug-port.*
   :width: 740
   :align: center
   :alt: WKUP UART0 debug port
 
   WKUP UART0 debug port
 
-.. figure:: media/hardware-design/uart0-debug-port.*
+.. figure:: images/hardware-design/uart0-debug-port.*
   :width: 740
   :align: center
   :alt: UART0 debug port
@@ -741,7 +741,7 @@ Two serial debug ports are provided on board via 3pin micro headers,
 TagConnect
 -----------
 
-.. figure:: media/hardware-design/tag-connect.*
+.. figure:: images/hardware-design/tag-connect.*
   :width: 540
   :align: center
   :alt: TagConnect JTAG debug port
@@ -777,7 +777,7 @@ Dimensions & Weight
 Board Dimensions
 -----------------
 
-.. figure:: media/hardware-design/board-dimensions.*
+.. figure:: images/hardware-design/board-dimensions.*
     :width: 700
     :align: center
     :alt: BeagleBone AI-64 board dimensions
@@ -794,7 +794,7 @@ PCB silkscreen
    +----------------------------------------------------+----------------------------------------------------------------+
    | Top silkscreen                                     | Bottom silkscreen                                              |
    +====================================================+================================================================+
-   | .. image:: media/hardware-design/top-silkscreen.*  | .. image:: media/hardware-design/bottom-silkscreen.*           |
+   | .. image:: images/hardware-design/top-silkscreen.* | .. image:: images/hardware-design/bottom-silkscreen.*          |
    |    :width: 700                                     |       :width: 700                                              |
    |    :align: center                                  |       :align: center                                           |
    |    :alt: BeagleBone AI-64 top silkscreen           |       :alt: BeagleBone AI-64 bottom silkscreen                 |
diff --git a/boards/beaglebone/ai-64/04-expansion.rst b/boards/beaglebone/ai-64/04-expansion.rst
index 58b95b45e96c9b443a57346600d94a4556e0fb8c..81feebfb3e116767505e08a7870d45c00a06c9e9 100644
--- a/boards/beaglebone/ai-64/04-expansion.rst
+++ b/boards/beaglebone/ai-64/04-expansion.rst
@@ -16,7 +16,7 @@ using P8 / P9 cape header choose respective pinout diagram tab below.
 
    .. group-tab:: P8 cape header
 
-        .. figure:: media/pinout/BeagleBone-AI-64-P8.*
+        .. figure:: images/pinout/BeagleBone-AI-64-P8.*
             :align: center
             :alt: BeagleBone AI-64 P8 cape header pinout
 
@@ -25,7 +25,7 @@ using P8 / P9 cape header choose respective pinout diagram tab below.
 
    .. group-tab:: P9 cape header
 
-        .. figure:: media/pinout/BeagleBone-AI-64-P9.*
+        .. figure:: images/pinout/BeagleBone-AI-64-P9.*
             :align: center
             :alt: BeagleBone AI-64 P9 cape header pinout
 
@@ -1515,7 +1515,7 @@ can be used with your BeagleBone AI-64 also like shown in :ref:`bbai64-cape-plac
 
 .. _bbai64-cape-placement-figure:
 
-.. figure:: media/ch08/cape-placement.*
+.. figure:: images/ch08/cape-placement.*
    :width: 1040
    :align: center 
    :alt: BeagleBone AI-64 cape placement
@@ -1584,7 +1584,7 @@ below is the design of the EEPROM circuit.
 
 .. _expansion-board-eeprom-without-write-protect-figure:
 
-.. figure:: media/ch08/eeprom.*
+.. figure:: images/ch08/eeprom.*
    :width: 740
    :align: center 
    
@@ -1670,7 +1670,7 @@ discretion of the cape designer.
 
 .. _expansion-board-eeprom-with-write-protect-figure:
 
-.. figure:: media/ch08/eeprom-write-protect.*
+.. figure:: images/ch08/eeprom-write-protect.*
    :width: 740
    :align: center 
    
@@ -1798,7 +1798,7 @@ the connector. These are dual row 23 position 2.54mm x 2.54mm connectors.
 
 .. _single-expansion-connector-figure:
 
-.. figure:: media/ch08/single-expansion-connector.*
+.. figure:: images/ch08/single-expansion-connector.*
    :width: 740
    :align: center 
    
@@ -1811,7 +1811,7 @@ single row 23 pin headers for each of the dual row headers.
 
 .. _single-cape-expansion-connector-figure:
 
-.. figure:: media/ch08/proto.*
+.. figure:: images/ch08/proto.*
    :width: 740
    :align: center 
    
@@ -1874,7 +1874,7 @@ connector. These are dual row 23 position 2.54mm x 2.54mm connectors.
 
 .. _expansion-connector-figure:
 
-.. figure:: media/ch08/expansion-connector.*
+.. figure:: images/ch08/expansion-connector.*
    :width: 740
    :align: center
    :alt: Expansion Connector
@@ -1888,7 +1888,7 @@ connector configuration for the connector.
 
 .. _stacked-cape-expansion-connector-figure:
 
-.. figure:: media/ch08/can-cape.*
+.. figure:: images/ch08/can-cape.*
    :width: 740
    :align: center 
    :alt: Stacked cape expansion connector
@@ -1955,7 +1955,7 @@ nonstacking style connectors.
 
 .. _stacked-with-signal-stealing-expansion-connector-figure:
 
-.. figure:: media/ch08/stealing-expansion-connector.*
+.. figure:: images/ch08/stealing-expansion-connector.*
    :width: 740
    :align: center 
    
@@ -1990,7 +1990,7 @@ overhang.
 
 .. _connector-pin-insertion-depth:
 
-.. figure:: media/ch08/berg-stip-insertion.*
+.. figure:: images/ch08/berg-stip-insertion.*
    :width: 400px
    :align: center 
    :alt: Connector Pin Insertion Depth
@@ -2141,7 +2141,7 @@ Standard Cape Size
 
 .. _cape-board-dimensions-figure:
 
-.. figure:: media/ch08/cape-dimension.*
+.. figure:: images/ch08/cape-dimension.*
    :width: 740
    :align: center 
    :alt: Cape board dimensions
diff --git a/boards/beaglebone/ai-64/06-support.rst b/boards/beaglebone/ai-64/06-support.rst
index fedc09fc6bdcd93af5f4a0b2cd8727f728badcb0..eb0a07e3dd970d8ef61dfae9d4ad15e8733be694 100644
--- a/boards/beaglebone/ai-64/06-support.rst
+++ b/boards/beaglebone/ai-64/06-support.rst
@@ -27,7 +27,7 @@ Follow instructions below to download the latest image for your BeagleBone AI-64
 
 .. _filter-software-distribution-AI-64:
 
-.. figure:: media/ch11/distros.*
+.. figure:: images/ch11/distros.*
    :align: center
    :alt: Filter Software Distributions for BeagleBone AI-64 
 
@@ -59,7 +59,8 @@ Troubleshooting video output issues
 
 .. warning:: 
 
-   When connecting to an HDMI monitor, make sure your miniDP adapter is *active*. A *passive* adapter will not work. See :ref:`display-adapters-figure`.
+   When connecting to an HDMI monitor, make sure your miniDP adapter is *active*. A *passive* adapter will not work. 
+   See :ref:`accessories-cables_minidp_hdmi` accessories section for tested cables list.
 
 
 .. _getting-help:
@@ -146,21 +147,21 @@ Weight: 192gm
 Silkscreen and Component Locations
 =====================================
 
-.. figure:: media/hardware-design/board-dimensions.*
+.. figure:: images/hardware-design/board-dimensions.*
    :width: 400px
    :align: center 
    :alt: Board Dimensions
    
    Board Dimensions
 
-.. figure:: media/hardware-design/top-silkscreen.*
+.. figure:: images/hardware-design/top-silkscreen.*
    :width: 400px
    :align: center 
    :alt: Top silkscreen
    
    Top silkscreen
 
-.. figure:: media/hardware-design/bottom-silkscreen.*
+.. figure:: images/hardware-design/bottom-silkscreen.*
    :width: 400px
    :align: center 
    :alt: Bottom silkscreen
@@ -173,49 +174,49 @@ Silkscreen and Component Locations
 Pictures
 ************
 
-.. figure:: media/ch10/front.*
+.. figure:: images/ch10/front.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 front
    
    BeagleBone AI-64 front
 
-.. figure:: media/ch10/back.*
+.. figure:: images/ch10/back.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 back
    
    BeagleBone AI-64 back
 
-.. figure:: media/ch10/back-heatsink.*
+.. figure:: images/ch10/back-heatsink.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 back with heatsink
    
    BeagleBone AI-64 back with heatsink
 
-.. figure:: media/bbai64-45-front.*
+.. figure:: images/bbai64-45-front.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 front at 45° angle
    
    BeagleBone AI-64 front at 45° angle
 
-.. figure:: media/ch10/45-back.*
+.. figure:: images/ch10/45-back.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 back at 45° angle
    
    BeagleBone AI-64 back at 45° angle
 
-.. figure:: media/ch10/45-back-heatsink.*
+.. figure:: images/ch10/45-back-heatsink.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 back with heatsink at 45° angle
    
    BeagleBone AI-64 back with heatsink at 45° angle
 
-.. figure:: media/ch10/feature.*
+.. figure:: images/ch10/feature.*
    :width: 400px
    :align: center 
    :alt: BeagleBone AI-64 ports
diff --git a/boards/beaglebone/ai-64/edge_ai_apps/docker_environment.rst b/boards/beaglebone/ai-64/edge_ai_apps/docker_environment.rst
index 549484999fcdee2825d33aad0073a22f23ebd12b..6aabeeb25cc9d806d851e59048f377cdb17cf421 100644
--- a/boards/beaglebone/ai-64/edge_ai_apps/docker_environment.rst
+++ b/boards/beaglebone/ai-64/edge_ai_apps/docker_environment.rst
@@ -202,14 +202,14 @@ current location is the desired location then exit this procedure.
 .. code-block:: json
 
   {
-    "graph": "/run/media/nvme0n1/docker_root",
+    "graph": "/run/images/nvme0n1/docker_root",
     "storage-driver": "overlay",
     "live-restore": true
   }
 
 In the configuration above, the key/value pair
-**'"graph": "/run/media/nvme0n1/docker_root"'** defines the root location
-**'/run/media/nvme0n1/docker_root'.**
+**'"graph": "/run/images/nvme0n1/docker_root"'** defines the root location
+**'/run/images/nvme0n1/docker_root'.**
 
 4. Once the daemon.json file has been copied and updated, run the following
    commands
diff --git a/boards/beaglebone/ai-64/edge_ai_apps/getting_started.rst b/boards/beaglebone/ai-64/edge_ai_apps/getting_started.rst
index db49042ea88c7adfe30c98c8433f0314c5812b1b..88c04be7b5b1a4cfd0e23f66838503b03ff582e0 100644
--- a/boards/beaglebone/ai-64/edge_ai_apps/getting_started.rst
+++ b/boards/beaglebone/ai-64/edge_ai_apps/getting_started.rst
@@ -84,7 +84,7 @@ Note that the headers have to be lifted up to connect the cameras
 .. note:: To be updated
     By default IMX219 is disabled. After connecting the camera you can enable it
     by specifying the dtb overlay file in
-    ``/run/media/mmcblk0p1/uenv.txt`` as below,
+    ``/run/images/mmcblk0p1/uenv.txt`` as below,
 
     ``name_overlays=k3-j721e-edgeai-apps.dtbo k3-j721e-sk-rpi-cam-imx219.dtbo``
 
diff --git a/boards/beaglebone/ai-64/media/45-back-heatsink.png b/boards/beaglebone/ai-64/images/45-back-heatsink.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/45-back-heatsink.png
rename to boards/beaglebone/ai-64/images/45-back-heatsink.png
diff --git a/boards/beaglebone/ai-64/media/45-back.png b/boards/beaglebone/ai-64/images/45-back.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/45-back.png
rename to boards/beaglebone/ai-64/images/45-back.png
diff --git a/boards/beaglebone/ai-64/media/45-front.png b/boards/beaglebone/ai-64/images/45-front.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/45-front.png
rename to boards/beaglebone/ai-64/images/45-front.png
diff --git a/boards/beaglebone/ai-64/media/Desktop-Configuration.png b/boards/beaglebone/ai-64/images/Desktop-Configuration.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/Desktop-Configuration.png
rename to boards/beaglebone/ai-64/images/Desktop-Configuration.png
diff --git a/boards/beaglebone/ai-64/media/LED-Pattern.png b/boards/beaglebone/ai-64/images/LED-Pattern.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/LED-Pattern.png
rename to boards/beaglebone/ai-64/images/LED-Pattern.png
diff --git a/boards/beaglebone/ai-64/media/OSHW_mark_US002120.svg b/boards/beaglebone/ai-64/images/OSHW_mark_US002120.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/OSHW_mark_US002120.svg
rename to boards/beaglebone/ai-64/images/OSHW_mark_US002120.svg
diff --git a/boards/beaglebone/ai-64/media/Power-LED.png b/boards/beaglebone/ai-64/images/Power-LED.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/Power-LED.png
rename to boards/beaglebone/ai-64/images/Power-LED.png
diff --git a/boards/beaglebone/ai-64/media/USB-Connection.png b/boards/beaglebone/ai-64/images/USB-Connection.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/USB-Connection.png
rename to boards/beaglebone/ai-64/images/USB-Connection.png
diff --git a/boards/beaglebone/ai-64/media/USB-Tethering.png b/boards/beaglebone/ai-64/images/USB-Tethering.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/USB-Tethering.png
rename to boards/beaglebone/ai-64/images/USB-Tethering.png
diff --git a/boards/beaglebone/ai-64/media/back-heatsink.png b/boards/beaglebone/ai-64/images/back-heatsink.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/back-heatsink.png
rename to boards/beaglebone/ai-64/images/back-heatsink.png
diff --git a/boards/beaglebone/ai-64/media/back.png b/boards/beaglebone/ai-64/images/back.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/back.png
rename to boards/beaglebone/ai-64/images/back.png
diff --git a/boards/beaglebone/ai-64/media/bbai64-45-front.jpg b/boards/beaglebone/ai-64/images/bbai64-45-front.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/bbai64-45-front.jpg
rename to boards/beaglebone/ai-64/images/bbai64-45-front.jpg
diff --git a/boards/beaglebone/ai-64/media/by-sa.png b/boards/beaglebone/ai-64/images/by-sa.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/by-sa.png
rename to boards/beaglebone/ai-64/images/by-sa.png
diff --git a/boards/beaglebone/ai-64/media/ch03/BBAI-64-to-monitor-cable.png b/boards/beaglebone/ai-64/images/ch03/BBAI-64-to-monitor-cable.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/BBAI-64-to-monitor-cable.png
rename to boards/beaglebone/ai-64/images/ch03/BBAI-64-to-monitor-cable.png
diff --git a/boards/beaglebone/ai-64/media/ch03/XFCE-Desktop.png b/boards/beaglebone/ai-64/images/ch03/XFCE-Desktop.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/XFCE-Desktop.png
rename to boards/beaglebone/ai-64/images/ch03/XFCE-Desktop.png
diff --git a/boards/beaglebone/ai-64/media/ch03/barrel-jack.jpg b/boards/beaglebone/ai-64/images/ch03/barrel-jack.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/barrel-jack.jpg
rename to boards/beaglebone/ai-64/images/ch03/barrel-jack.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/barrel-jack.png b/boards/beaglebone/ai-64/images/ch03/barrel-jack.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/barrel-jack.png
rename to boards/beaglebone/ai-64/images/ch03/barrel-jack.png
diff --git a/boards/beaglebone/ai-64/media/ch03/bbai64-in-box.jpg b/boards/beaglebone/ai-64/images/ch03/bbai64-in-box.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/bbai64-in-box.jpg
rename to boards/beaglebone/ai-64/images/ch03/bbai64-in-box.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/desktop-configuration.jpg b/boards/beaglebone/ai-64/images/ch03/desktop-configuration.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/desktop-configuration.jpg
rename to boards/beaglebone/ai-64/images/ch03/desktop-configuration.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/display-adapters.jpg b/boards/beaglebone/ai-64/images/ch03/display-adapters.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/display-adapters.jpg
rename to boards/beaglebone/ai-64/images/ch03/display-adapters.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/display-adapters.png b/boards/beaglebone/ai-64/images/ch03/display-adapters.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/display-adapters.png
rename to boards/beaglebone/ai-64/images/ch03/display-adapters.png
diff --git a/boards/beaglebone/ai-64/media/ch03/ethernet-cable.jpg b/boards/beaglebone/ai-64/images/ch03/ethernet-cable.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/ethernet-cable.jpg
rename to boards/beaglebone/ai-64/images/ch03/ethernet-cable.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/ethernet-cable.png b/boards/beaglebone/ai-64/images/ch03/ethernet-cable.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/ethernet-cable.png
rename to boards/beaglebone/ai-64/images/ch03/ethernet-cable.png
diff --git a/boards/beaglebone/ai-64/media/ch03/led-pattern.jpg b/boards/beaglebone/ai-64/images/ch03/led-pattern.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/led-pattern.jpg
rename to boards/beaglebone/ai-64/images/ch03/led-pattern.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/leds.jpg b/boards/beaglebone/ai-64/images/ch03/leds.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/leds.jpg
rename to boards/beaglebone/ai-64/images/ch03/leds.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/miniDP-connector.jpg b/boards/beaglebone/ai-64/images/ch03/miniDP-connector.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/miniDP-connector.jpg
rename to boards/beaglebone/ai-64/images/ch03/miniDP-connector.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/miniDP-connector.png b/boards/beaglebone/ai-64/images/ch03/miniDP-connector.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/miniDP-connector.png
rename to boards/beaglebone/ai-64/images/ch03/miniDP-connector.png
diff --git a/boards/beaglebone/ai-64/media/ch03/monitor-cable.jpg b/boards/beaglebone/ai-64/images/ch03/monitor-cable.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/monitor-cable.jpg
rename to boards/beaglebone/ai-64/images/ch03/monitor-cable.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/mouse-keyboard.jpg b/boards/beaglebone/ai-64/images/ch03/mouse-keyboard.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/mouse-keyboard.jpg
rename to boards/beaglebone/ai-64/images/ch03/mouse-keyboard.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/mouse-keyboard.png b/boards/beaglebone/ai-64/images/ch03/mouse-keyboard.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/mouse-keyboard.png
rename to boards/beaglebone/ai-64/images/ch03/mouse-keyboard.png
diff --git a/boards/beaglebone/ai-64/media/ch03/ports.jpg b/boards/beaglebone/ai-64/images/ch03/ports.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/ports.jpg
rename to boards/beaglebone/ai-64/images/ch03/ports.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/power-led.jpg b/boards/beaglebone/ai-64/images/ch03/power-led.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/power-led.jpg
rename to boards/beaglebone/ai-64/images/ch03/power-led.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/usb-a-connection.jpg b/boards/beaglebone/ai-64/images/ch03/usb-a-connection.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/usb-a-connection.jpg
rename to boards/beaglebone/ai-64/images/ch03/usb-a-connection.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/usb-c-connection.jpg b/boards/beaglebone/ai-64/images/ch03/usb-c-connection.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/usb-c-connection.jpg
rename to boards/beaglebone/ai-64/images/ch03/usb-c-connection.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/usb-tethering.jpg b/boards/beaglebone/ai-64/images/ch03/usb-tethering.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/usb-tethering.jpg
rename to boards/beaglebone/ai-64/images/ch03/usb-tethering.jpg
diff --git a/boards/beaglebone/ai-64/media/ch03/xfce-desktop.jpg b/boards/beaglebone/ai-64/images/ch03/xfce-desktop.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch03/xfce-desktop.jpg
rename to boards/beaglebone/ai-64/images/ch03/xfce-desktop.jpg
diff --git a/boards/beaglebone/ai-64/media/ch04/components.jpg b/boards/beaglebone/ai-64/images/ch04/components.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch04/components.jpg
rename to boards/beaglebone/ai-64/images/ch04/components.jpg
diff --git a/boards/beaglebone/ai-64/media/ch04/components.svg b/boards/beaglebone/ai-64/images/ch04/components.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch04/components.svg
rename to boards/beaglebone/ai-64/images/ch04/components.svg
diff --git a/boards/beaglebone/ai-64/media/ch04/components.webp b/boards/beaglebone/ai-64/images/ch04/components.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch04/components.webp
rename to boards/beaglebone/ai-64/images/ch04/components.webp
diff --git a/boards/beaglebone/ai-64/media/ch06/TPS6594-Q1.png b/boards/beaglebone/ai-64/images/ch06/TPS6594-Q1.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/TPS6594-Q1.png
rename to boards/beaglebone/ai-64/images/ch06/TPS6594-Q1.png
diff --git a/boards/beaglebone/ai-64/media/ch06/TPS6594-Q1.svg b/boards/beaglebone/ai-64/images/ch06/TPS6594-Q1.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/TPS6594-Q1.svg
rename to boards/beaglebone/ai-64/images/ch06/TPS6594-Q1.svg
diff --git a/boards/beaglebone/ai-64/media/ch06/pmic-a.png b/boards/beaglebone/ai-64/images/ch06/pmic-a.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/pmic-a.png
rename to boards/beaglebone/ai-64/images/ch06/pmic-a.png
diff --git a/boards/beaglebone/ai-64/media/ch06/pmic-a.svg b/boards/beaglebone/ai-64/images/ch06/pmic-a.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/pmic-a.svg
rename to boards/beaglebone/ai-64/images/ch06/pmic-a.svg
diff --git a/boards/beaglebone/ai-64/media/ch06/pmic-b.png b/boards/beaglebone/ai-64/images/ch06/pmic-b.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/pmic-b.png
rename to boards/beaglebone/ai-64/images/ch06/pmic-b.png
diff --git a/boards/beaglebone/ai-64/media/ch06/pmic-b.svg b/boards/beaglebone/ai-64/images/ch06/pmic-b.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/pmic-b.svg
rename to boards/beaglebone/ai-64/images/ch06/pmic-b.svg
diff --git a/boards/beaglebone/ai-64/media/ch06/power.png b/boards/beaglebone/ai-64/images/ch06/power.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/power.png
rename to boards/beaglebone/ai-64/images/ch06/power.png
diff --git a/boards/beaglebone/ai-64/media/ch06/power.svg b/boards/beaglebone/ai-64/images/ch06/power.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch06/power.svg
rename to boards/beaglebone/ai-64/images/ch06/power.svg
diff --git a/boards/beaglebone/ai-64/media/ch08/berg-stip-insertion.jpg b/boards/beaglebone/ai-64/images/ch08/berg-stip-insertion.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/berg-stip-insertion.jpg
rename to boards/beaglebone/ai-64/images/ch08/berg-stip-insertion.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/can-cape.jpg b/boards/beaglebone/ai-64/images/ch08/can-cape.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/can-cape.jpg
rename to boards/beaglebone/ai-64/images/ch08/can-cape.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/cape-dimension.jpg b/boards/beaglebone/ai-64/images/ch08/cape-dimension.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/cape-dimension.jpg
rename to boards/beaglebone/ai-64/images/ch08/cape-dimension.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/cape-placement.jpg b/boards/beaglebone/ai-64/images/ch08/cape-placement.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/cape-placement.jpg
rename to boards/beaglebone/ai-64/images/ch08/cape-placement.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/eeprom-write-protect.png b/boards/beaglebone/ai-64/images/ch08/eeprom-write-protect.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/eeprom-write-protect.png
rename to boards/beaglebone/ai-64/images/ch08/eeprom-write-protect.png
diff --git a/boards/beaglebone/ai-64/media/ch08/eeprom.png b/boards/beaglebone/ai-64/images/ch08/eeprom.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/eeprom.png
rename to boards/beaglebone/ai-64/images/ch08/eeprom.png
diff --git a/boards/beaglebone/ai-64/media/ch08/expansion-connector.jpg b/boards/beaglebone/ai-64/images/ch08/expansion-connector.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/expansion-connector.jpg
rename to boards/beaglebone/ai-64/images/ch08/expansion-connector.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/proto.jpg b/boards/beaglebone/ai-64/images/ch08/proto.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/proto.jpg
rename to boards/beaglebone/ai-64/images/ch08/proto.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/single-expansion-connector.jpg b/boards/beaglebone/ai-64/images/ch08/single-expansion-connector.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/single-expansion-connector.jpg
rename to boards/beaglebone/ai-64/images/ch08/single-expansion-connector.jpg
diff --git a/boards/beaglebone/ai-64/media/ch08/stealing-expansion-connector.jpg b/boards/beaglebone/ai-64/images/ch08/stealing-expansion-connector.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch08/stealing-expansion-connector.jpg
rename to boards/beaglebone/ai-64/images/ch08/stealing-expansion-connector.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/45-back-heatsink.jpg b/boards/beaglebone/ai-64/images/ch10/45-back-heatsink.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/45-back-heatsink.jpg
rename to boards/beaglebone/ai-64/images/ch10/45-back-heatsink.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/45-back.jpg b/boards/beaglebone/ai-64/images/ch10/45-back.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/45-back.jpg
rename to boards/beaglebone/ai-64/images/ch10/45-back.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/45-front-hires.jpg b/boards/beaglebone/ai-64/images/ch10/45-front-hires.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/45-front-hires.jpg
rename to boards/beaglebone/ai-64/images/ch10/45-front-hires.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/back-heatsink.jpg b/boards/beaglebone/ai-64/images/ch10/back-heatsink.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/back-heatsink.jpg
rename to boards/beaglebone/ai-64/images/ch10/back-heatsink.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/back.jpg b/boards/beaglebone/ai-64/images/ch10/back.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/back.jpg
rename to boards/beaglebone/ai-64/images/ch10/back.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/feature.jpg b/boards/beaglebone/ai-64/images/ch10/feature.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/feature.jpg
rename to boards/beaglebone/ai-64/images/ch10/feature.jpg
diff --git a/boards/beaglebone/ai-64/media/ch10/front.jpg b/boards/beaglebone/ai-64/images/ch10/front.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch10/front.jpg
rename to boards/beaglebone/ai-64/images/ch10/front.jpg
diff --git a/boards/beaglebone/ai-64/media/ch11/distros.png b/boards/beaglebone/ai-64/images/ch11/distros.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/ch11/distros.png
rename to boards/beaglebone/ai-64/images/ch11/distros.png
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/01-introduction.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/01-introduction.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/01-introduction.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/01-introduction.jpg
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/02-quick-start.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/02-quick-start.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/02-quick-start.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/02-quick-start.jpg
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/03-design-and-specifications.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/03-design-and-specifications.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/03-design-and-specifications.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/03-design-and-specifications.jpg
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/04-connectors-and-pinouts.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/04-connectors-and-pinouts.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/05-demos-and-tutorials.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/05-demos-and-tutorials.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/05-demos-and-tutorials.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/05-demos-and-tutorials.jpg
diff --git a/boards/beaglebone/ai-64/media/chapter-thumbnails/06-support.jpg b/boards/beaglebone/ai-64/images/chapter-thumbnails/06-support.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/chapter-thumbnails/06-support.jpg
rename to boards/beaglebone/ai-64/images/chapter-thumbnails/06-support.jpg
diff --git a/boards/beaglebone/ai-64/media/components/back.jpg b/boards/beaglebone/ai-64/images/components/back.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/back.jpg
rename to boards/beaglebone/ai-64/images/components/back.jpg
diff --git a/boards/beaglebone/ai-64/media/components/back.png b/boards/beaglebone/ai-64/images/components/back.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/back.png
rename to boards/beaglebone/ai-64/images/components/back.png
diff --git a/boards/beaglebone/ai-64/media/components/back.webp b/boards/beaglebone/ai-64/images/components/back.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/back.webp
rename to boards/beaglebone/ai-64/images/components/back.webp
diff --git a/boards/beaglebone/ai-64/media/components/front.jpg b/boards/beaglebone/ai-64/images/components/front.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/front.jpg
rename to boards/beaglebone/ai-64/images/components/front.jpg
diff --git a/boards/beaglebone/ai-64/media/components/front.png b/boards/beaglebone/ai-64/images/components/front.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/front.png
rename to boards/beaglebone/ai-64/images/components/front.png
diff --git a/boards/beaglebone/ai-64/media/components/front.webp b/boards/beaglebone/ai-64/images/components/front.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/components/front.webp
rename to boards/beaglebone/ai-64/images/components/front.webp
diff --git a/boards/beaglebone/ai-64/media/feature.png b/boards/beaglebone/ai-64/images/feature.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/feature.png
rename to boards/beaglebone/ai-64/images/feature.png
diff --git a/boards/beaglebone/ai-64/media/front.png b/boards/beaglebone/ai-64/images/front.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/front.png
rename to boards/beaglebone/ai-64/images/front.png
diff --git a/boards/beaglebone/ai-64/media/hardware-design/16gb-emmc.svg b/boards/beaglebone/ai-64/images/hardware-design/16gb-emmc.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/16gb-emmc.svg
rename to boards/beaglebone/ai-64/images/hardware-design/16gb-emmc.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/1v1-3a-ddr-buck.svg b/boards/beaglebone/ai-64/images/hardware-design/1v1-3a-ddr-buck.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/1v1-3a-ddr-buck.svg
rename to boards/beaglebone/ai-64/images/hardware-design/1v1-3a-ddr-buck.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/1v1-usb3-ethernet-ldo.svg b/boards/beaglebone/ai-64/images/hardware-design/1v1-usb3-ethernet-ldo.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/1v1-usb3-ethernet-ldo.svg
rename to boards/beaglebone/ai-64/images/hardware-design/1v1-usb3-ethernet-ldo.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/2v5-ethernet-ldo.svg b/boards/beaglebone/ai-64/images/hardware-design/2v5-ethernet-ldo.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/2v5-ethernet-ldo.svg
rename to boards/beaglebone/ai-64/images/hardware-design/2v5-ethernet-ldo.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/3v3-load-switch.svg b/boards/beaglebone/ai-64/images/hardware-design/3v3-load-switch.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/3v3-load-switch.svg
rename to boards/beaglebone/ai-64/images/hardware-design/3v3-load-switch.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/3v3-power-supply.svg b/boards/beaglebone/ai-64/images/hardware-design/3v3-power-supply.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/3v3-power-supply.svg
rename to boards/beaglebone/ai-64/images/hardware-design/3v3-power-supply.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/ai-64-block-diagram.png b/boards/beaglebone/ai-64/images/hardware-design/ai-64-block-diagram.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/ai-64-block-diagram.png
rename to boards/beaglebone/ai-64/images/hardware-design/ai-64-block-diagram.png
diff --git a/boards/beaglebone/ai-64/media/hardware-design/ai-64-block-diagram.svg b/boards/beaglebone/ai-64/images/hardware-design/ai-64-block-diagram.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/ai-64-block-diagram.svg
rename to boards/beaglebone/ai-64/images/hardware-design/ai-64-block-diagram.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/board-dimensions.jpg b/boards/beaglebone/ai-64/images/hardware-design/board-dimensions.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/board-dimensions.jpg
rename to boards/beaglebone/ai-64/images/hardware-design/board-dimensions.jpg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/board-dimensions.webp b/boards/beaglebone/ai-64/images/hardware-design/board-dimensions.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/board-dimensions.webp
rename to boards/beaglebone/ai-64/images/hardware-design/board-dimensions.webp
diff --git a/boards/beaglebone/ai-64/media/hardware-design/board-id-eeprom.svg b/boards/beaglebone/ai-64/images/hardware-design/board-id-eeprom.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/board-id-eeprom.svg
rename to boards/beaglebone/ai-64/images/hardware-design/board-id-eeprom.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/boot-button.svg b/boards/beaglebone/ai-64/images/hardware-design/boot-button.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/boot-button.svg
rename to boards/beaglebone/ai-64/images/hardware-design/boot-button.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/boot-config.svg b/boards/beaglebone/ai-64/images/hardware-design/boot-config.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/boot-config.svg
rename to boards/beaglebone/ai-64/images/hardware-design/boot-config.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/bottom-silkscreen.png b/boards/beaglebone/ai-64/images/hardware-design/bottom-silkscreen.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/bottom-silkscreen.png
rename to boards/beaglebone/ai-64/images/hardware-design/bottom-silkscreen.png
diff --git a/boards/beaglebone/ai-64/media/hardware-design/bottom-silkscreen.webp b/boards/beaglebone/ai-64/images/hardware-design/bottom-silkscreen.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/bottom-silkscreen.webp
rename to boards/beaglebone/ai-64/images/hardware-design/bottom-silkscreen.webp
diff --git a/boards/beaglebone/ai-64/media/hardware-design/cape-header-double-pins.svg b/boards/beaglebone/ai-64/images/hardware-design/cape-header-double-pins.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/cape-header-double-pins.svg
rename to boards/beaglebone/ai-64/images/hardware-design/cape-header-double-pins.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/csi0.svg b/boards/beaglebone/ai-64/images/hardware-design/csi0.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/csi0.svg
rename to boards/beaglebone/ai-64/images/hardware-design/csi0.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/csi1.svg b/boards/beaglebone/ai-64/images/hardware-design/csi1.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/csi1.svg
rename to boards/beaglebone/ai-64/images/hardware-design/csi1.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/dsi.svg b/boards/beaglebone/ai-64/images/hardware-design/dsi.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/dsi.svg
rename to boards/beaglebone/ai-64/images/hardware-design/dsi.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/dual-usb3-ports.svg b/boards/beaglebone/ai-64/images/hardware-design/dual-usb3-ports.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/dual-usb3-ports.svg
rename to boards/beaglebone/ai-64/images/hardware-design/dual-usb3-ports.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/fan-header.svg b/boards/beaglebone/ai-64/images/hardware-design/fan-header.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/fan-header.svg
rename to boards/beaglebone/ai-64/images/hardware-design/fan-header.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/gb-ethernet-connector.svg b/boards/beaglebone/ai-64/images/hardware-design/gb-ethernet-connector.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/gb-ethernet-connector.svg
rename to boards/beaglebone/ai-64/images/hardware-design/gb-ethernet-connector.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/gb-ethernet.svg b/boards/beaglebone/ai-64/images/hardware-design/gb-ethernet.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/gb-ethernet.svg
rename to boards/beaglebone/ai-64/images/hardware-design/gb-ethernet.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/leds.svg b/boards/beaglebone/ai-64/images/hardware-design/leds.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/leds.svg
rename to boards/beaglebone/ai-64/images/hardware-design/leds.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/lpddr4.svg b/boards/beaglebone/ai-64/images/hardware-design/lpddr4.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/lpddr4.svg
rename to boards/beaglebone/ai-64/images/hardware-design/lpddr4.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/mcu-bootmode.svg b/boards/beaglebone/ai-64/images/hardware-design/mcu-bootmode.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/mcu-bootmode.svg
rename to boards/beaglebone/ai-64/images/hardware-design/mcu-bootmode.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/microsd-card.svg b/boards/beaglebone/ai-64/images/hardware-design/microsd-card.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/microsd-card.svg
rename to boards/beaglebone/ai-64/images/hardware-design/microsd-card.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/mikrobus-port.svg b/boards/beaglebone/ai-64/images/hardware-design/mikrobus-port.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/mikrobus-port.svg
rename to boards/beaglebone/ai-64/images/hardware-design/mikrobus-port.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/mini-display-port.svg b/boards/beaglebone/ai-64/images/hardware-design/mini-display-port.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/mini-display-port.svg
rename to boards/beaglebone/ai-64/images/hardware-design/mini-display-port.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/p8-cape-header.svg b/boards/beaglebone/ai-64/images/hardware-design/p8-cape-header.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/p8-cape-header.svg
rename to boards/beaglebone/ai-64/images/hardware-design/p8-cape-header.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/p9-cape-header.svg b/boards/beaglebone/ai-64/images/hardware-design/p9-cape-header.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/p9-cape-header.svg
rename to boards/beaglebone/ai-64/images/hardware-design/p9-cape-header.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/pcie-key-e.svg b/boards/beaglebone/ai-64/images/hardware-design/pcie-key-e.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/pcie-key-e.svg
rename to boards/beaglebone/ai-64/images/hardware-design/pcie-key-e.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/pcie-vlt-4ch.svg b/boards/beaglebone/ai-64/images/hardware-design/pcie-vlt-4ch.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/pcie-vlt-4ch.svg
rename to boards/beaglebone/ai-64/images/hardware-design/pcie-vlt-4ch.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/pcie-vlt-8ch.svg b/boards/beaglebone/ai-64/images/hardware-design/pcie-vlt-8ch.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/pcie-vlt-8ch.svg
rename to boards/beaglebone/ai-64/images/hardware-design/pcie-vlt-8ch.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/pmic-a.svg b/boards/beaglebone/ai-64/images/hardware-design/pmic-a.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/pmic-a.svg
rename to boards/beaglebone/ai-64/images/hardware-design/pmic-a.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/pmic-b.svg b/boards/beaglebone/ai-64/images/hardware-design/pmic-b.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/pmic-b.svg
rename to boards/beaglebone/ai-64/images/hardware-design/pmic-b.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/power-mux.svg b/boards/beaglebone/ai-64/images/hardware-design/power-mux.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/power-mux.svg
rename to boards/beaglebone/ai-64/images/hardware-design/power-mux.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/reset-power-buttons.svg b/boards/beaglebone/ai-64/images/hardware-design/reset-power-buttons.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/reset-power-buttons.svg
rename to boards/beaglebone/ai-64/images/hardware-design/reset-power-buttons.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/soc-block-diagram.png b/boards/beaglebone/ai-64/images/hardware-design/soc-block-diagram.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/soc-block-diagram.png
rename to boards/beaglebone/ai-64/images/hardware-design/soc-block-diagram.png
diff --git a/boards/beaglebone/ai-64/media/hardware-design/soc-block-diagram.svg b/boards/beaglebone/ai-64/images/hardware-design/soc-block-diagram.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/soc-block-diagram.svg
rename to boards/beaglebone/ai-64/images/hardware-design/soc-block-diagram.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/sys-bootmode.svg b/boards/beaglebone/ai-64/images/hardware-design/sys-bootmode.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/sys-bootmode.svg
rename to boards/beaglebone/ai-64/images/hardware-design/sys-bootmode.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/tag-connect.svg b/boards/beaglebone/ai-64/images/hardware-design/tag-connect.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/tag-connect.svg
rename to boards/beaglebone/ai-64/images/hardware-design/tag-connect.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/top-silkscreen.png b/boards/beaglebone/ai-64/images/hardware-design/top-silkscreen.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/top-silkscreen.png
rename to boards/beaglebone/ai-64/images/hardware-design/top-silkscreen.png
diff --git a/boards/beaglebone/ai-64/media/hardware-design/top-silkscreen.webp b/boards/beaglebone/ai-64/images/hardware-design/top-silkscreen.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/top-silkscreen.webp
rename to boards/beaglebone/ai-64/images/hardware-design/top-silkscreen.webp
diff --git a/boards/beaglebone/ai-64/media/hardware-design/type-c-cc-logic.svg b/boards/beaglebone/ai-64/images/hardware-design/type-c-cc-logic.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/type-c-cc-logic.svg
rename to boards/beaglebone/ai-64/images/hardware-design/type-c-cc-logic.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/type-c-signals.svg b/boards/beaglebone/ai-64/images/hardware-design/type-c-signals.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/type-c-signals.svg
rename to boards/beaglebone/ai-64/images/hardware-design/type-c-signals.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/type-c.svg b/boards/beaglebone/ai-64/images/hardware-design/type-c.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/type-c.svg
rename to boards/beaglebone/ai-64/images/hardware-design/type-c.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/uart0-debug-port.svg b/boards/beaglebone/ai-64/images/hardware-design/uart0-debug-port.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/uart0-debug-port.svg
rename to boards/beaglebone/ai-64/images/hardware-design/uart0-debug-port.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/usb3-hub-oc-protection.svg b/boards/beaglebone/ai-64/images/hardware-design/usb3-hub-oc-protection.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/usb3-hub-oc-protection.svg
rename to boards/beaglebone/ai-64/images/hardware-design/usb3-hub-oc-protection.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/usb3-hub.svg b/boards/beaglebone/ai-64/images/hardware-design/usb3-hub.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/usb3-hub.svg
rename to boards/beaglebone/ai-64/images/hardware-design/usb3-hub.svg
diff --git a/boards/beaglebone/ai-64/media/hardware-design/wkup-uart0-debug-port.svg b/boards/beaglebone/ai-64/images/hardware-design/wkup-uart0-debug-port.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/hardware-design/wkup-uart0-debug-port.svg
rename to boards/beaglebone/ai-64/images/hardware-design/wkup-uart0-debug-port.svg
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.jpg b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.jpg
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.jpg
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.png b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.png
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.png
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.svg b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.svg
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.svg
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.webp b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P8.webp
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P8.webp
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.jpg b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.jpg
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.jpg
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.png b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.png
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.png
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.png
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.svg b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.svg
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.svg
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.svg
diff --git a/boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.webp b/boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.webp
similarity index 100%
rename from boards/beaglebone/ai-64/media/pinout/BeagleBone-AI-64-P9.webp
rename to boards/beaglebone/ai-64/images/pinout/BeagleBone-AI-64-P9.webp
diff --git a/boards/beaglebone/ai-64/index.rst b/boards/beaglebone/ai-64/index.rst
index 9d2291455d17171203d85f3ed9292fdc9013bba3..22a80bb9ace7936bd908003e1ec3a91b7b6bbffd 100644
--- a/boards/beaglebone/ai-64/index.rst
+++ b/boards/beaglebone/ai-64/index.rst
@@ -16,7 +16,7 @@ hardware examples and dozens of readily available embedded expansion options ava
     .. grid-item::
         :columns: 12 12 12 4
 
-        .. figure:: media/OSHW_mark_US002120.*
+        .. figure:: images/OSHW_mark_US002120.*
             :width: 200
             :target: https://certification.oshwa.org/us002120.html
             :alt: BeagleBone AI-64 OSHW Mark
@@ -32,7 +32,7 @@ hardware examples and dozens of readily available embedded expansion options ava
             * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
             * For export, emissions and other compliance, see :ref:`bbai64-support`
 
-.. image:: media/bbai64-45-front.jpg
+.. image:: images/bbai64-45-front.jpg
    :width: 740px
    :align: center
    :alt: BeagleBone AI-64 front at 45° angle
@@ -50,7 +50,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **1. Introduction**
         ^^^
 
-        .. image:: media/chapter-thumbnails/01-introduction.*
+        .. image:: images/chapter-thumbnails/01-introduction.*
             :align: center
             :alt: BeagleBone AI-64 Chapter01 thumbnail
         
@@ -66,7 +66,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **2. Quick start**
         ^^^
 
-        .. image:: media/chapter-thumbnails/02-quick-start.*
+        .. image:: images/chapter-thumbnails/02-quick-start.*
             :align: center
             :alt: BeagleBone AI-64 Chapter02 thumbnail
 
@@ -82,7 +82,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **3. Design & Specifications**
         ^^^
 
-        .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+        .. image:: images/chapter-thumbnails/03-design-and-specifications.*
             :align: center
             :alt: BeagleBone AI-64 Chapter03 thumbnail
 
@@ -98,7 +98,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **4. Expansion**
         ^^^
 
-        .. image:: media/chapter-thumbnails/04-connectors-and-pinouts.*
+        .. image:: images/chapter-thumbnails/04-connectors-and-pinouts.*
             :align: center
             :alt: BeagleBone AI-64 Chapter04 thumbnail
 
@@ -114,7 +114,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **5. Demos**
         ^^^
 
-        .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+        .. image:: images/chapter-thumbnails/05-demos-and-tutorials.*
             :align: center
             :alt: BeagleBone AI-64 Chapter5 thumbnail
 
@@ -129,7 +129,7 @@ hardware examples and dozens of readily available embedded expansion options ava
         **6. Support**
         ^^^
 
-        .. image:: media/chapter-thumbnails/06-support.*
+        .. image:: images/chapter-thumbnails/06-support.*
             :align: center
             :alt: BeagleBone AI-64 Chapter6 thumbnail
 
diff --git a/boards/beaglebone/ai-64/media/OSHW_mark_US002120.png b/boards/beaglebone/ai-64/media/OSHW_mark_US002120.png
deleted file mode 100644
index bbb83993d21819c5e394704b2dbe36d3822e2e85..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/ai-64/media/OSHW_mark_US002120.png and /dev/null differ
diff --git a/boards/beaglebone/ai-64/media/OSHW_mark_US002120.webp b/boards/beaglebone/ai-64/media/OSHW_mark_US002120.webp
deleted file mode 100644
index 6243e3b6582845ab806b9d5cb0eaa4175730105d..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/ai-64/media/OSHW_mark_US002120.webp and /dev/null differ
diff --git a/boards/beaglebone/ai/01-introduction.rst b/boards/beaglebone/ai/01-introduction.rst
index dbfcba64b59bba337859f3130c9276b6a5e5ceb7..a250710d5794c489a7063b86d60b7521b7cf4606 100644
--- a/boards/beaglebone/ai/01-introduction.rst
+++ b/boards/beaglebone/ai/01-introduction.rst
@@ -14,7 +14,7 @@ embedded-vision-engine (EVE) cores supported through an optimized TIDL
 machine learning OpenCL API with pre-installed tools. Focused on
 everyday automation in industrial, commercial and home applications.
 
-.. image:: media/BB_AI_BeautyAngle_800px.jpg
+.. image:: images/BB_AI_BeautyAngle_800px.jpg
    :align: center
    :alt: BeagleBone AI Beauty Angle
 
@@ -23,7 +23,7 @@ everyday automation in industrial, commercial and home applications.
 BeagleBone AI Overview
 ======================
 
-.. image:: media/BB_AI_overview_image.*
+.. image:: images/BB_AI_overview_image.*
    :align: center
    :alt: BeagleBone AI Overview
 
@@ -79,17 +79,17 @@ Out of Box Software
 Board Component Locations
 **************************
 
-.. image:: media/BB_AI_ICPlacement_800px.png
+.. image:: images/BB_AI_ICPlacement_800px.png
    :width: 740
    :align: center
    :alt: beaglebone ai component placement
 
-.. image:: media/BB_AI_Connectorplacement_800px.png
+.. image:: images/BB_AI_Connectorplacement_800px.png
     :width: 740
     :align: center
     :alt: Connector placement front
 
-.. image:: media/BB_AI_Connectorplacement_back_800px.png
+.. image:: images/BB_AI_Connectorplacement_back_800px.png
    :width: 740   
    :align: center
    :alt: Connector placement back
diff --git a/boards/beaglebone/ai/02-quick-start.rst b/boards/beaglebone/ai/02-quick-start.rst
index 9d04b779f50a7d5abd132f2248cbb23f47403694..9e22a88a276d908e0e6a42fc4d19cc8b310c8ae7 100644
--- a/boards/beaglebone/ai/02-quick-start.rst
+++ b/boards/beaglebone/ai/02-quick-start.rst
@@ -14,7 +14,7 @@ distribution. In the box you will find:
 -  `BeagleBone® AI <https://openbeagle.org/beagleboard/beaglebone-ai>`_
 -  Quick Start Guide
 
-.. image:: media/BB_AI_antenna_heat_sink_place_500px.jpg
+.. image:: images/BB_AI_antenna_heat_sink_place_500px.jpg
    :align: center
    :alt: BeagleBone AI Overview
 
@@ -89,21 +89,21 @@ all else fails, follow the instructions at :ref:`upgrade-beaglebone-ai-software`
 
       1.  Locate the USB Type-C connector on BeagleBone® AI 
 
-      .. image:: media/BB_AI_USBC_and_3pin_500px.png
+      .. image:: images/BB_AI_USBC_and_3pin_500px.png
          :width: 740
          :align: center
          :alt: USB connector and serial debug.
 
       1.  Connect a USB type-C cable to BeagleBone® AI USB type-C port.
 
-      .. image:: media/BB_AI_connectingUSBC_500px.jpg
+      .. image:: images/BB_AI_connectingUSBC_500px.jpg
          :width: 740
          :align: center
          :alt: Connecting serial cable.
 
       1.  Connect the other end of the USB cable to the PC USB 3 port.
 
-      .. image:: media/BB_AI_PlugIn_500px.jpg
+      .. image:: images/BB_AI_PlugIn_500px.jpg
          :width: 740
          :align: center
          :alt: connecting to PC
@@ -114,26 +114,26 @@ all else fails, follow the instructions at :ref:`upgrade-beaglebone-ai-software`
 
       3.  Look for a new mass storage drive to appear on the PC.
 
-      .. image:: media/BB_AI_asadrive_500px.jpg
+      .. image:: images/BB_AI_asadrive_500px.jpg
          :width: 740
          :align: center
          :alt: BeagleBone storage drive options
 
       1.  Open the drive and open START.HTM with your web browser.
 
-      .. image:: media/BB_AI_starthtm_500px.png
+      .. image:: images/BB_AI_starthtm_500px.png
          :width: 740
          :align: center
          :alt: BeagleBone drive 
 
-      .. image:: media/BB_AI_connectedscreen_500px.jpg
+      .. image:: images/BB_AI_connectedscreen_500px.jpg
          :width: 740
          :align: center
          :alt: Getting started
 
       1.  Follow the instructions in the browser window.
 
-      .. image:: media/vscode.png
+      .. image:: images/vscode.png
          :width: 740
          :align: center
          :alt: BeagleBone instructions
@@ -146,7 +146,7 @@ all else fails, follow the instructions at :ref:`upgrade-beaglebone-ai-software`
 
       **Standalone w/Display and Keyboard/Mouse**
 
-      .. image:: media/BB_AI_Standalone_setup_750px.jpg
+      .. image:: images/BB_AI_Standalone_setup_750px.jpg
          :width: 740
          :align: center
          :alt: BeagleBone AI Overview
@@ -191,7 +191,7 @@ Cables: https://git.beagleboard.org/beagleboard/beaglebone-ai/-/wikis/Frequently
 
 Locate the 3 PIN debug header on BeagleBone® AI, near the USB C connection.
 
-.. image:: media/BB_AI_USBC_and_3pin_500px.png
+.. image:: images/BB_AI_USBC_and_3pin_500px.png
    :align: center
    :alt: BeagleBone AI Overview
 
@@ -201,6 +201,6 @@ Press the small white connector into the 3 PIN debug header. The pinout is:
 - Pin 2: UART1_RX (i.e. this is a BB-AI input pin)
 - Pin 3: UART1_TX (i.e. BB-AI transmits out on this pin)
 
-.. image:: media/BB_AI_3pincableattach_500px.jpg
+.. image:: images/BB_AI_3pincableattach_500px.jpg
    :align: center
    :alt: BeagleBone AI Overview
\ No newline at end of file
diff --git a/boards/beaglebone/ai/03-design-and-specifications.rst b/boards/beaglebone/ai/03-design-and-specifications.rst
index 22c15dbbe4fa31884425b2060e8777b562884b2e..e508ac8106f399413c0d8ad6560c26fd7ae1dd5b 100644
--- a/boards/beaglebone/ai/03-design-and-specifications.rst
+++ b/boards/beaglebone/ai/03-design-and-specifications.rst
@@ -18,7 +18,7 @@ Block Diagram
 The figure below is the high level block diagram of BeagleBone® AI. For
 detailed layout information please check the schematics.
 
-.. image:: media/BB_AI_Blockdiagram_1000px.jpg
+.. image:: images/BB_AI_Blockdiagram_1000px.jpg
    :align: center
    :alt: beaglebone ai component placement
 
@@ -40,7 +40,7 @@ and coprocessors, thus reducing the complexity of the system software.
 
 Texas Instruments AM572x Sitaraâ„¢ Processor Family Block Diagram\*
 
-.. image:: media/BB_AI_AM5729_blockdiagram.jpg
+.. image:: images/BB_AI_AM5729_blockdiagram.jpg
    :align: center
    :alt: beaglebone ai component placement
 
@@ -106,7 +106,7 @@ subsystem contains the following submodules:
 -  4 Embedded Vision Engines (EVEs) supported by TIDL machine learning
    library
 
-.. image:: media/BB_AI_EVEmodule.jpg
+.. image:: images/BB_AI_EVEmodule.jpg
    :align: center
    :alt: BeagleBone AI component placement
 
@@ -361,7 +361,7 @@ resources. Power request signals enable power mode control for power
 optimization. The device includes a general-purpose sigma-delta
 analog-to-digital converter (GPADC) with three external input channels.
 
-.. image:: media/BB_AI_PMIC_schematicpg3_900px.png
+.. image:: images/BB_AI_PMIC_schematicpg3_900px.png
    :align: center
    :alt: beaglebone ai user interface placement
 
@@ -375,7 +375,7 @@ Below image shows how the USB-C power input is connected to the **TPS6590379**.
 Power Button
 =============
 
-.. image:: media/BB_AI_Userinterface_800px.png
+.. image:: images/BB_AI_Userinterface_800px.png
    :alt: beaglebone ai user interface placement
 
 .. _eMMC-flash-memory:
@@ -553,7 +553,7 @@ PRU-ICSS Block Diagram
 
 Below is a high level block diagram of one of the PRU-ICSS Subsystems
 
-.. image:: media/BB_AI_PRU_block_diagram.jpg
+.. image:: images/BB_AI_PRU_block_diagram.jpg
    :align: center
    :alt: beaglebone ai component placement
 
@@ -2271,7 +2271,7 @@ User LEDs
 There are 5 User Programmable LEDs on BeagleBone® AI. These are
 connected to GPIO pins on the processor. 
 
-.. image:: media/BB_AI_USERLEDS_800px.png
+.. image:: images/BB_AI_USERLEDS_800px.png
    :align: center
    :alt: beaglebone ai connector placement
 
diff --git a/boards/beaglebone/ai/04-expansion.rst b/boards/beaglebone/ai/04-expansion.rst
index 4154e2628b7a3e98c5657b1d633663dd993aff1b..7ca2d22717bb97eb9c477382f652722799ea46ac 100644
--- a/boards/beaglebone/ai/04-expansion.rst
+++ b/boards/beaglebone/ai/04-expansion.rst
@@ -21,7 +21,7 @@ are **3.3V** unless otherwise indicated.
 
 **Figure ?** shows the location of the expansion connectors.
 
-.. image:: media/BB_AI_Headerplacement_800px.png
+.. image:: images/BB_AI_Headerplacement_800px.png
     :align: center
     :alt: beaglebone ai header placement
 
diff --git a/boards/beaglebone/ai/06-support.rst b/boards/beaglebone/ai/06-support.rst
index ec06314a3465dc0aee9f1ed761e8fe3216d1f2c4..8f98b3bdbd5ac482d7a990d5a603150f8d1aa95c 100644
--- a/boards/beaglebone/ai/06-support.rst
+++ b/boards/beaglebone/ai/06-support.rst
@@ -115,8 +115,8 @@ Proposed changes.
 Pictures
 *********
 
-.. image:: media/BB_AI_Front.jpg
+.. image:: images/BB_AI_Front.jpg
     :align: center
 
-.. image:: media/BB_AI_Back.jpg
+.. image:: images/BB_AI_Back.jpg
     :align: center
diff --git a/boards/beaglebone/ai/media/BB_AI_3pin_cable_500px.jpg b/boards/beaglebone/ai/images/BB_AI_3pin_cable_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_3pin_cable_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_3pin_cable_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_3pincableattach_500px.jpg b/boards/beaglebone/ai/images/BB_AI_3pincableattach_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_3pincableattach_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_3pincableattach_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_3pinconnector_cable_500px.jpg b/boards/beaglebone/ai/images/BB_AI_3pinconnector_cable_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_3pinconnector_cable_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_3pinconnector_cable_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_AM5729_blockdiagram.jpg b/boards/beaglebone/ai/images/BB_AI_AM5729_blockdiagram.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_AM5729_blockdiagram.jpg
rename to boards/beaglebone/ai/images/BB_AI_AM5729_blockdiagram.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Antenna_500px.jpg b/boards/beaglebone/ai/images/BB_AI_Antenna_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Antenna_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Antenna_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Antenna_placement_500px.jpg b/boards/beaglebone/ai/images/BB_AI_Antenna_placement_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Antenna_placement_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Antenna_placement_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Back.jpg b/boards/beaglebone/ai/images/BB_AI_Back.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Back.jpg
rename to boards/beaglebone/ai/images/BB_AI_Back.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_BeautyAngle_800px.jpg b/boards/beaglebone/ai/images/BB_AI_BeautyAngle_800px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_BeautyAngle_800px.jpg
rename to boards/beaglebone/ai/images/BB_AI_BeautyAngle_800px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Blockdiagram_1000px.jpg b/boards/beaglebone/ai/images/BB_AI_Blockdiagram_1000px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Blockdiagram_1000px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Blockdiagram_1000px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_CoaxConn__250px.png b/boards/beaglebone/ai/images/BB_AI_CoaxConn__250px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_CoaxConn__250px.png
rename to boards/beaglebone/ai/images/BB_AI_CoaxConn__250px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_Connectorplacement_800px.png b/boards/beaglebone/ai/images/BB_AI_Connectorplacement_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Connectorplacement_800px.png
rename to boards/beaglebone/ai/images/BB_AI_Connectorplacement_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_Connectorplacement_back_800px.png b/boards/beaglebone/ai/images/BB_AI_Connectorplacement_back_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Connectorplacement_back_800px.png
rename to boards/beaglebone/ai/images/BB_AI_Connectorplacement_back_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_EVEmodule.jpg b/boards/beaglebone/ai/images/BB_AI_EVEmodule.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_EVEmodule.jpg
rename to boards/beaglebone/ai/images/BB_AI_EVEmodule.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Front.jpg b/boards/beaglebone/ai/images/BB_AI_Front.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Front.jpg
rename to boards/beaglebone/ai/images/BB_AI_Front.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Headerplacement_800px.png b/boards/beaglebone/ai/images/BB_AI_Headerplacement_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Headerplacement_800px.png
rename to boards/beaglebone/ai/images/BB_AI_Headerplacement_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_Heatsinkon_750px.jpg b/boards/beaglebone/ai/images/BB_AI_Heatsinkon_750px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Heatsinkon_750px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Heatsinkon_750px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_ICPlacement_800px.png b/boards/beaglebone/ai/images/BB_AI_ICPlacement_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_ICPlacement_800px.png
rename to boards/beaglebone/ai/images/BB_AI_ICPlacement_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_PMIC_schematicpg3_900px.png b/boards/beaglebone/ai/images/BB_AI_PMIC_schematicpg3_900px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_PMIC_schematicpg3_900px.png
rename to boards/beaglebone/ai/images/BB_AI_PMIC_schematicpg3_900px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_PRU_block_diagram.jpg b/boards/beaglebone/ai/images/BB_AI_PRU_block_diagram.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_PRU_block_diagram.jpg
rename to boards/beaglebone/ai/images/BB_AI_PRU_block_diagram.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_PlugIn_500px.jpg b/boards/beaglebone/ai/images/BB_AI_PlugIn_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_PlugIn_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_PlugIn_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Standalone_setup_1000px.jpg b/boards/beaglebone/ai/images/BB_AI_Standalone_setup_1000px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Standalone_setup_1000px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Standalone_setup_1000px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_Standalone_setup_750px.jpg b/boards/beaglebone/ai/images/BB_AI_Standalone_setup_750px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Standalone_setup_750px.jpg
rename to boards/beaglebone/ai/images/BB_AI_Standalone_setup_750px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_USBC_and_3pin_500px.png b/boards/beaglebone/ai/images/BB_AI_USBC_and_3pin_500px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_USBC_and_3pin_500px.png
rename to boards/beaglebone/ai/images/BB_AI_USBC_and_3pin_500px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_USERLEDS_800px.png b/boards/beaglebone/ai/images/BB_AI_USERLEDS_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_USERLEDS_800px.png
rename to boards/beaglebone/ai/images/BB_AI_USERLEDS_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_Userinterface_500px.png b/boards/beaglebone/ai/images/BB_AI_Userinterface_500px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Userinterface_500px.png
rename to boards/beaglebone/ai/images/BB_AI_Userinterface_500px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_Userinterface_800px.png b/boards/beaglebone/ai/images/BB_AI_Userinterface_800px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_Userinterface_800px.png
rename to boards/beaglebone/ai/images/BB_AI_Userinterface_800px.png
diff --git a/boards/beaglebone/ai/media/BB_AI_antenna_heat_sink_place_500px.jpg b/boards/beaglebone/ai/images/BB_AI_antenna_heat_sink_place_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_antenna_heat_sink_place_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_antenna_heat_sink_place_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_asadrive_500px.jpg b/boards/beaglebone/ai/images/BB_AI_asadrive_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_asadrive_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_asadrive_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_beautyangle.jpg b/boards/beaglebone/ai/images/BB_AI_beautyangle.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_beautyangle.jpg
rename to boards/beaglebone/ai/images/BB_AI_beautyangle.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_connectedscreen_500px.jpg b/boards/beaglebone/ai/images/BB_AI_connectedscreen_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_connectedscreen_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_connectedscreen_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_connectingUSBC_500px.jpg b/boards/beaglebone/ai/images/BB_AI_connectingUSBC_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_connectingUSBC_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_connectingUSBC_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_handheld_500px.jpg b/boards/beaglebone/ai/images/BB_AI_handheld_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_handheld_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_handheld_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_outofbox_box_500px.jpg b/boards/beaglebone/ai/images/BB_AI_outofbox_box_500px.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_outofbox_box_500px.jpg
rename to boards/beaglebone/ai/images/BB_AI_outofbox_box_500px.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_overview_image.jpg b/boards/beaglebone/ai/images/BB_AI_overview_image.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_overview_image.jpg
rename to boards/beaglebone/ai/images/BB_AI_overview_image.jpg
diff --git a/boards/beaglebone/ai/media/BB_AI_starthtm_500px.png b/boards/beaglebone/ai/images/BB_AI_starthtm_500px.png
similarity index 100%
rename from boards/beaglebone/ai/media/BB_AI_starthtm_500px.png
rename to boards/beaglebone/ai/images/BB_AI_starthtm_500px.png
diff --git a/boards/beaglebone/ai/media/OSHW_mark_US000169.svg b/boards/beaglebone/ai/images/OSHW_mark_US000169.svg
similarity index 100%
rename from boards/beaglebone/ai/media/OSHW_mark_US000169.svg
rename to boards/beaglebone/ai/images/OSHW_mark_US000169.svg
diff --git a/boards/beaglebone/ai/media/cc-by-sa-88x31.png b/boards/beaglebone/ai/images/cc-by-sa-88x31.png
similarity index 100%
rename from boards/beaglebone/ai/media/cc-by-sa-88x31.png
rename to boards/beaglebone/ai/images/cc-by-sa-88x31.png
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/01-introduction.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/01-introduction.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/01-introduction.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/01-introduction.jpg
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/02-quick-start.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/02-quick-start.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/02-quick-start.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/02-quick-start.jpg
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/03-design-and-specifications.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/03-design-and-specifications.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/03-design-and-specifications.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/03-design-and-specifications.jpg
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/04-expansion.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/04-expansion.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/04-expansion.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/04-expansion.jpg
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/05-demos-and-tutorials.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/05-demos-and-tutorials.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/05-demos-and-tutorials.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/05-demos-and-tutorials.jpg
diff --git a/boards/beaglebone/ai/media/chapter-thumbnails/06-support.jpg b/boards/beaglebone/ai/images/chapter-thumbnails/06-support.jpg
similarity index 100%
rename from boards/beaglebone/ai/media/chapter-thumbnails/06-support.jpg
rename to boards/beaglebone/ai/images/chapter-thumbnails/06-support.jpg
diff --git a/boards/beaglebone/ai/media/getting-started-image.png b/boards/beaglebone/ai/images/getting-started-image.png
similarity index 100%
rename from boards/beaglebone/ai/media/getting-started-image.png
rename to boards/beaglebone/ai/images/getting-started-image.png
diff --git a/boards/beaglebone/ai/media/hardware-design/adc-power.svg b/boards/beaglebone/ai/images/hardware-design/adc-power.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/adc-power.svg
rename to boards/beaglebone/ai/images/hardware-design/adc-power.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/adc.svg b/boards/beaglebone/ai/images/hardware-design/adc.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/adc.svg
rename to boards/beaglebone/ai/images/hardware-design/adc.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/am57x-power.svg b/boards/beaglebone/ai/images/hardware-design/am57x-power.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/am57x-power.svg
rename to boards/beaglebone/ai/images/hardware-design/am57x-power.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/block-diagram.svg b/boards/beaglebone/ai/images/hardware-design/block-diagram.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/block-diagram.svg
rename to boards/beaglebone/ai/images/hardware-design/block-diagram.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/boot-config.svg b/boards/beaglebone/ai/images/hardware-design/boot-config.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/boot-config.svg
rename to boards/beaglebone/ai/images/hardware-design/boot-config.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/ddr-vtt.svg b/boards/beaglebone/ai/images/hardware-design/ddr-vtt.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/ddr-vtt.svg
rename to boards/beaglebone/ai/images/hardware-design/ddr-vtt.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/ddr.svg b/boards/beaglebone/ai/images/hardware-design/ddr.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/ddr.svg
rename to boards/beaglebone/ai/images/hardware-design/ddr.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/emmc.svg b/boards/beaglebone/ai/images/hardware-design/emmc.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/emmc.svg
rename to boards/beaglebone/ai/images/hardware-design/emmc.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/ethernet-strapping.svg b/boards/beaglebone/ai/images/hardware-design/ethernet-strapping.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/ethernet-strapping.svg
rename to boards/beaglebone/ai/images/hardware-design/ethernet-strapping.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/ethernet-supporting-circuit.svg b/boards/beaglebone/ai/images/hardware-design/ethernet-supporting-circuit.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/ethernet-supporting-circuit.svg
rename to boards/beaglebone/ai/images/hardware-design/ethernet-supporting-circuit.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/ethernet.svg b/boards/beaglebone/ai/images/hardware-design/ethernet.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/ethernet.svg
rename to boards/beaglebone/ai/images/hardware-design/ethernet.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/hdmi.svg b/boards/beaglebone/ai/images/hardware-design/hdmi.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/hdmi.svg
rename to boards/beaglebone/ai/images/hardware-design/hdmi.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/jtag.svg b/boards/beaglebone/ai/images/hardware-design/jtag.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/jtag.svg
rename to boards/beaglebone/ai/images/hardware-design/jtag.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/led.svg b/boards/beaglebone/ai/images/hardware-design/led.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/led.svg
rename to boards/beaglebone/ai/images/hardware-design/led.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/load-switch.svg b/boards/beaglebone/ai/images/hardware-design/load-switch.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/load-switch.svg
rename to boards/beaglebone/ai/images/hardware-design/load-switch.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/microsd-card.svg b/boards/beaglebone/ai/images/hardware-design/microsd-card.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/microsd-card.svg
rename to boards/beaglebone/ai/images/hardware-design/microsd-card.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/p8-p9-double-pins.svg b/boards/beaglebone/ai/images/hardware-design/p8-p9-double-pins.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/p8-p9-double-pins.svg
rename to boards/beaglebone/ai/images/hardware-design/p8-p9-double-pins.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/p8.svg b/boards/beaglebone/ai/images/hardware-design/p8.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/p8.svg
rename to boards/beaglebone/ai/images/hardware-design/p8.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/p9.svg b/boards/beaglebone/ai/images/hardware-design/p9.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/p9.svg
rename to boards/beaglebone/ai/images/hardware-design/p9.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/pmic-part-a.svg b/boards/beaglebone/ai/images/hardware-design/pmic-part-a.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/pmic-part-a.svg
rename to boards/beaglebone/ai/images/hardware-design/pmic-part-a.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/pmic-part-b.svg b/boards/beaglebone/ai/images/hardware-design/pmic-part-b.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/pmic-part-b.svg
rename to boards/beaglebone/ai/images/hardware-design/pmic-part-b.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/pmic-voltage-clamp.svg b/boards/beaglebone/ai/images/hardware-design/pmic-voltage-clamp.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/pmic-voltage-clamp.svg
rename to boards/beaglebone/ai/images/hardware-design/pmic-voltage-clamp.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/reset.svg b/boards/beaglebone/ai/images/hardware-design/reset.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/reset.svg
rename to boards/beaglebone/ai/images/hardware-design/reset.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/uart-debug.svg b/boards/beaglebone/ai/images/hardware-design/uart-debug.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/uart-debug.svg
rename to boards/beaglebone/ai/images/hardware-design/uart-debug.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/usb-c-cc-controller.svg b/boards/beaglebone/ai/images/hardware-design/usb-c-cc-controller.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/usb-c-cc-controller.svg
rename to boards/beaglebone/ai/images/hardware-design/usb-c-cc-controller.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/usb-combo-switch.svg b/boards/beaglebone/ai/images/hardware-design/usb-combo-switch.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/usb-combo-switch.svg
rename to boards/beaglebone/ai/images/hardware-design/usb-combo-switch.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/usb-type-c.svg b/boards/beaglebone/ai/images/hardware-design/usb-type-c.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/usb-type-c.svg
rename to boards/beaglebone/ai/images/hardware-design/usb-type-c.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/usb2.svg b/boards/beaglebone/ai/images/hardware-design/usb2.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/usb2.svg
rename to boards/beaglebone/ai/images/hardware-design/usb2.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/vbus-power.svg b/boards/beaglebone/ai/images/hardware-design/vbus-power.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/vbus-power.svg
rename to boards/beaglebone/ai/images/hardware-design/vbus-power.svg
diff --git a/boards/beaglebone/ai/media/hardware-design/wifi-bluetooth.svg b/boards/beaglebone/ai/images/hardware-design/wifi-bluetooth.svg
similarity index 100%
rename from boards/beaglebone/ai/media/hardware-design/wifi-bluetooth.svg
rename to boards/beaglebone/ai/images/hardware-design/wifi-bluetooth.svg
diff --git a/boards/beaglebone/ai/media/reva1-bottom.pdf b/boards/beaglebone/ai/images/reva1-bottom.pdf
similarity index 100%
rename from boards/beaglebone/ai/media/reva1-bottom.pdf
rename to boards/beaglebone/ai/images/reva1-bottom.pdf
diff --git a/boards/beaglebone/ai/media/reva1-bottom.svg b/boards/beaglebone/ai/images/reva1-bottom.svg
similarity index 100%
rename from boards/beaglebone/ai/media/reva1-bottom.svg
rename to boards/beaglebone/ai/images/reva1-bottom.svg
diff --git a/boards/beaglebone/ai/media/reva1-top.pdf b/boards/beaglebone/ai/images/reva1-top.pdf
similarity index 100%
rename from boards/beaglebone/ai/media/reva1-top.pdf
rename to boards/beaglebone/ai/images/reva1-top.pdf
diff --git a/boards/beaglebone/ai/media/reva1-top.svg b/boards/beaglebone/ai/images/reva1-top.svg
similarity index 100%
rename from boards/beaglebone/ai/media/reva1-top.svg
rename to boards/beaglebone/ai/images/reva1-top.svg
diff --git a/boards/beaglebone/ai/media/vscode.png b/boards/beaglebone/ai/images/vscode.png
similarity index 100%
rename from boards/beaglebone/ai/media/vscode.png
rename to boards/beaglebone/ai/images/vscode.png
diff --git a/boards/beaglebone/ai/index.rst b/boards/beaglebone/ai/index.rst
index 0fb75508b08b79f4a7a9f9a6bbd5282cef885e7f..f8c20a77ceb5006df75a318abf193d874c1ee213 100644
--- a/boards/beaglebone/ai/index.rst
+++ b/boards/beaglebone/ai/index.rst
@@ -15,7 +15,7 @@ automation in industrial, commercial and home applications.
     .. grid-item::
         :columns: 12 12 12 4
         
-        .. figure:: media/OSHW_mark_US000169.*
+        .. figure:: images/OSHW_mark_US000169.*
             :width: 200
             :target: https://certification.oshwa.org/us000169.html
             :alt: BeagleBone AI OSHW Mark
@@ -31,7 +31,7 @@ automation in industrial, commercial and home applications.
                 * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai>`__
                 * For export, emissions and other compliance, see :ref:`bbai-support`
 
-.. image:: media/BB_AI_handheld_500px.jpg
+.. image:: images/BB_AI_handheld_500px.jpg
     :width: 740
     :align: center
     :alt: BeagleBone AI
@@ -49,7 +49,7 @@ automation in industrial, commercial and home applications.
         **1. Introduction**
         ^^^
 
-        .. image:: media/chapter-thumbnails/01-introduction.*
+        .. image:: images/chapter-thumbnails/01-introduction.*
             :align: center
             :alt: BeagleBone AI Chapter01 thumbnail
         
@@ -65,7 +65,7 @@ automation in industrial, commercial and home applications.
         **2. Quick start**
         ^^^
 
-        .. image:: media/chapter-thumbnails/02-quick-start.*
+        .. image:: images/chapter-thumbnails/02-quick-start.*
             :align: center
             :alt: BeagleBone AI Chapter02 thumbnail
 
@@ -81,7 +81,7 @@ automation in industrial, commercial and home applications.
         **3. Design & Specifications**
         ^^^
 
-        .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+        .. image:: images/chapter-thumbnails/03-design-and-specifications.*
             :align: center
             :alt: BeagleBone AI Chapter03 thumbnail
 
@@ -97,7 +97,7 @@ automation in industrial, commercial and home applications.
         **4. Expansion**
         ^^^
 
-        .. image:: media/chapter-thumbnails/04-expansion.*
+        .. image:: images/chapter-thumbnails/04-expansion.*
             :align: center
             :alt: BeagleBone AI Chapter04 thumbnail
 
@@ -113,7 +113,7 @@ automation in industrial, commercial and home applications.
         **5. Demos**
         ^^^
 
-        .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+        .. image:: images/chapter-thumbnails/05-demos-and-tutorials.*
             :align: center
             :alt: BeagleBone AI Chapter5 thumbnail
 
@@ -128,7 +128,7 @@ automation in industrial, commercial and home applications.
         **6. Support**
         ^^^
 
-        .. image:: media/chapter-thumbnails/06-support.*
+        .. image:: images/chapter-thumbnails/06-support.*
             :align: center
             :alt: BeagleBone AI Chapter6 thumbnail
 
diff --git a/boards/beaglebone/ai/media/OSHW_mark_US000169.png b/boards/beaglebone/ai/media/OSHW_mark_US000169.png
deleted file mode 100644
index 8ee19a9049e613691ec7bfbcbbfe50d3ed17ebdc..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/ai/media/OSHW_mark_US000169.png and /dev/null differ
diff --git a/boards/beaglebone/ai/media/OSHW_mark_US000169.webp b/boards/beaglebone/ai/media/OSHW_mark_US000169.webp
deleted file mode 100644
index 80cbbbbdd59505b85e05e547ba97707850da42c4..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/ai/media/OSHW_mark_US000169.webp and /dev/null differ
diff --git a/boards/beaglebone/black/ch03.rst b/boards/beaglebone/black/ch03.rst
index f0e09a88f263ab308c6814bd280cd155733d1a70..8c9fc79f41fde544b084a2e8350a3ab7b5578820 100644
--- a/boards/beaglebone/black/ch03.rst
+++ b/boards/beaglebone/black/ch03.rst
@@ -22,7 +22,7 @@ This is sufficient for the tethered scenario and creates an out of box
 experience where the board can be used immediately with no other
 equipment needed.
 
-.. figure:: media/image7.jpg
+.. figure:: images/image7.jpg
    :width: 400px
    :align: center
    :alt: BeagleBone Black in the box.
@@ -69,7 +69,7 @@ a USB storage drive or via the browser on the PC. You need to use either
 Firefox or Chrome on the PC, Internet Explorer will not work properly. <<figure-2>>
 shows this configuration.
 
-.. figure:: media/image8.jpg
+.. figure:: images/image8.jpg
    :width: 632px
    :height: 166px
    :align: center
@@ -90,7 +90,7 @@ Connect the Cable to the Board
 
 1. Connect the small connector on the USB cable to the board as shown in *figure-3*. The connector is on the bottom side of the board.
 
-.. figure:: media/image9.jpg
+.. figure:: images/image9.jpg
    :width: 451px
    :height: 206px
    :align: center
@@ -101,7 +101,7 @@ Connect the Cable to the Board
 2.  Connect the large connector of the USB cable to your PC or laptop USB port.
 3.  The board will power on and the power LED will be on as shown in figure below.
 
-.. figure:: media/image10.jpg
+.. figure:: images/image10.jpg
    :width: 401px
    :height: 267px
    :align: center
@@ -111,7 +111,7 @@ Connect the Cable to the Board
 
 4. When the board starts to the booting process started by the process of applying power, the LEDs will come on in sequence as shown in *figure-5* below. It will take a few seconds for the status LEDs to come on, so be patient. The LEDs will be flashing in an erratic manner as it begins to boot the Linux kernel.
 
-.. figure:: media/image11.jpg
+.. figure:: images/image11.jpg
    :width: 400px
    :height: 254px
    :align: center
@@ -141,7 +141,7 @@ your code to make the board do whatever you need it to do. It will
 however require certain common PC accessories. These accessories and
 instructions are described in the following section.
 
-.. figure:: media/image12.jpg
+.. figure:: images/image12.jpg
    :width: 356px
    :height: 409px
    :align: center
@@ -170,7 +170,7 @@ Connecting Up the Board
 
 1. Connect the big end of the HDMI cable as shown in *figure-7* to your HDMI monitor. Refer to your monitor Owner’s Manual for the location of your HDMI port. If you have a DVI-D Monitor go to *Step 3*, otherwise proceed to *Step 4* .
 
-.. figure:: media/image13.jpg
+.. figure:: images/image13.jpg
    :width: 260px
    :height: 95px
    :align: center
@@ -180,7 +180,7 @@ Connecting Up the Board
 
 2.  If you have a DVI-D monitor you must use a DVI-D to HDMI adapter in addition to your HDMI cable. An example is shown in *figure-8* below from two perspectives. If you use this configuration, you will not have audio support.
 
-.. figure:: media/image14.jpg
+.. figure:: images/image14.jpg
    :width: 243px
    :height: 243px
    :align: center
@@ -190,7 +190,7 @@ Connecting Up the Board
 
 3.  If you have a single wireless keyboard and mouse combination such as seen in *figure-9* below, you need to plug the receiver in the USB host port of the board as shown in *figure-10* .
 
-.. figure:: media/image16.jpg
+.. figure:: images/image16.jpg
    :width: 237px
    :height: 108px
    :align: center
@@ -199,7 +199,7 @@ Connecting Up the Board
    Wireless Keyboard and Mouse Combo
 
 
-.. figure:: media/image17.jpg
+.. figure:: images/image17.jpg
    :width: 279px
    :height: 222px
    :align: center
@@ -209,7 +209,7 @@ Connecting Up the Board
 
 If you have a wired USB keyboard requiring two USB ports, you will need a HUB similar to the ones shown in figure below . You may want to have more than one port for other devices. Note that the board can only supply up to 500mA, so if you plan to load it down, it will need to be externally powered.
 
-.. figure:: media/image18.jpg
+.. figure:: images/image18.jpg
    :width: 509px
    :height: 152px
    :align: center
@@ -221,7 +221,7 @@ If you have a wired USB keyboard requiring two USB ports, you will need a HUB si
 
 If you decide you want to connect to your local area network, an Ethernet cable can be used. Connect the Ethernet Cable to the Ethernet port as shown in figure below . Any standard 100M Ethernet cable should work.
 
-.. figure:: media/image24.jpg
+.. figure:: images/image24.jpg
    :width: 433px
    :height: 264px
    :align: center
@@ -231,7 +231,7 @@ If you decide you want to connect to your local area network, an Ethernet cable
 
 5. The final step is to plug in the DC power supply to the DC power jack as shown in figure below.
 
-.. figure:: media/image25.jpg
+.. figure:: images/image25.jpg
    :width: 618px
    :height: 298px
    :align: center
@@ -241,7 +241,7 @@ If you decide you want to connect to your local area network, an Ethernet cable
 
 6. The cable needed to connect to your display is a microHDMI to HDMI. Connect the microHDMI connector end to the board at this time. The connector is on the bottom side of the board as shown in *figure-14* below.
 
-.. figure:: media/image26.jpg
+.. figure:: images/image26.jpg
    :width: 540px
    :height: 227
    :align: center
@@ -255,7 +255,7 @@ The connector is fairly robust, but we suggest that you not use the cable as a l
 
 As soon as the power is applied to the board, it will start the booting up process. When the board starts to boot the LEDs will come on in sequence as shown in *figure-15* below. It will take a few seconds for the status LEDs to come on, so be patient. The LEDs will be flashing in an erratic manner as it boots the Linux kernel.
 
-.. figure:: media/image11.jpg
+.. figure:: images/image11.jpg
    :width: 541px
    :height: 254px
    :align: center
@@ -281,7 +281,7 @@ once the Linux kernel has booted.
       it will change from one release to the next, so do not expect your system to look exactly like the one in the figure, but it will be very similar.
    d. And at this point you are ready to go! *figure-16* shows the desktop after booting.
 
-.. figure:: media/image27.jpg
+.. figure:: images/image27.jpg
    :width: 513px
    :height: 288px
    :align: center
diff --git a/boards/beaglebone/black/ch04.rst b/boards/beaglebone/black/ch04.rst
index 73f2ce6dc51752b555dc0b0be042a166ed1132f3..81cf2d5bb28ab03097e5a985973870e2d76e248c 100644
--- a/boards/beaglebone/black/ch04.rst
+++ b/boards/beaglebone/black/ch04.rst
@@ -191,7 +191,7 @@ Connectors, LEDs, and Switches
 figure below shows the locations of the connectors, LEDs, and
 switches on the PCB layout of the board.
 
-.. figure:: media/image28.jpg
+.. figure:: images/image28.jpg
    :width: 509px
    :height: 340px
    :align: center
@@ -217,7 +217,7 @@ Key Components
 figure below shows the locations of the key components on the PCB
 layout of the board.
 
-.. figure:: media/image29.jpg
+.. figure:: images/image29.jpg
    :width: 575px
    :height: 417px
    :align: center
diff --git a/boards/beaglebone/black/ch05.rst b/boards/beaglebone/black/ch05.rst
index 7ae4eb6718e6fe426568f3cb848ca0fb44170fa7..6c6c748943b9a5cb89b193e5dd5f675252a23a43 100644
--- a/boards/beaglebone/black/ch05.rst
+++ b/boards/beaglebone/black/ch05.rst
@@ -9,7 +9,7 @@ Black.
 Block Diagram
 **************
 
-.. figure:: media/image30.jpg
+.. figure:: images/image30.jpg
    :width: 512px
    :height: 454px
    :align: center
diff --git a/boards/beaglebone/black/ch06.rst b/boards/beaglebone/black/ch06.rst
index f173b5ac4592e1df9edb0d30b7b3366a8d7c2a1f..e1b2ceb0d10f389647fe4634adfa2bd6072c0c23 100644
--- a/boards/beaglebone/black/ch06.rst
+++ b/boards/beaglebone/black/ch06.rst
@@ -7,7 +7,7 @@ This section provides a detailed description of the Hardware design.
 This can be useful for interfacing, writing drivers, or using it to help
 modify specifics of your own design.
 
-.. figure:: media/image30.jpg
+.. figure:: images/image30.jpg
    :width: 521px
    :height: 454px
    :align: center
@@ -18,7 +18,7 @@ modify specifics of your own design.
 Power Section
 **************
 
-.. figure:: media/image31.png
+.. figure:: images/image31.png
    :width: 417px
    :height: 278px
    :align: center
@@ -67,7 +67,7 @@ battery.
 For more information on the *TPS65217C*, refer to
 `http://www.ti.com/product/tps65217C <http://www.ti.com/product/tps65217C>`_
 
-.. figure:: media/image37.png
+.. figure:: images/image37.png
    :width: 550px
    :height: 629px
    :align: center
@@ -78,7 +78,7 @@ For more information on the *TPS65217C*, refer to
 DC Input
 =========
 
-.. figure:: media/image38.png
+.. figure:: images/image38.png
    :width: 458px
    :height: 408px
    :align: center
@@ -110,7 +110,7 @@ provided on the SYS_5V, the one that comes from the**TPS65217C**, rail
 of the expansion header for use by a cape. *Figure 24* is the connection
 of the USB power input on the PMIC.
 
-.. figure:: media/image96.png
+.. figure:: images/image96.png
    :width: 519px
    :height: 622px
    :align: center
@@ -306,7 +306,7 @@ support.
 Power Rails
 ============
 
-.. figure:: media/image39.jpg
+.. figure:: images/image39.jpg
    :width: 562px
    :height: 505px
    :align: center
@@ -370,7 +370,7 @@ additional information. I saw no need to bust it up into smaller
 diagrams. It is from the processor datasheet supplied by Texas
 Instruments.
 
-.. figure:: media/image40.png
+.. figure:: images/image40.png
    :width: 547px
    :height: 397px
    :align: center
@@ -383,7 +383,7 @@ powers up and the voltages on each rail. The power sequencing starts at
 15 and then goes to one. That is the way the *TPS65217C* is configured.
 You can refer to the TPS65217C datasheet for more information.
 
-.. figure:: media/image41.png
+.. figure:: images/image41.png
    :width: 225px
    :height: 188px
    :align: center
@@ -407,7 +407,7 @@ Figure below shows the interface between the **TPS65217C** and the
 processor. It is a cut from the PDF form of the schematic and reflects
 what is on the schematic.
 
-.. figure:: media/image42.jpg
+.. figure:: images/image42.jpg
    :width: 400px
    :height: 185px
    :align: center
@@ -506,7 +506,7 @@ Description
 Figure below shows is a high level block diagram of the processor. For more information on the processor, go to
 `http://www.ti.com/product/am3358 <http://www.ti.com/product/am3358>`_
 
-.. figure:: media/image43.png
+.. figure:: images/image43.png
    :width: 503px
    :height: 511px
    :align: center
@@ -595,7 +595,7 @@ the latest datasheets and Technical Reference Manuals (TRM).
 Crystal Circuitry
 =================
 
-.. figure:: media/image44.png
+.. figure:: images/image44.png
    :width: 570px
    :height: 223px
    :align: center
@@ -623,7 +623,7 @@ the PORZn signal from the TPS65217C is connected to the SYS_RESETn line
 using an open drain buffer. These ensure that the line does not
 momentarily go high on power up.
 
-.. figure:: media/image45.png
+.. figure:: images/image45.png
    :width: 568px
    :height: 333px
    :align: center
@@ -690,7 +690,7 @@ refresh exit. Input buffers (excluding CK, CK#, CKE, RESET#, and ODT)
 are disabled during powerdown. Input buffers (excluding CKE and RESET#)
 are disabled during SELF REFRESH. CKE is referenced to VREFCA.
 
-.. figure:: media/image46.png
+.. figure:: images/image46.png
    :width: 566px
    :height: 525px
    :align: center
@@ -732,7 +732,7 @@ rail that powers the processor DDR rail and the DDR3L device itself.
 *Figure 33* below shows the configuration of this signal and the
 connection to the DDR3L memory device and the processor.
 
-.. figure:: media/image47.jpg
+.. figure:: images/image47.jpg
    :width: 376px
    :height: 269px
    :align: center
@@ -789,7 +789,7 @@ was chosen to provide a little margin.
 Pullup resistors are used to increase the rise time on the signals to
 compensate for any capacitance on the board.
 
-.. figure:: media/image48.png
+.. figure:: images/image48.png
    :width: 542px
    :height: 224px
    :align: center
@@ -799,7 +799,7 @@ compensate for any capacitance on the board.
 
 The pins used by the eMMC1 in the boot mode are listed below in *Table 6*.
 
-.. figure:: media/image49.png
+.. figure:: images/image49.png
    :width: 528px
    :height: 112px
    :align: center
@@ -872,7 +872,7 @@ the contents of the EEPROM.
      - 4018 
      - Available space for other non-volatile codes/data
 
-.. figure:: media/image50.png
+.. figure:: images/image50.png
    :width: 473px
    :height: 194px
    :align: center
@@ -898,7 +898,7 @@ be used for booting or file storage on the BeagleBone Black.
 microSD Design
 ===============
 
-.. figure:: media/image51.png
+.. figure:: images/image51.png
    :width: 550px
    :height: 216px
    :align: center
@@ -935,7 +935,7 @@ There are four user LEDs on the BeagleBone Black. These are connected to
 GPIO pins on the processor. *Figure 37* shows the interfaces for the
 user LEDs.
 
-.. figure:: media/image52.png
+.. figure:: images/image52.png
    :width: 570px
    :height: 290px
    :align: center
@@ -998,7 +998,7 @@ configuration process. On power up, these pins are read by the processor
 to determine the boot order. S2 is used to change the level of one bit
 from HI to LO which changes the boot order.
 
-.. figure:: media/image53.png
+.. figure:: images/image53.png
    :width: 448px
    :height: 367px
    :align: center
@@ -1019,7 +1019,7 @@ Default Boot Options
 Based on the selected option found in *figure-39* below, each of the
 boot sequences for each of the two settings is shown.
 
-.. figure:: media/image54.jpg
+.. figure:: images/image54.jpg
    :width: 601px
    :height: 130px
    :align: center
@@ -1049,7 +1049,7 @@ described in the following sections.
 Ethernet Processor Interface
 =============================
 
-.. figure:: media/image55.png
+.. figure:: images/image55.png
    :width: 448px
    :height: 312px
    :align: center
@@ -1066,7 +1066,7 @@ Ethernet Connector Interface
 The off board side of the PHY connections are shown in *Figure 41*
 below.
 
-.. figure:: media/image56.png
+.. figure:: images/image56.png
    :width: 570px
    :height: 347px
    :align: center
@@ -1079,7 +1079,7 @@ This is the same interface as is used on the BeagleBone. No changes were made in
 Ethernet PHY Power, Reset, and Clocks
 ======================================
 
-.. figure:: media/image57.png
+.. figure:: images/image57.png
    :width: 570px
    :height: 367px
    :align: center
@@ -1130,7 +1130,7 @@ initialized correctly. To ensure that this does not happen, three low
 value pull up resistors are used. *Figure 43* below shows the three mode
 pin resistors.
 
-.. figure:: media/image97.png
+.. figure:: images/image97.png
    :width: 386px
    :height: 349px
    :align: center
@@ -1238,7 +1238,7 @@ original BeagleBone. The unused bits on the **TDA19988** are tied low. In
 addition to the data signals are the VSYNC, HSYNC, DE, and PCLK signals
 that round out the video interface from the processor.
 
-.. figure:: media/image58.png
+.. figure:: images/image58.png
    :width: 449px
    :height: 481px
    :align: center
@@ -1256,7 +1256,7 @@ used to set the address of the *TDA19988*. In this design they are both
 tied low. The I2C interface supports both 400kHz and 100KhZ operation.
 *Table 10* shows the I2C address.
 
-.. figure:: media/image59.png
+.. figure:: images/image59.png
    :width: 527px
    :height: 72px
    :align: center
@@ -1298,7 +1298,7 @@ keep GPIO3_21 functionality, we provided a way to disable the oscillator
 if the need was there to use the pin on the expansion header. *Figure
 45* shows the oscillator circuitry.
 
-.. figure:: media/image60.png
+.. figure:: images/image60.png
    :width: 575px
    :height: 169px
    :align: center
@@ -1313,7 +1313,7 @@ Power Connections
 voltage rails for the device are at 1.8V. A filter is provided to
 minimize any noise from the 1.8V rail getting back into the device.
 
-.. figure:: media/image64.png
+.. figure:: images/image64.png
    :width: 550px
    :height: 315px
    :align: center
@@ -1330,7 +1330,7 @@ HDMI Connector Interface
 *figure-47* shows the design of the interface between the HDMI Framer
 and the connector.
 
-.. figure:: media/image65.png
+.. figure:: images/image65.png
    :width: 521px
    :height: 430px
    :align: center
@@ -1349,7 +1349,7 @@ The board is equipped with a single USB host interface accessible from a
 single USB Type A female connector. <<figure-48>> is the design of the USB
 Host circuitry.
 
-.. figure:: media/image66.png
+.. figure:: images/image66.png
    :width: 570px
    :height: 205px
    :align: center
@@ -1416,7 +1416,7 @@ accessible on the BeagleBone Black).*
 PRU-ICSS Block Diagram
 =======================
 
-.. figure:: media/image67.png
+.. figure:: images/image67.png
    :width: 427px
    :height: 275px
    :align: center
diff --git a/boards/beaglebone/black/ch07.rst b/boards/beaglebone/black/ch07.rst
index 8f62bec6434a45b6b24de67385dee8b53f60c67b..da15891d701c0233a000bbb55742d9361c38b641 100644
--- a/boards/beaglebone/black/ch07.rst
+++ b/boards/beaglebone/black/ch07.rst
@@ -21,7 +21,7 @@ THE BOARD. IT WILL DAMAGE THE PROCESSOR AND VOID THE WARRANTY.*
 **NO PINS ARE TO BE DRIVEN UNTIL AFTER THE SYS_RESET LINE GOES HIGH.**
 
 
-.. figure:: media/image68.jpg
+.. figure:: images/image68.jpg
    :width: 400px
    :align: center
    :alt: Expansion Connector Location
@@ -1096,7 +1096,7 @@ the original BeagleBone. The connector has a 2.1mm diameter center post
 (5VDC) and a 5.5mm diameter outer dimension on the barrel (GND).
 
 
-.. figure:: media/image69.jpg
+.. figure:: images/image69.jpg
    :width: 579px
    :height: 411px
    :align: center
@@ -1118,7 +1118,7 @@ is provided with the board. The cable can also be used to power the
 board.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 633px
    :height: 454px
    :align: center
@@ -1136,7 +1136,7 @@ There is a single USB Host connector on the board and is shown in
 *Figure 53* below.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 593px
    :height: 387px
    :align: center
@@ -1152,7 +1152,7 @@ Serial Header
 Each board has a debug serial interface that can be accessed by using a special serial cable that is plugged into the serial header as shown in *Figure 54* below.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 527px
    :height: 351px
    :align: center
@@ -1169,7 +1169,7 @@ these signals are 3.3V. In order to access these signals, a FTDI USB to
 Serial cable is recommended as shown in *Figure 55* below.
 
 
-.. figure:: media/image73.jpg
+.. figure:: images/image73.jpg
    :width: 428px
    :height: 162px
    :align: center
@@ -1213,7 +1213,7 @@ Table is the pinout of the connector as reflected in the schematic. It is the sa
      - Transmit
 
 
-.. figure:: media/image75.jpg
+.. figure:: images/image75.jpg
    :width: 373px
    :height: 387px
    :align: center
@@ -1228,7 +1228,7 @@ Access to the HDMI interface is through the HDMI connector that is
 located on the bottom side of the board as shown in *Figure 57* below.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 579px
    :height: 387px
    :align: center
@@ -1242,7 +1242,7 @@ a microHDMI to HDMI cable as shown in *Figure 58* below. The cable can
 be purchased from several different sources.
 
 
-.. figure:: media/image77.jpg
+.. figure:: images/image77.jpg
    :width: 196px
    :height: 196px
    :class: longtable
@@ -1259,7 +1259,7 @@ as shown in *Figure 59* below. The microSD card is not supplied with the
 board.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 579px
    :height: 438px
    :align: center
@@ -1283,7 +1283,7 @@ The board comes with a single 10/100 Ethernet interface located next to
 the power jack as shown in Figure below.
 
 
-.. figure:: media/image71.jpg
+.. figure:: images/image71.jpg
    :width: 579px
    :height: 387px
    :align: center
diff --git a/boards/beaglebone/black/ch08.rst b/boards/beaglebone/black/ch08.rst
index 4ac3f1795f6e0010dc95db7771c0bc7c628ed63e..4af81b7c5ef361a7c6206683bed315de42a70fa1 100644
--- a/boards/beaglebone/black/ch08.rst
+++ b/boards/beaglebone/black/ch08.rst
@@ -274,7 +274,7 @@ a 64-byte page write buffer and supports the Standard (100 kHz), Fast
 
 
 
-.. figure:: media/image78.png
+.. figure:: images/image78.png
    :width: 509px
    :height: 228px
    :align: center
@@ -350,7 +350,7 @@ discretion of the cape designer.
 *Variable & MAC Memory*
 VDD_3V3B
 
-.. figure:: media/image79.png
+.. figure:: images/image79.png
    :width: 567px
    :height: 189px
    :align: center
@@ -1643,7 +1643,7 @@ There are 16 pins that control the boot mode of the processor that are
 exposed on the expansion headers. *Figure 63* below shows those signals
 as they appear on the BeagleBone Black.:
 
-.. figure:: media/image80.png
+.. figure:: images/image80.png
    :width: 530px
    :height: 468px
    :align: center
@@ -1695,7 +1695,7 @@ dual row 23 position 2.54mm x 2.54mm connectors.
 
 
 
-.. figure:: media/image81.jpg
+.. figure:: images/image81.jpg
    :width: 65px
    :height: 90px
    :align: center
@@ -1710,7 +1710,7 @@ of the dual row headers.
 
 
 
-.. figure:: media/image82.jpg
+.. figure:: images/image82.jpg
    :width: 575px
    :height: 54px
    :align: center
@@ -1772,7 +1772,7 @@ dual row 23 position 2.54mm x 2.54mm connectors.
 
 
 
-.. figure:: media/image83.jpg
+.. figure:: images/image83.jpg
    :width: 69px
    :height: 90px
    :align: center
@@ -1787,7 +1787,7 @@ connector configuration for the connector.
 
 
 
-.. figure:: media/image84.jpg
+.. figure:: images/image84.jpg
    :width: 575px
    :height: 65px
    :align: center
@@ -1853,7 +1853,7 @@ nonstacking style connectors.
 
 
 
-.. figure:: media/image85.jpg
+.. figure:: images/image85.jpg
    :width: 575px
    :height: 71px
    :align: center
@@ -1883,7 +1883,7 @@ overhang.
 
 
 
-.. figure:: media/image86.jpg
+.. figure:: images/image86.jpg
    :width: 552px
    :height: 314px
    :align: center
@@ -2033,7 +2033,7 @@ board.
 Standard Cape Size
 ===================
 
-.. figure:: media/image87.jpg
+.. figure:: images/image87.jpg
    :width: 575px
    :height: 369px
    :align: center
diff --git a/boards/beaglebone/black/ch09.rst b/boards/beaglebone/black/ch09.rst
index 0fe61668c5b0684fc010d6f2b75b8c5f3487f24e..931d2315e73c0f49b3f37a7d53516f0e6b58455e 100644
--- a/boards/beaglebone/black/ch09.rst
+++ b/boards/beaglebone/black/ch09.rst
@@ -21,7 +21,7 @@ Weight: 1.4 oz
 Silkscreen and Component Locations
 ***********************************
 
-.. figure:: media/image88.jpg
+.. figure:: images/image88.jpg
    :width: 530px
    :height: 782px
    :align: center
@@ -30,7 +30,7 @@ Silkscreen and Component Locations
    Board Dimensions
 
 
-.. figure:: media/image89.jpg
+.. figure:: images/image89.jpg
    :width: 493px
    :height: 818px
    :align: center
@@ -39,7 +39,7 @@ Silkscreen and Component Locations
    Component Side Silkscreen
 
 
-.. figure:: media/image90.jpg
+.. figure:: images/image90.jpg
    :width: 501px
    :height: 772px
    :align: center
diff --git a/boards/beaglebone/black/ch11.rst b/boards/beaglebone/black/ch11.rst
index 9c6d315af1a40b27cfc830777a9bd5d6910630e0..577c4dcda6eea02187de0ca2d92c7851e1ddd07a 100644
--- a/boards/beaglebone/black/ch11.rst
+++ b/boards/beaglebone/black/ch11.rst
@@ -46,7 +46,7 @@ filling out the form at `http://beagleboard.org/support/rma <http://beagleboard.
 . You will need the serial number and revision of the board. The serial numbers and revisions keep moving. Different boards can have different locations depending on when they were made. The following figures show the three locations of the serial and revision number.
 
 
-.. figure:: media/image93.jpg
+.. figure:: images/image93.jpg
    :width: 518px
    :height: 308px
    :align: center
@@ -54,7 +54,7 @@ filling out the form at `http://beagleboard.org/support/rma <http://beagleboard.
    
    Initial Serial Number and Revision Locations
 
-.. figure:: media/image94.jpg
+.. figure:: images/image94.jpg
    :width: 518px
    :height: 230px
    :align: center
@@ -62,7 +62,7 @@ filling out the form at `http://beagleboard.org/support/rma <http://beagleboard.
 
    Second Phase Serial Number and Revision Location
 
-.. figure:: media/image95.jpg
+.. figure:: images/image95.jpg
    :width: 575px
    :height: 222px
    :align: center
diff --git a/boards/beaglebone/black/images/OSHW_mark_US000011.png b/boards/beaglebone/black/images/OSHW_mark_US000011.png
deleted file mode 100644
index d6d29222828d1b0358cabe889fd61340c27db581..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/black/images/OSHW_mark_US000011.png and /dev/null differ
diff --git a/boards/beaglebone/black/images/OSHW_mark_US000011.webp b/boards/beaglebone/black/images/OSHW_mark_US000011.webp
deleted file mode 100644
index 2acd02f0a4dd0821b2c0eb4e7569dc54c6b58916..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/black/images/OSHW_mark_US000011.webp and /dev/null differ
diff --git a/boards/beaglebone/black/images/OSHW_mark_US000236.png b/boards/beaglebone/black/images/OSHW_mark_US000236.png
deleted file mode 100644
index 3a5f635db4aa5cfd2d11d8b06668547e074c5dbf..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/black/images/OSHW_mark_US000236.png and /dev/null differ
diff --git a/boards/beaglebone/black/images/OSHW_mark_US000236.webp b/boards/beaglebone/black/images/OSHW_mark_US000236.webp
deleted file mode 100644
index 7b47bda362ee8c59dd17990922598b833d2be6d9..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/black/images/OSHW_mark_US000236.webp and /dev/null differ
diff --git a/boards/beaglebone/black/media/image1.jpg b/boards/beaglebone/black/images/image1.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image1.jpg
rename to boards/beaglebone/black/images/image1.jpg
diff --git a/boards/beaglebone/black/media/image10.jpg b/boards/beaglebone/black/images/image10.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image10.jpg
rename to boards/beaglebone/black/images/image10.jpg
diff --git a/boards/beaglebone/black/media/image11.jpg b/boards/beaglebone/black/images/image11.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image11.jpg
rename to boards/beaglebone/black/images/image11.jpg
diff --git a/boards/beaglebone/black/media/image12.jpg b/boards/beaglebone/black/images/image12.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image12.jpg
rename to boards/beaglebone/black/images/image12.jpg
diff --git a/boards/beaglebone/black/media/image13.jpg b/boards/beaglebone/black/images/image13.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image13.jpg
rename to boards/beaglebone/black/images/image13.jpg
diff --git a/boards/beaglebone/black/media/image14.jpg b/boards/beaglebone/black/images/image14.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image14.jpg
rename to boards/beaglebone/black/images/image14.jpg
diff --git a/boards/beaglebone/black/media/image16.jpg b/boards/beaglebone/black/images/image16.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image16.jpg
rename to boards/beaglebone/black/images/image16.jpg
diff --git a/boards/beaglebone/black/media/image17.jpg b/boards/beaglebone/black/images/image17.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image17.jpg
rename to boards/beaglebone/black/images/image17.jpg
diff --git a/boards/beaglebone/black/media/image18.jpg b/boards/beaglebone/black/images/image18.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image18.jpg
rename to boards/beaglebone/black/images/image18.jpg
diff --git a/boards/beaglebone/black/media/image2.jpg b/boards/beaglebone/black/images/image2.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image2.jpg
rename to boards/beaglebone/black/images/image2.jpg
diff --git a/boards/beaglebone/black/media/image24.jpg b/boards/beaglebone/black/images/image24.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image24.jpg
rename to boards/beaglebone/black/images/image24.jpg
diff --git a/boards/beaglebone/black/media/image25.jpg b/boards/beaglebone/black/images/image25.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image25.jpg
rename to boards/beaglebone/black/images/image25.jpg
diff --git a/boards/beaglebone/black/media/image26.jpg b/boards/beaglebone/black/images/image26.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image26.jpg
rename to boards/beaglebone/black/images/image26.jpg
diff --git a/boards/beaglebone/black/media/image27.jpg b/boards/beaglebone/black/images/image27.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image27.jpg
rename to boards/beaglebone/black/images/image27.jpg
diff --git a/boards/beaglebone/black/media/image28.jpg b/boards/beaglebone/black/images/image28.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image28.jpg
rename to boards/beaglebone/black/images/image28.jpg
diff --git a/boards/beaglebone/black/media/image29.jpg b/boards/beaglebone/black/images/image29.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image29.jpg
rename to boards/beaglebone/black/images/image29.jpg
diff --git a/boards/beaglebone/black/media/image30.jpg b/boards/beaglebone/black/images/image30.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image30.jpg
rename to boards/beaglebone/black/images/image30.jpg
diff --git a/boards/beaglebone/black/media/image31.png b/boards/beaglebone/black/images/image31.png
similarity index 100%
rename from boards/beaglebone/black/media/image31.png
rename to boards/beaglebone/black/images/image31.png
diff --git a/boards/beaglebone/black/media/image37.png b/boards/beaglebone/black/images/image37.png
similarity index 100%
rename from boards/beaglebone/black/media/image37.png
rename to boards/beaglebone/black/images/image37.png
diff --git a/boards/beaglebone/black/media/image38.png b/boards/beaglebone/black/images/image38.png
similarity index 100%
rename from boards/beaglebone/black/media/image38.png
rename to boards/beaglebone/black/images/image38.png
diff --git a/boards/beaglebone/black/media/image39.jpg b/boards/beaglebone/black/images/image39.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image39.jpg
rename to boards/beaglebone/black/images/image39.jpg
diff --git a/boards/beaglebone/black/media/image40.png b/boards/beaglebone/black/images/image40.png
similarity index 100%
rename from boards/beaglebone/black/media/image40.png
rename to boards/beaglebone/black/images/image40.png
diff --git a/boards/beaglebone/black/media/image41.png b/boards/beaglebone/black/images/image41.png
similarity index 100%
rename from boards/beaglebone/black/media/image41.png
rename to boards/beaglebone/black/images/image41.png
diff --git a/boards/beaglebone/black/media/image42.jpg b/boards/beaglebone/black/images/image42.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image42.jpg
rename to boards/beaglebone/black/images/image42.jpg
diff --git a/boards/beaglebone/black/media/image43.png b/boards/beaglebone/black/images/image43.png
similarity index 100%
rename from boards/beaglebone/black/media/image43.png
rename to boards/beaglebone/black/images/image43.png
diff --git a/boards/beaglebone/black/media/image44.png b/boards/beaglebone/black/images/image44.png
similarity index 100%
rename from boards/beaglebone/black/media/image44.png
rename to boards/beaglebone/black/images/image44.png
diff --git a/boards/beaglebone/black/media/image45.png b/boards/beaglebone/black/images/image45.png
similarity index 100%
rename from boards/beaglebone/black/media/image45.png
rename to boards/beaglebone/black/images/image45.png
diff --git a/boards/beaglebone/black/media/image46.png b/boards/beaglebone/black/images/image46.png
similarity index 100%
rename from boards/beaglebone/black/media/image46.png
rename to boards/beaglebone/black/images/image46.png
diff --git a/boards/beaglebone/black/media/image47.jpg b/boards/beaglebone/black/images/image47.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image47.jpg
rename to boards/beaglebone/black/images/image47.jpg
diff --git a/boards/beaglebone/black/media/image48.png b/boards/beaglebone/black/images/image48.png
similarity index 100%
rename from boards/beaglebone/black/media/image48.png
rename to boards/beaglebone/black/images/image48.png
diff --git a/boards/beaglebone/black/media/image49.png b/boards/beaglebone/black/images/image49.png
similarity index 100%
rename from boards/beaglebone/black/media/image49.png
rename to boards/beaglebone/black/images/image49.png
diff --git a/boards/beaglebone/black/media/image50.png b/boards/beaglebone/black/images/image50.png
similarity index 100%
rename from boards/beaglebone/black/media/image50.png
rename to boards/beaglebone/black/images/image50.png
diff --git a/boards/beaglebone/black/media/image51.png b/boards/beaglebone/black/images/image51.png
similarity index 100%
rename from boards/beaglebone/black/media/image51.png
rename to boards/beaglebone/black/images/image51.png
diff --git a/boards/beaglebone/black/media/image52.png b/boards/beaglebone/black/images/image52.png
similarity index 100%
rename from boards/beaglebone/black/media/image52.png
rename to boards/beaglebone/black/images/image52.png
diff --git a/boards/beaglebone/black/media/image53.png b/boards/beaglebone/black/images/image53.png
similarity index 100%
rename from boards/beaglebone/black/media/image53.png
rename to boards/beaglebone/black/images/image53.png
diff --git a/boards/beaglebone/black/media/image54.jpg b/boards/beaglebone/black/images/image54.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image54.jpg
rename to boards/beaglebone/black/images/image54.jpg
diff --git a/boards/beaglebone/black/media/image55.png b/boards/beaglebone/black/images/image55.png
similarity index 100%
rename from boards/beaglebone/black/media/image55.png
rename to boards/beaglebone/black/images/image55.png
diff --git a/boards/beaglebone/black/media/image56.png b/boards/beaglebone/black/images/image56.png
similarity index 100%
rename from boards/beaglebone/black/media/image56.png
rename to boards/beaglebone/black/images/image56.png
diff --git a/boards/beaglebone/black/media/image57.png b/boards/beaglebone/black/images/image57.png
similarity index 100%
rename from boards/beaglebone/black/media/image57.png
rename to boards/beaglebone/black/images/image57.png
diff --git a/boards/beaglebone/black/media/image58.png b/boards/beaglebone/black/images/image58.png
similarity index 100%
rename from boards/beaglebone/black/media/image58.png
rename to boards/beaglebone/black/images/image58.png
diff --git a/boards/beaglebone/black/media/image59.png b/boards/beaglebone/black/images/image59.png
similarity index 100%
rename from boards/beaglebone/black/media/image59.png
rename to boards/beaglebone/black/images/image59.png
diff --git a/boards/beaglebone/black/media/image60.png b/boards/beaglebone/black/images/image60.png
similarity index 100%
rename from boards/beaglebone/black/media/image60.png
rename to boards/beaglebone/black/images/image60.png
diff --git a/boards/beaglebone/black/media/image64.png b/boards/beaglebone/black/images/image64.png
similarity index 100%
rename from boards/beaglebone/black/media/image64.png
rename to boards/beaglebone/black/images/image64.png
diff --git a/boards/beaglebone/black/media/image65.png b/boards/beaglebone/black/images/image65.png
similarity index 100%
rename from boards/beaglebone/black/media/image65.png
rename to boards/beaglebone/black/images/image65.png
diff --git a/boards/beaglebone/black/media/image66.png b/boards/beaglebone/black/images/image66.png
similarity index 100%
rename from boards/beaglebone/black/media/image66.png
rename to boards/beaglebone/black/images/image66.png
diff --git a/boards/beaglebone/black/media/image67.png b/boards/beaglebone/black/images/image67.png
similarity index 100%
rename from boards/beaglebone/black/media/image67.png
rename to boards/beaglebone/black/images/image67.png
diff --git a/boards/beaglebone/black/media/image68.jpg b/boards/beaglebone/black/images/image68.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image68.jpg
rename to boards/beaglebone/black/images/image68.jpg
diff --git a/boards/beaglebone/black/media/image69.jpg b/boards/beaglebone/black/images/image69.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image69.jpg
rename to boards/beaglebone/black/images/image69.jpg
diff --git a/boards/beaglebone/black/media/image7.jpg b/boards/beaglebone/black/images/image7.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image7.jpg
rename to boards/beaglebone/black/images/image7.jpg
diff --git a/boards/beaglebone/black/media/image71.jpg b/boards/beaglebone/black/images/image71.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image71.jpg
rename to boards/beaglebone/black/images/image71.jpg
diff --git a/boards/beaglebone/black/media/image73.jpg b/boards/beaglebone/black/images/image73.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image73.jpg
rename to boards/beaglebone/black/images/image73.jpg
diff --git a/boards/beaglebone/black/media/image75.jpg b/boards/beaglebone/black/images/image75.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image75.jpg
rename to boards/beaglebone/black/images/image75.jpg
diff --git a/boards/beaglebone/black/media/image77.jpg b/boards/beaglebone/black/images/image77.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image77.jpg
rename to boards/beaglebone/black/images/image77.jpg
diff --git a/boards/beaglebone/black/media/image78.png b/boards/beaglebone/black/images/image78.png
similarity index 100%
rename from boards/beaglebone/black/media/image78.png
rename to boards/beaglebone/black/images/image78.png
diff --git a/boards/beaglebone/black/media/image79.png b/boards/beaglebone/black/images/image79.png
similarity index 100%
rename from boards/beaglebone/black/media/image79.png
rename to boards/beaglebone/black/images/image79.png
diff --git a/boards/beaglebone/black/media/image8.jpg b/boards/beaglebone/black/images/image8.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image8.jpg
rename to boards/beaglebone/black/images/image8.jpg
diff --git a/boards/beaglebone/black/media/image80.png b/boards/beaglebone/black/images/image80.png
similarity index 100%
rename from boards/beaglebone/black/media/image80.png
rename to boards/beaglebone/black/images/image80.png
diff --git a/boards/beaglebone/black/media/image81.jpg b/boards/beaglebone/black/images/image81.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image81.jpg
rename to boards/beaglebone/black/images/image81.jpg
diff --git a/boards/beaglebone/black/media/image82.jpg b/boards/beaglebone/black/images/image82.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image82.jpg
rename to boards/beaglebone/black/images/image82.jpg
diff --git a/boards/beaglebone/black/media/image83.jpg b/boards/beaglebone/black/images/image83.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image83.jpg
rename to boards/beaglebone/black/images/image83.jpg
diff --git a/boards/beaglebone/black/media/image84.jpg b/boards/beaglebone/black/images/image84.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image84.jpg
rename to boards/beaglebone/black/images/image84.jpg
diff --git a/boards/beaglebone/black/media/image85.jpg b/boards/beaglebone/black/images/image85.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image85.jpg
rename to boards/beaglebone/black/images/image85.jpg
diff --git a/boards/beaglebone/black/media/image86.jpg b/boards/beaglebone/black/images/image86.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image86.jpg
rename to boards/beaglebone/black/images/image86.jpg
diff --git a/boards/beaglebone/black/media/image87.jpg b/boards/beaglebone/black/images/image87.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image87.jpg
rename to boards/beaglebone/black/images/image87.jpg
diff --git a/boards/beaglebone/black/media/image88.jpg b/boards/beaglebone/black/images/image88.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image88.jpg
rename to boards/beaglebone/black/images/image88.jpg
diff --git a/boards/beaglebone/black/media/image89.jpg b/boards/beaglebone/black/images/image89.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image89.jpg
rename to boards/beaglebone/black/images/image89.jpg
diff --git a/boards/beaglebone/black/media/image9.jpg b/boards/beaglebone/black/images/image9.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image9.jpg
rename to boards/beaglebone/black/images/image9.jpg
diff --git a/boards/beaglebone/black/media/image90.jpg b/boards/beaglebone/black/images/image90.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image90.jpg
rename to boards/beaglebone/black/images/image90.jpg
diff --git a/boards/beaglebone/black/media/image91.jpg b/boards/beaglebone/black/images/image91.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image91.jpg
rename to boards/beaglebone/black/images/image91.jpg
diff --git a/boards/beaglebone/black/media/image92.jpg b/boards/beaglebone/black/images/image92.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image92.jpg
rename to boards/beaglebone/black/images/image92.jpg
diff --git a/boards/beaglebone/black/media/image93.jpg b/boards/beaglebone/black/images/image93.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image93.jpg
rename to boards/beaglebone/black/images/image93.jpg
diff --git a/boards/beaglebone/black/media/image94.jpg b/boards/beaglebone/black/images/image94.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image94.jpg
rename to boards/beaglebone/black/images/image94.jpg
diff --git a/boards/beaglebone/black/media/image95.jpg b/boards/beaglebone/black/images/image95.jpg
similarity index 100%
rename from boards/beaglebone/black/media/image95.jpg
rename to boards/beaglebone/black/images/image95.jpg
diff --git a/boards/beaglebone/black/media/image96.png b/boards/beaglebone/black/images/image96.png
similarity index 100%
rename from boards/beaglebone/black/media/image96.png
rename to boards/beaglebone/black/images/image96.png
diff --git a/boards/beaglebone/black/media/image97.png b/boards/beaglebone/black/images/image97.png
similarity index 100%
rename from boards/beaglebone/black/media/image97.png
rename to boards/beaglebone/black/images/image97.png
diff --git a/boards/beaglebone/black/index.rst b/boards/beaglebone/black/index.rst
index b73b13efd2a0fd8bcaea64342c4d75ad5a605837..188d79bc273b0d4bced35cb87a4dc2a33ad29499 100644
--- a/boards/beaglebone/black/index.rst
+++ b/boards/beaglebone/black/index.rst
@@ -27,7 +27,7 @@ Boot Linux in under 10 seconds and get started on development in less than 5 min
             * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-black>`__
             * For export, emissions and other compliance, see :ref:`beagleboneblack-support`
 
-.. image:: media/image1.jpg
+.. image:: images/image1.jpg
    :width: 598
    :align: center
    :alt: BeagleBone Black
diff --git a/boards/beaglebone/blue/media/BeagleBone_Blue_pinouts.jpg b/boards/beaglebone/blue/images/BeagleBone_Blue_pinouts.jpg
similarity index 100%
rename from boards/beaglebone/blue/media/BeagleBone_Blue_pinouts.jpg
rename to boards/beaglebone/blue/images/BeagleBone_Blue_pinouts.jpg
diff --git a/boards/beaglebone/blue/media/BeagleBone_Blue_pinouts.webp b/boards/beaglebone/blue/images/BeagleBone_Blue_pinouts.webp
similarity index 100%
rename from boards/beaglebone/blue/media/BeagleBone_Blue_pinouts.webp
rename to boards/beaglebone/blue/images/BeagleBone_Blue_pinouts.webp
diff --git a/boards/beaglebone/blue/media/OSHW_mark_US000064.svg b/boards/beaglebone/blue/images/OSHW_mark_US000064.svg
similarity index 100%
rename from boards/beaglebone/blue/media/OSHW_mark_US000064.svg
rename to boards/beaglebone/blue/images/OSHW_mark_US000064.svg
diff --git a/boards/beaglebone/blue/media/pinout.jpg b/boards/beaglebone/blue/images/pinout.jpg
similarity index 100%
rename from boards/beaglebone/blue/media/pinout.jpg
rename to boards/beaglebone/blue/images/pinout.jpg
diff --git a/boards/beaglebone/blue/index.rst b/boards/beaglebone/blue/index.rst
index 972b22b9915d2f09e2f958a9c78282bb7160e73c..2735f3462a0f9acf855f7dda8791d2546b895051 100644
--- a/boards/beaglebone/blue/index.rst
+++ b/boards/beaglebone/blue/index.rst
@@ -20,7 +20,7 @@ and of course the `BeagleBoard.org Foundation <https://beagleboard.org/about>`_.
     .. grid-item::
         :columns: 12 12 12 4
 
-        .. figure:: media/OSHW_mark_US000064.*
+        .. figure:: images/OSHW_mark_US000064.*
             :width: 200
             :target: https://certification.oshwa.org/us000064.html
             :alt: BeagleBone Blue OSHW Mark
diff --git a/boards/beaglebone/blue/media/OSHW_mark_US000064.png b/boards/beaglebone/blue/media/OSHW_mark_US000064.png
deleted file mode 100644
index 3699d951f96d16b00929b4890dfbcc639c5d2f9a..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/blue/media/OSHW_mark_US000064.png and /dev/null differ
diff --git a/boards/beaglebone/blue/media/OSHW_mark_US000064.webp b/boards/beaglebone/blue/media/OSHW_mark_US000064.webp
deleted file mode 100644
index 50e237457f5c42c652c2c63f9e7d04951f154e1e..0000000000000000000000000000000000000000
Binary files a/boards/beaglebone/blue/media/OSHW_mark_US000064.webp and /dev/null differ
diff --git a/boards/beaglebone/blue/pinouts.rst b/boards/beaglebone/blue/pinouts.rst
index 4177964f98c5071b21c4839240b285a2ed4436ad..1788f3d6756166b22a57780efab4d90c377fe52d 100644
--- a/boards/beaglebone/blue/pinouts.rst
+++ b/boards/beaglebone/blue/pinouts.rst
@@ -4,10 +4,10 @@
 BeagleBone Blue Pinouts 
 #########################
 
-.. image:: media/BeagleBone_Blue_pinouts.*
+.. image:: images/BeagleBone_Blue_pinouts.*
    :align: center
 
-.. image:: media/pinout.jpg
+.. image:: images/pinout.jpg
    :align: center
 
 -  Connector pinout
diff --git a/boards/beagleconnect/freedom/01-introduction.rst b/boards/beagleconnect/freedom/01-introduction.rst
index 0abb9e80b6f02c442cf6379eb5ca30f5f95214c7..1367634b61c79e6be03236456632fe28ff087b3c 100644
--- a/boards/beagleconnect/freedom/01-introduction.rst
+++ b/boards/beagleconnect/freedom/01-introduction.rst
@@ -22,13 +22,13 @@ and is the first available BeagleConnectâ„¢ solution. It features:
    :widths: auto
 
    +----------------------------------------------------------------+---------------------------------------------------------------+
-   | .. image:: media/BeagleConnect-Freedom-Front-Annotated-wbg.*   | .. image:: media/BeagleConnect-Freedom-Back-Annotated-wbg.*   |
+   | .. image:: images/BeagleConnect-Freedom-Front-Annotated-wbg.*  | .. image:: images/BeagleConnect-Freedom-Back-Annotated-wbg.*  |
    |    :width: 700                                                 |       :width: 700                                             |
    |    :align: center                                              |       :align: center                                          |
    |    :alt: BeagleConnect Freedom front pinout diagram            |       :alt: BeagleConnect Freedom Back Annotated              |
    +----------------------------------------------------------------+---------------------------------------------------------------+
 
-.. image:: media/BeagleConnect-Freedom-with-case.*
+.. image:: images/BeagleConnect-Freedom-with-case.*
   :align: center
   :alt: BeagleConnectâ„¢ Freedom board
 
diff --git a/boards/beagleconnect/freedom/02-quick-start.rst b/boards/beagleconnect/freedom/02-quick-start.rst
index 886fe178e343922fd1e8b404931173624bd03aff..db050cf4d667bd105a6b9a8655397577b0f6686b 100644
--- a/boards/beagleconnect/freedom/02-quick-start.rst
+++ b/boards/beagleconnect/freedom/02-quick-start.rst
@@ -27,7 +27,7 @@ To connect the SubGHz antenna with SMA connector to the BeagleConnect Freedom
 you just have to align, place and rotate the antenna clockwise as shown in the 
 image below. To detach the antenna just twist it anti-clockwise.
 
-.. figure:: media/BeagleConnect-Freedom-antenna-connection.*
+.. figure:: images/BeagleConnect-Freedom-antenna-connection.*
    :align: center
    :width: 1247
 
diff --git a/boards/beagleconnect/freedom/03-design.rst b/boards/beagleconnect/freedom/03-design.rst
index ac52889e4989e4589a85de25ccc0efd2f5b089a1..d420f42f77531588e93ba7106212dfdff4c8f419 100644
--- a/boards/beagleconnect/freedom/03-design.rst
+++ b/boards/beagleconnect/freedom/03-design.rst
@@ -16,7 +16,7 @@ Detailed hardware design
 LEDs
 =====
 
-.. figure:: media/hardware-design/LEDs.svg
+.. figure:: images/hardware-design/LEDs.svg
     :width: 1247
     :align: center
     :alt: BeagleConnect LEDs
@@ -26,7 +26,7 @@ LEDs
 Buttons & Buzzer
 =================
 
-.. figure:: media/hardware-design/UserInputOutput.svg
+.. figure:: images/hardware-design/UserInputOutput.svg
     :width: 1247
     :align: center
     :alt: User Input Output (Buttons & Buzzer)
@@ -36,7 +36,7 @@ Buttons & Buzzer
 Sensors
 =========
 
-.. figure:: media/hardware-design/sensors.svg
+.. figure:: images/hardware-design/sensors.svg
     :width: 1247
     :align: center
     :alt: On-board sesnsors
@@ -46,7 +46,7 @@ Sensors
 mikroBUS
 =========
 
-.. figure:: media/hardware-design/mikroBUS.svg
+.. figure:: images/hardware-design/mikroBUS.svg
     :width: 1247
     :align: center
     :alt: mikroBUS ports
@@ -56,7 +56,7 @@ mikroBUS
 USB-C port
 ==========
 
-.. figure:: media/hardware-design/USB.svg
+.. figure:: images/hardware-design/USB.svg
     :width: 1247
     :align: center
     :alt: USB-C for power & programming
@@ -66,7 +66,7 @@ USB-C port
 Buck converter
 ===============
 
-.. figure:: media/hardware-design/BuckConverter.svg
+.. figure:: images/hardware-design/BuckConverter.svg
     :width: 1247
     :align: center
     :alt: BuckConverter (3.3V output)
@@ -76,7 +76,7 @@ Buck converter
 LiPo battery charger
 ====================
 
-.. figure:: media/hardware-design/LiPoCharger.svg
+.. figure:: images/hardware-design/LiPoCharger.svg
     :width: 1247
     :align: center
     :alt: 4.2V LiPo battery charger
@@ -86,7 +86,7 @@ LiPo battery charger
 Battery input protection
 ========================
 
-.. figure:: media/hardware-design/AltPower.svg
+.. figure:: images/hardware-design/AltPower.svg
     :width: 1247
     :align: center
     :alt: LiPo battery input protection
@@ -96,7 +96,7 @@ Battery input protection
 MSP430F5503
 ===========
 
-.. figure:: media/hardware-design/MSP430.svg
+.. figure:: images/hardware-design/MSP430.svg
     :width: 1247
     :align: center
     :alt: MSP430F5503 (USB to UART & mikroBUS)
@@ -109,7 +109,7 @@ CC1352P7
 Digital subsection
 -------------------
 
-.. figure:: media/hardware-design/CC1352DigitalSubsection.svg
+.. figure:: images/hardware-design/CC1352DigitalSubsection.svg
     :width: 1247
     :align: center
     :alt: CC1352P7 Digital subsection
@@ -119,7 +119,7 @@ Digital subsection
 Analog subsection
 ------------------
 
-.. figure:: media/hardware-design/CC1352AnalogSubsection.svg
+.. figure:: images/hardware-design/CC1352AnalogSubsection.svg
     :width: 1247
     :align: center
     :alt: CC1352P7 Analog subsection
@@ -129,7 +129,7 @@ Analog subsection
 Power subsection
 -----------------
 
-.. figure:: media/hardware-design/CC1352PowerSubsection.svg
+.. figure:: images/hardware-design/CC1352PowerSubsection.svg
     :width: 1247
     :align: center
     :alt: CC1352P7 Power subsection
@@ -139,7 +139,7 @@ Power subsection
 RF subsection
 --------------
 
-.. figure:: media/hardware-design/CC1352RFSubsection.svg
+.. figure:: images/hardware-design/CC1352RFSubsection.svg
     :width: 1247
     :align: center
     :alt: CC1352P7 RF subsection
@@ -149,7 +149,7 @@ RF subsection
 SPI Flash
 ==========
 
-.. figure:: media/hardware-design/SPIFlash.svg
+.. figure:: images/hardware-design/SPIFlash.svg
     :width: 1247
     :align: center
     :alt: SPIFlash
@@ -159,7 +159,7 @@ SPI Flash
 Debug interface
 ================
 
-.. figure:: media/hardware-design/TagConnect.svg
+.. figure:: images/hardware-design/TagConnect.svg
     :width: 1247
     :align: center
     :alt: CC1352P7 & MSP430F5503 TagConnect
diff --git a/boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep1.jpg b/boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep1.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep1.jpg
rename to boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep1.jpg
diff --git a/boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep2.jpg b/boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep2.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep2.jpg
rename to boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep2.jpg
diff --git a/boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep3.jpg b/boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep3.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/demos-and-tutorials/media/ProvStep3.jpg
rename to boards/beagleconnect/freedom/demos-and-tutorials/images/ProvStep3.jpg
diff --git a/boards/beagleconnect/freedom/demos-and-tutorials/using-greybus.rst b/boards/beagleconnect/freedom/demos-and-tutorials/using-greybus.rst
index 6336ea469cfb56ad831ae61003356e7e56dd2771..3145329771485ce871c2744300e31b9ad95aea2c 100644
--- a/boards/beagleconnect/freedom/demos-and-tutorials/using-greybus.rst
+++ b/boards/beagleconnect/freedom/demos-and-tutorials/using-greybus.rst
@@ -12,7 +12,7 @@ BeagleConnect wireless user experience
 
 Enable a Linux host with BeagleConnect
 =======================================
-.. image:: media/ProvStep1.jpg
+.. image:: images/ProvStep1.jpg
    :width: 600
    :align: center
    :height: 400
@@ -37,7 +37,7 @@ with a sensor, actuator or indicator device connected.
 Connect host and device
 =======================
 
-.. image:: media/ProvStep2.jpg
+.. image:: images/ProvStep2.jpg
    :width: 600
    :align: center
    :height: 400
@@ -49,7 +49,7 @@ button(s).
 Device data shows up as files
 =============================
 
-.. image:: media/ProvStep3.jpg
+.. image:: images/ProvStep3.jpg
    :width: 600
    :align: center
    :height: 400
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Boards-Angled.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Boards-Angled.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Boards-Angled.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Boards-Angled.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Boards-Angled.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Boards-Angled.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Boards-Angled.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Boards-Angled.webp
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back-Annotated-wbg.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back-Annotated-wbg.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back-Annotated-wbg.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back-Annotated-wbg.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back-Annotated-wbg.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back-Annotated-wbg.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back-Annotated-wbg.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back-Annotated-wbg.webp
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back.png b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back.png
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Back.png
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Back.png
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Block-Diagram.png b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Block-Diagram.png
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Block-Diagram.png
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Block-Diagram.png
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front-Annotated-wbg.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front-Annotated-wbg.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front-Annotated-wbg.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front-Annotated-wbg.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front-Annotated-wbg.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front-Annotated-wbg.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front-Annotated-wbg.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front-Annotated-wbg.webp
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front.png b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front.png
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Front.png
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Front.png
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Hand.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Hand.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Hand.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Hand.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Hand.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Hand.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-Hand.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-Hand.webp
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-antenna-connection.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-antenna-connection.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-antenna-connection.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-antenna-connection.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-antenna-connection.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-antenna-connection.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-antenna-connection.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-antenna-connection.webp
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-with-case.jpg b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-with-case.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-with-case.jpg
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-with-case.jpg
diff --git a/boards/beagleconnect/freedom/media/BeagleConnect-Freedom-with-case.webp b/boards/beagleconnect/freedom/images/BeagleConnect-Freedom-with-case.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/BeagleConnect-Freedom-with-case.webp
rename to boards/beagleconnect/freedom/images/BeagleConnect-Freedom-with-case.webp
diff --git a/boards/beagleconnect/freedom/media/OSHW_mark_US002175.svg b/boards/beagleconnect/freedom/images/OSHW_mark_US002175.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/OSHW_mark_US002175.svg
rename to boards/beagleconnect/freedom/images/OSHW_mark_US002175.svg
diff --git a/boards/beagleconnect/freedom/media/bb-code-server-closeup.webp b/boards/beagleconnect/freedom/images/bb-code-server-closeup.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/bb-code-server-closeup.webp
rename to boards/beagleconnect/freedom/images/bb-code-server-closeup.webp
diff --git a/boards/beagleconnect/freedom/media/bb-code-server-terminal.webp b/boards/beagleconnect/freedom/images/bb-code-server-terminal.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/bb-code-server-terminal.webp
rename to boards/beagleconnect/freedom/images/bb-code-server-terminal.webp
diff --git a/boards/beagleconnect/freedom/media/bb-code-server.webp b/boards/beagleconnect/freedom/images/bb-code-server.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/bb-code-server.webp
rename to boards/beagleconnect/freedom/images/bb-code-server.webp
diff --git a/boards/beagleconnect/freedom/media/beagleconnect_freedom_annotated.webp b/boards/beagleconnect/freedom/images/beagleconnect_freedom_annotated.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/beagleconnect_freedom_annotated.webp
rename to boards/beagleconnect/freedom/images/beagleconnect_freedom_annotated.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/01-introduction.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/01-introduction.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/01-introduction.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/01-introduction.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/02-quick-start.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/02-quick-start.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/02-quick-start.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/02-quick-start.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/03-design-and-specifications.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/03-design-and-specifications.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/03-design-and-specifications.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/03-design-and-specifications.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/04-connectors-and-pinouts.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/04-connectors-and-pinouts.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/04-connectors-and-pinouts.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/04-connectors-and-pinouts.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/05-demos-and-tutorials.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/05-demos-and-tutorials.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/05-demos-and-tutorials.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/05-demos-and-tutorials.webp
diff --git a/boards/beagleconnect/freedom/media/chapter-thumbnails/06-support-documents.webp b/boards/beagleconnect/freedom/images/chapter-thumbnails/06-support-documents.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/chapter-thumbnails/06-support-documents.webp
rename to boards/beagleconnect/freedom/images/chapter-thumbnails/06-support-documents.webp
diff --git a/boards/beagleconnect/freedom/media/hardware-design/AltPower.svg b/boards/beagleconnect/freedom/images/hardware-design/AltPower.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/AltPower.svg
rename to boards/beagleconnect/freedom/images/hardware-design/AltPower.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/BuckConverter.svg b/boards/beagleconnect/freedom/images/hardware-design/BuckConverter.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/BuckConverter.svg
rename to boards/beagleconnect/freedom/images/hardware-design/BuckConverter.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/CC1352AnalogSubsection.svg b/boards/beagleconnect/freedom/images/hardware-design/CC1352AnalogSubsection.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/CC1352AnalogSubsection.svg
rename to boards/beagleconnect/freedom/images/hardware-design/CC1352AnalogSubsection.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/CC1352DigitalSubsection.svg b/boards/beagleconnect/freedom/images/hardware-design/CC1352DigitalSubsection.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/CC1352DigitalSubsection.svg
rename to boards/beagleconnect/freedom/images/hardware-design/CC1352DigitalSubsection.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/CC1352PowerSubsection.svg b/boards/beagleconnect/freedom/images/hardware-design/CC1352PowerSubsection.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/CC1352PowerSubsection.svg
rename to boards/beagleconnect/freedom/images/hardware-design/CC1352PowerSubsection.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/CC1352RFSubsection.svg b/boards/beagleconnect/freedom/images/hardware-design/CC1352RFSubsection.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/CC1352RFSubsection.svg
rename to boards/beagleconnect/freedom/images/hardware-design/CC1352RFSubsection.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/LEDs.svg b/boards/beagleconnect/freedom/images/hardware-design/LEDs.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/LEDs.svg
rename to boards/beagleconnect/freedom/images/hardware-design/LEDs.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/LiPoCharger.svg b/boards/beagleconnect/freedom/images/hardware-design/LiPoCharger.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/LiPoCharger.svg
rename to boards/beagleconnect/freedom/images/hardware-design/LiPoCharger.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/MSP430.svg b/boards/beagleconnect/freedom/images/hardware-design/MSP430.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/MSP430.svg
rename to boards/beagleconnect/freedom/images/hardware-design/MSP430.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/SPIFlash.svg b/boards/beagleconnect/freedom/images/hardware-design/SPIFlash.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/SPIFlash.svg
rename to boards/beagleconnect/freedom/images/hardware-design/SPIFlash.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/TagConnect.svg b/boards/beagleconnect/freedom/images/hardware-design/TagConnect.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/TagConnect.svg
rename to boards/beagleconnect/freedom/images/hardware-design/TagConnect.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/USB.svg b/boards/beagleconnect/freedom/images/hardware-design/USB.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/USB.svg
rename to boards/beagleconnect/freedom/images/hardware-design/USB.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/UserInputOutput.svg b/boards/beagleconnect/freedom/images/hardware-design/UserInputOutput.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/UserInputOutput.svg
rename to boards/beagleconnect/freedom/images/hardware-design/UserInputOutput.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/mikroBUS.svg b/boards/beagleconnect/freedom/images/hardware-design/mikroBUS.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/mikroBUS.svg
rename to boards/beagleconnect/freedom/images/hardware-design/mikroBUS.svg
diff --git a/boards/beagleconnect/freedom/media/hardware-design/sensors.svg b/boards/beagleconnect/freedom/images/hardware-design/sensors.svg
similarity index 100%
rename from boards/beagleconnect/freedom/media/hardware-design/sensors.svg
rename to boards/beagleconnect/freedom/images/hardware-design/sensors.svg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45-font.jpg b/boards/beagleconnect/freedom/images/product-pictures/45-font.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45-font.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/45-font.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45-font.webp b/boards/beagleconnect/freedom/images/product-pictures/45-font.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45-font.webp
rename to boards/beagleconnect/freedom/images/product-pictures/45-font.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45-frontall.jpg b/boards/beagleconnect/freedom/images/product-pictures/45-frontall.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45-frontall.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/45-frontall.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45-frontall.webp b/boards/beagleconnect/freedom/images/product-pictures/45-frontall.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45-frontall.webp
rename to boards/beagleconnect/freedom/images/product-pictures/45-frontall.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45back.jpg b/boards/beagleconnect/freedom/images/product-pictures/45back.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45back.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/45back.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/45back.webp b/boards/beagleconnect/freedom/images/product-pictures/45back.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/45back.webp
rename to boards/beagleconnect/freedom/images/product-pictures/45back.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/back-1.jpg b/boards/beagleconnect/freedom/images/product-pictures/back-1.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/back-1.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/back-1.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/back-1.webp b/boards/beagleconnect/freedom/images/product-pictures/back-1.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/back-1.webp
rename to boards/beagleconnect/freedom/images/product-pictures/back-1.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/back.jpg b/boards/beagleconnect/freedom/images/product-pictures/back.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/back.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/back.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/back.webp b/boards/beagleconnect/freedom/images/product-pictures/back.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/back.webp
rename to boards/beagleconnect/freedom/images/product-pictures/back.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/bcf-front.jpg b/boards/beagleconnect/freedom/images/product-pictures/bcf-front.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/bcf-front.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/bcf-front.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/bcf-front.webp b/boards/beagleconnect/freedom/images/product-pictures/bcf-front.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/bcf-front.webp
rename to boards/beagleconnect/freedom/images/product-pictures/bcf-front.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/bcf-front1.jpg b/boards/beagleconnect/freedom/images/product-pictures/bcf-front1.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/bcf-front1.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/bcf-front1.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/bcf-front1.png b/boards/beagleconnect/freedom/images/product-pictures/bcf-front1.png
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/bcf-front1.png
rename to boards/beagleconnect/freedom/images/product-pictures/bcf-front1.png
diff --git a/boards/beagleconnect/freedom/media/product-pictures/bcf-front1.webp b/boards/beagleconnect/freedom/images/product-pictures/bcf-front1.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/bcf-front1.webp
rename to boards/beagleconnect/freedom/images/product-pictures/bcf-front1.webp
diff --git a/boards/beagleconnect/freedom/media/product-pictures/feature.jpg b/boards/beagleconnect/freedom/images/product-pictures/feature.jpg
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/feature.jpg
rename to boards/beagleconnect/freedom/images/product-pictures/feature.jpg
diff --git a/boards/beagleconnect/freedom/media/product-pictures/feature.webp b/boards/beagleconnect/freedom/images/product-pictures/feature.webp
similarity index 100%
rename from boards/beagleconnect/freedom/media/product-pictures/feature.webp
rename to boards/beagleconnect/freedom/images/product-pictures/feature.webp
diff --git a/boards/beagleconnect/freedom/index.rst b/boards/beagleconnect/freedom/index.rst
index e1c4c218d92befad632f83cf3d1bf16395d047c9..dacd4a174204db254deb29c6b58bfd4de96351d8 100644
--- a/boards/beagleconnect/freedom/index.rst
+++ b/boards/beagleconnect/freedom/index.rst
@@ -12,7 +12,7 @@ battery charger, buzzer, LEDs, and JTAG connections to make it a comprehensive s
 The TI CC1352P7 microcontroller (MCU) includes a 48-MHz Arm Cortex-M4F processor, 704KB Flash memory, 256KB ROM, 8KB Cache SRAM, 144KB of ultra-low leakage SRAM, and
 over-the-air upgrades (OTA) capability. This MCU provides flexible support for many different protocols and bands making it suitable for many different communication requirements.
 
-.. image:: media/BeagleConnect-Freedom-Hand.*
+.. image:: images/BeagleConnect-Freedom-Hand.*
   :align: center
   :alt: BeagleConnectâ„¢ Freedom board
 
@@ -26,7 +26,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
     .. grid-item::
         :columns: 12 12 12 4
 
-         .. figure:: media/OSHW_mark_US002175.*
+         .. figure:: images/OSHW_mark_US002175.*
             :width: 200
             :target: https://certification.oshwa.org/us002175.html
             :alt: BeagleConnectâ„¢ Freedom OSHW Mark
@@ -57,7 +57,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **1. Introduction**
       ^^^
 
-      .. image:: media/chapter-thumbnails/01-introduction.*
+      .. image:: images/chapter-thumbnails/01-introduction.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter1 thumbnail
       
@@ -73,7 +73,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **2. Quick start**
       ^^^
 
-      .. image:: media/chapter-thumbnails/02-quick-start.*
+      .. image:: images/chapter-thumbnails/02-quick-start.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter2 thumbnail
 
@@ -88,7 +88,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **3. Design & Specifications**
       ^^^
 
-      .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+      .. image:: images/chapter-thumbnails/03-design-and-specifications.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter3 thumbnail
 
@@ -104,7 +104,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **4. Expansion**
       ^^^
 
-      .. image:: media/chapter-thumbnails/04-connectors-and-pinouts.*
+      .. image:: images/chapter-thumbnails/04-connectors-and-pinouts.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter4 thumbnail
 
@@ -120,7 +120,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **5. Demos & tutorials**
       ^^^
 
-      .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+      .. image:: images/chapter-thumbnails/05-demos-and-tutorials.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter5 thumbnail
 
@@ -135,7 +135,7 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
       **6. Support**
       ^^^
 
-      .. image:: media/chapter-thumbnails/06-support-documents.*
+      .. image:: images/chapter-thumbnails/06-support-documents.*
          :align: center
          :alt: BeagleConnectâ„¢ Freedom Chapter6 thumbnail
 
diff --git a/boards/beagleconnect/freedom/media/OSHW_mark_US002175.png b/boards/beagleconnect/freedom/media/OSHW_mark_US002175.png
deleted file mode 100644
index 9c4e3ba643d4cde757df137866ffce7805543b8c..0000000000000000000000000000000000000000
Binary files a/boards/beagleconnect/freedom/media/OSHW_mark_US002175.png and /dev/null differ
diff --git a/boards/beagleconnect/freedom/media/OSHW_mark_US002175.webp b/boards/beagleconnect/freedom/media/OSHW_mark_US002175.webp
deleted file mode 100644
index 494f1e69ea54329f191a53efd9b256f54ee5f627..0000000000000000000000000000000000000000
Binary files a/boards/beagleconnect/freedom/media/OSHW_mark_US002175.webp and /dev/null differ
diff --git a/boards/beagleconnect/index.rst b/boards/beagleconnect/index.rst
index 934194c9b96446b50c4a3af94204ac69af0905d8..e30eba3fa2d656a5c5670261f7d78e331e94ea57 100644
--- a/boards/beagleconnect/index.rst
+++ b/boards/beagleconnect/index.rst
@@ -84,7 +84,7 @@ For home automaters, integration into WebThings…
 
    think a bit more about this section with some feedback from Cathy.
 
-.. image:: freedom/media/BeagleConnect-Boards-Angled.*
+.. image:: freedom/images/BeagleConnect-Boards-Angled.*
    :width: 598
    :align: center
    :alt: BeagleConnect Freedom
diff --git a/boards/beaglev/ahead/01-introduction.rst b/boards/beaglev/ahead/01-introduction.rst
index 0810f20cf23a2d4a713fed562db2f9aed30074e8..31304d244d5b227073d4afb80fcaff28384aa8a1 100644
--- a/boards/beaglev/ahead/01-introduction.rst
+++ b/boards/beaglev/ahead/01-introduction.rst
@@ -13,7 +13,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
    :widths: auto
 
    +----------------------------------------------------+---------------------------------------------------------+
-   | .. image:: media/product-pictures/front.*          | .. image:: media/product-pictures/back.*                |
+   | .. image:: images/product-pictures/front.*         | .. image:: images/product-pictures/back.*               |
    |    :width: 700                                     |       :width: 700                                       |
    |    :align: center                                  |       :align: center                                    |
    |    :alt: BeagleV Ahead front                       |       :alt: BeagleV Ahead back                          |
@@ -28,7 +28,7 @@ Choose the cape header to see respective pinout diagram.
 
    .. group-tab:: P8 cape header
 
-        .. figure:: media/pinout/BeagleV-Ahead-P8.*
+        .. figure:: images/pinout/BeagleV-Ahead-P8.*
             :align: center
             :alt: BeagleV Ahead P8 cape header pinout
 
@@ -37,7 +37,7 @@ Choose the cape header to see respective pinout diagram.
 
    .. group-tab:: P9 cape header
 
-        .. figure:: media/pinout/BeagleV-Ahead-P9.*
+        .. figure:: images/pinout/BeagleV-Ahead-P9.*
             :align: center
             :alt: BeagleV Ahead P9 cape header pinout
 
@@ -96,7 +96,7 @@ This section describes the key components on the board, their location and funct
 Front components location
 ==========================
 
-.. figure:: media/components-front.*
+.. figure:: images/components-front.*
     :width: 1400
     :align: center
     :alt: BeagleV Ahead board front components location
@@ -144,7 +144,7 @@ Front components location
 Back components location
 =========================
 
-.. figure:: media/components-back.*
+.. figure:: images/components-back.*
     :width: 1400
     :align: center
     :alt: BeagleV Ahead board back components location
diff --git a/boards/beaglev/ahead/02-quick-start.rst b/boards/beaglev/ahead/02-quick-start.rst
index a4fa41dcb718b738a3c1f3263a10dc03610b877e..31670998a28b0842e7c6e90782c7178d8ca37e3b 100644
--- a/boards/beaglev/ahead/02-quick-start.rst
+++ b/boards/beaglev/ahead/02-quick-start.rst
@@ -13,7 +13,7 @@ When you purchase a brand new BeagleV Ahead, In the box you'll get:
 3. USB super-speed micro-A plug to type-A receptacle cable (for connecting common USB type-A peripherals)
 4. Quick-start card
 
-.. image:: media/BeagleV-Ahead-all.*
+.. image:: images/BeagleV-Ahead-all.*
     :width: 724
     :align: center
     :alt: BeagleV Ahead box contents
@@ -39,7 +39,7 @@ Antenna guide
       in BeagleV Ahead box. Below is a guide to connect the antenna to your 
       BeagleV Ahead board.
 
-      .. figure:: media/antenna-guide/connect.*
+      .. figure:: images/antenna-guide/connect.*
           :align: center
           :alt: Connecting 2.4GHz/5GHz antenna to BeagleV Ahead.
 
@@ -51,7 +51,7 @@ Antenna guide
       If for some reason you want to disconnect the antenna from your BeagleV Ahead board 
       you can follow the guide below to remove the antenna without beaking the uFL antenna connector.
 
-      .. figure:: media/antenna-guide/disconnect.*
+      .. figure:: images/antenna-guide/disconnect.*
           :align: center
           :alt: Removing 2.4GHz/5GHz antenna to BeagleV Ahead.
 
@@ -79,7 +79,7 @@ or a USB 3.0 super-speed micro-B cable. Connection guide for both are shown belo
 
       .. note:: If you only have a high-speed micro-B cable you can checkout high-speed micro-B connection guide.
 
-      .. figure:: media/usb-guide/super-speed-micro-B-connection.*
+      .. figure:: images/usb-guide/super-speed-micro-B-connection.*
           :align: center
           :alt: super-speed micro-B (USB 3.0) connection guide for BeagleV Ahead.
           
@@ -98,7 +98,7 @@ or a USB 3.0 super-speed micro-B cable. Connection guide for both are shown belo
 
       .. note:: Make sure the high-speed micro-B cable you have is a data cable as some high-speed micro-B cables are power only.        
 
-      .. figure:: media/usb-guide/high-speed-micro-B-connection.*
+      .. figure:: images/usb-guide/high-speed-micro-B-connection.*
           :align: center
           :alt: high-speed micro-B (USB 2.0) connection guide BeagleV Ahead.
 
@@ -117,7 +117,7 @@ Download latest software image
 To download the latest software image visit `https://www.beagleboard.org/distros <https://www.beagleboard.org/distros>`_ and 
 search for BeagleV Ahead as shown below.
 
-.. figure:: media/Software-Image.png
+.. figure:: images/Software-Image.png
     :align: center
     :alt: Download latest software image for BeagleV Ahead board
 
@@ -135,7 +135,7 @@ To put your BeagleV Ahead board into eMMC flash mode you can follow the steps be
 2. Connect to PC with super-speed micro-B or high-speed micro-B cable.
 3. Release USB button.
 
-.. figure:: media/usb-guide/Flash-eMMC.*
+.. figure:: images/usb-guide/Flash-eMMC.*
     :align: center
     :alt: Connecting BeagleV Ahead to flash eMMC
 
@@ -214,7 +214,7 @@ Access UART debug console
 To access a BeagleV Ahead serial debug console you can connected a USB to UART 
 to your board as shown below:
 
-.. figure:: media/debug/BeagleV-Ahead-UART-Debug.*
+.. figure:: images/debug/BeagleV-Ahead-UART-Debug.*
     :align: center
     :alt: BeagleV Ahead UART debug port connection
 
@@ -242,7 +242,7 @@ When you do this, you'll be required to power the board via Barrel jack.
 .. important:: To properly power the board and USB gadgets you must power 
     the board with 5V @ 2A power supply.
 
-.. figure:: media/usb-guide/OTG-usage.*
+.. figure:: images/usb-guide/OTG-usage.*
     :align: center
     :alt: USB OTG to connect USB gadgets to BeagleV Ahead board
 
diff --git a/boards/beaglev/ahead/03-design.rst b/boards/beaglev/ahead/03-design.rst
index 7bc2942b6c957489b381b5814d0ce16e880d2885..ff3f28cf495ae53ca99bfe9a49fe8b8cdb9b2517 100644
--- a/boards/beaglev/ahead/03-design.rst
+++ b/boards/beaglev/ahead/03-design.rst
@@ -11,14 +11,14 @@ specifications in  a short and crisp form as well.
 Block diagram
 **************
 
-.. figure:: media/hardware-design/SystemBlockDiagram.*
+.. figure:: images/hardware-design/SystemBlockDiagram.*
     :width: 740
     :align: center
     :alt: System block diagram
 
     System block diagram
 
-.. figure:: media/hardware-design/I2C-Usage.*
+.. figure:: images/hardware-design/I2C-Usage.*
     :width: 420
     :align: center
     :alt: I2C-Usage diagram
@@ -28,42 +28,42 @@ Block diagram
 System on Chip (SoC)
 *********************
 
-.. figure:: media/hardware-design/SD-EMMC-PowerSwitch.png
+.. figure:: images/hardware-design/SD-EMMC-PowerSwitch.png
     :width: 420
     :align: center
     :alt: SoC eMMC power switch
 
     SoC eMMC power switch
 
-.. figure:: media/hardware-design/SoC-DDR-Power.png
+.. figure:: images/hardware-design/SoC-DDR-Power.png
     :width: 740
     :align: center
     :alt: SoC DDR Power
 
     SoC DDR Power
 
-.. figure:: media/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png
+.. figure:: images/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png
     :width: 740
     :align: center
     :alt: SoC MIPI CSI DSI HDMI
 
     SoC MIPI CSI DSI HDMI
 
-.. figure:: media/hardware-design/SoC-Power.png
+.. figure:: images/hardware-design/SoC-Power.png
     :width: 740
     :align: center
     :alt: SoC power
 
     SoC power
 
-.. figure:: media/hardware-design/SoC-SYS-ADC-Clock.png
+.. figure:: images/hardware-design/SoC-SYS-ADC-Clock.png
     :width: 1247
     :align: center
     :alt: SoC sys, ADC, and Clock
 
     SoC sys, ADC, and Clock
 
-.. figure:: media/hardware-design/SoC-USB-GMAC-Audio.png
+.. figure:: images/hardware-design/SoC-USB-GMAC-Audio.png
     :width: 740
     :align: center
     :alt: SoC USB GMAC Audio
@@ -77,7 +77,7 @@ Power management
 Barrel jack 
 ============
 
-.. figure:: media/hardware-design/BarrelJackInput.*
+.. figure:: images/hardware-design/BarrelJackInput.*
     :width: 1247
     :align: center
     :alt: Barrel jack power input
@@ -87,7 +87,7 @@ Barrel jack
 0.8V DCDC buck 
 ==============
 
-.. figure:: media/hardware-design/DCDC0V8.png
+.. figure:: images/hardware-design/DCDC0V8.png
     :width: 1247
     :align: center
     :alt: 0.8V DCDC buck converter
@@ -97,7 +97,7 @@ Barrel jack
 3.3V DCDC buck 
 ==============
 
-.. figure:: media/hardware-design/DCDC3V3.png
+.. figure:: images/hardware-design/DCDC3V3.png
     :width: 740
     :align: center
     :alt: 3.3V DCDC buck converter
@@ -107,7 +107,7 @@ Barrel jack
 1.8V LDO
 ========
 
-.. figure:: media/hardware-design/LDO1V8.png
+.. figure:: images/hardware-design/LDO1V8.png
     :width: 740
     :align: center
     :alt: 1.8V LDO regulator
@@ -117,21 +117,21 @@ Barrel jack
 PMIC
 ====
 
-.. figure:: media/hardware-design/PMIC-BUCK.png
+.. figure:: images/hardware-design/PMIC-BUCK.png
     :width: 740
     :align: center
     :alt: PMIC Buck
 
     PMIC Buck
 
-.. figure:: media/hardware-design/PMIC-Control.png
+.. figure:: images/hardware-design/PMIC-Control.png
     :width: 740
     :align: center
     :alt: PMIC Control
 
     PMIC Control
 
-.. figure:: media/hardware-design/PMIC-LDO.png
+.. figure:: images/hardware-design/PMIC-LDO.png
     :width: 740
     :align: center
     :alt: PMIC LDO
@@ -145,7 +145,7 @@ General Connectivity and Expansion
 microUSB 3.0 port
 ==================
 
-.. figure:: media/hardware-design/microUSB3.png
+.. figure:: images/hardware-design/microUSB3.png
     :width: 740
     :align: center
     :alt: microUSB 3.0 port
@@ -155,14 +155,14 @@ microUSB 3.0 port
 P8 & P9 cape header pins
 =========================
 
-.. figure:: media/hardware-design/P8-Header.png
+.. figure:: images/hardware-design/P8-Header.png
     :width: 420
     :align: center
     :alt: P8 cape header
 
     P8 cape header
 
-.. figure:: media/hardware-design/P9-Header.png
+.. figure:: images/hardware-design/P9-Header.png
     :width: 420
     :align: center
     :alt: P9 cape header
@@ -172,7 +172,7 @@ P8 & P9 cape header pins
 mikroBUS shuttle connector
 ==========================
 
-.. figure:: media/hardware-design/mikroBUS.png
+.. figure:: images/hardware-design/mikroBUS.png
     :width: 420
     :align: center
     :alt: mikroBUS shuttle connector 
@@ -181,12 +181,12 @@ mikroBUS shuttle connector
 P8, P9, and mikroBUS helper circuitry
 ======================================
 
-.. figure:: media/hardware-design/mikroBUS-reset.png
+.. figure:: images/hardware-design/mikroBUS-reset.png
     :width: 420
     :align: center
     :alt: mikroBUS reset circuitry
 
-.. figure:: media/hardware-design/P8-P9-mikroBUS-LevelShifter.png
+.. figure:: images/hardware-design/P8-P9-mikroBUS-LevelShifter.png
     :width: 1247
     :align: center
     :alt: P8, P9, and mikroBUS level shifters
@@ -199,7 +199,7 @@ Buttons and LEDs
 Boot select buttons
 ====================
 
-.. figure:: media/hardware-design/BootSelect.*
+.. figure:: images/hardware-design/BootSelect.*
     :width: 740
     :align: center
     :alt: Boot select buttons
@@ -209,7 +209,7 @@ Boot select buttons
 User LEDs and Power LED
 ========================
 
-.. figure:: media/hardware-design/User-Power-LEDs.*
+.. figure:: images/hardware-design/User-Power-LEDs.*
     :width: 740
     :align: center
     :alt: User LEDs and power LED
@@ -219,7 +219,7 @@ User LEDs and Power LED
 Power and reset button
 =======================
 
-.. figure:: media/hardware-design/Power-Reset-Button.*
+.. figure:: images/hardware-design/Power-Reset-Button.*
     :width: 740
     :align: center
     :alt: Power and reset button
@@ -232,14 +232,14 @@ Wired and wireless connectivity
 Ethernet
 ========
 
-.. figure:: media/hardware-design/Ethernet.png
+.. figure:: images/hardware-design/Ethernet.png
     :width: 740
     :align: center
     :alt: Ethernet 
 
     Ethernet
 
-.. figure:: media/hardware-design/Ethernet-LevelShifter-Strapping.png
+.. figure:: images/hardware-design/Ethernet-LevelShifter-Strapping.png
     :width: 740
     :align: center
     :alt: Ethernet LevelShifter and Strapping
@@ -249,7 +249,7 @@ Ethernet
 WiFi & Bluetooth
 =================
 
-.. figure:: media/hardware-design/WiFi-Bluetooth.png
+.. figure:: images/hardware-design/WiFi-Bluetooth.png
     :width: 740
     :align: center
     :alt: WiFi and Bluetooth
@@ -262,14 +262,14 @@ Memory, Media and Data storage
 DDR memory
 ==========
 
-.. figure:: media/hardware-design/DDR4-0-1.png
+.. figure:: images/hardware-design/DDR4-0-1.png
     :width: 740
     :align: center
     :alt: 2GB DDR4 Memory chip1
 
     2GB DDR4 Memory chip1
 
-.. figure:: media/hardware-design/DDR4-2-3.png
+.. figure:: images/hardware-design/DDR4-2-3.png
     :width: 740
     :align: center
     :alt: 2GB DDR4 Memory chip2
@@ -279,7 +279,7 @@ DDR memory
 eMMC
 =====
 
-.. figure:: media/hardware-design/EMMC.png
+.. figure:: images/hardware-design/EMMC.png
     :width: 740
     :align: center
     :alt: 16GB eMMC
@@ -289,7 +289,7 @@ eMMC
 microSD
 =======
 
-.. figure:: media/hardware-design/microSDCard.png
+.. figure:: images/hardware-design/microSDCard.png
     :width: 740
     :align: center
     :alt: microSD card connector 
@@ -299,7 +299,7 @@ microSD
 EEPROM
 ======
 
-.. figure:: media/hardware-design/EEPROM.png
+.. figure:: images/hardware-design/EEPROM.png
     :width: 420
     :align: center
     :alt: 16GB EEPROM
@@ -312,7 +312,7 @@ Multimedia I/O
 CSI0
 ====
 
-.. figure:: media/hardware-design/CSI0.png
+.. figure:: images/hardware-design/CSI0.png
     :width: 420
     :align: center
     :alt: CSI0 camera interface
@@ -322,7 +322,7 @@ CSI0
 CSI1
 ====
 
-.. figure:: media/hardware-design/CSI1.png
+.. figure:: images/hardware-design/CSI1.png
     :width: 420
     :align: center
     :alt: CSI1 camera interface
@@ -332,7 +332,7 @@ CSI1
 DSI
 ====
 
-.. figure:: media/hardware-design/DSI.png
+.. figure:: images/hardware-design/DSI.png
     :width: 420
     :align: center
     :alt: DSI display interface
@@ -342,7 +342,7 @@ DSI
 CSI & DSI level shifter
 =======================
 
-.. figure:: media/hardware-design/CSI-DSI-LevelShifter.png
+.. figure:: images/hardware-design/CSI-DSI-LevelShifter.png
     :width: 420
     :align: center
     :alt: CSI & DSI level shifter
@@ -352,7 +352,7 @@ CSI & DSI level shifter
 HDMI
 ====
 
-.. figure:: media/hardware-design/HDMI.png
+.. figure:: images/hardware-design/HDMI.png
     :width: 1247
     :align: center
     :alt: HDMI display interface
@@ -365,7 +365,7 @@ Debug
 UART debug port 
 ===============
 
-.. figure:: media/hardware-design/DebugPort.png
+.. figure:: images/hardware-design/DebugPort.png
     :width: 420
     :align: center
     :alt: UART Debug port 
@@ -375,7 +375,7 @@ UART debug port
 JTAG debug port
 ===============
 
-.. figure:: media/hardware-design/JTAG.png
+.. figure:: images/hardware-design/JTAG.png
     :width: 720
     :align: center
     :alt: JTAG debug port
@@ -393,7 +393,7 @@ Mechanical Specifications
    +----------------------------------------------------+---------------------------------------------------------+
    | Top                                                | Bottom                                                  |
    +====================================================+=========================================================+
-   | .. image:: media/mechanical-design/top.*           | .. image:: media/mechanical-design/bottom.*             |
+   | .. image:: images/mechanical-design/top.*          | .. image:: images/mechanical-design/bottom.*            |
    |    :width: 427                                     |       :width: 427                                       |
    |    :align: center                                  |       :align: center                                    |
    |    :alt: BeagleV Ahead top                         |       :alt: BeagleV Ahead bottom                        |
@@ -406,7 +406,7 @@ Mechanical Specifications
    +----------------------------------------------------+---------------------------------------------------------+---------------------------------------------------------+
    | Front                                              | Left                                                    | Right                                                   |
    +====================================================+=========================================================+=========================================================+
-   | .. image:: media/mechanical-design/front.*         | .. image:: media/mechanical-design/left.*               | .. image:: media/mechanical-design/right.*              |
+   | .. image:: images/mechanical-design/front.*        | .. image:: images/mechanical-design/left.*              | .. image:: images/mechanical-design/right.*             |
    |    :width: 247                                     |       :width: 295                                       |    :width: 168                                          |
    |    :align: center                                  |       :align: center                                    |    :align: center                                       |
    |    :alt: BeagleV Ahead top                         |       :alt: BeagleV Ahead left                          |    :alt: BeagleV Ahead right                            |
diff --git a/boards/beaglev/ahead/media/BeagleV-Ahead-all.jpg b/boards/beaglev/ahead/images/BeagleV-Ahead-all.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/BeagleV-Ahead-all.jpg
rename to boards/beaglev/ahead/images/BeagleV-Ahead-all.jpg
diff --git a/boards/beaglev/ahead/media/BeagleV-Ahead-all.webp b/boards/beaglev/ahead/images/BeagleV-Ahead-all.webp
similarity index 100%
rename from boards/beaglev/ahead/media/BeagleV-Ahead-all.webp
rename to boards/beaglev/ahead/images/BeagleV-Ahead-all.webp
diff --git a/boards/beaglev/ahead/media/BeagleV-Ahead-with-hand.jpg b/boards/beaglev/ahead/images/BeagleV-Ahead-with-hand.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/BeagleV-Ahead-with-hand.jpg
rename to boards/beaglev/ahead/images/BeagleV-Ahead-with-hand.jpg
diff --git a/boards/beaglev/ahead/media/BeagleV-Ahead-with-hand.webp b/boards/beaglev/ahead/images/BeagleV-Ahead-with-hand.webp
similarity index 100%
rename from boards/beaglev/ahead/media/BeagleV-Ahead-with-hand.webp
rename to boards/beaglev/ahead/images/BeagleV-Ahead-with-hand.webp
diff --git a/boards/beaglev/ahead/media/OSHW_mark_US002535.svg b/boards/beaglev/ahead/images/OSHW_mark_US002535.svg
similarity index 100%
rename from boards/beaglev/ahead/media/OSHW_mark_US002535.svg
rename to boards/beaglev/ahead/images/OSHW_mark_US002535.svg
diff --git a/boards/beaglev/ahead/media/Software-Image.png b/boards/beaglev/ahead/images/Software-Image.png
similarity index 100%
rename from boards/beaglev/ahead/media/Software-Image.png
rename to boards/beaglev/ahead/images/Software-Image.png
diff --git a/boards/beaglev/ahead/media/antenna-guide/connect.jpg b/boards/beaglev/ahead/images/antenna-guide/connect.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/connect.jpg
rename to boards/beaglev/ahead/images/antenna-guide/connect.jpg
diff --git a/boards/beaglev/ahead/media/antenna-guide/connect.png b/boards/beaglev/ahead/images/antenna-guide/connect.png
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/connect.png
rename to boards/beaglev/ahead/images/antenna-guide/connect.png
diff --git a/boards/beaglev/ahead/media/antenna-guide/connect.webp b/boards/beaglev/ahead/images/antenna-guide/connect.webp
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/connect.webp
rename to boards/beaglev/ahead/images/antenna-guide/connect.webp
diff --git a/boards/beaglev/ahead/media/antenna-guide/disconnect.jpg b/boards/beaglev/ahead/images/antenna-guide/disconnect.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/disconnect.jpg
rename to boards/beaglev/ahead/images/antenna-guide/disconnect.jpg
diff --git a/boards/beaglev/ahead/media/antenna-guide/disconnect.png b/boards/beaglev/ahead/images/antenna-guide/disconnect.png
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/disconnect.png
rename to boards/beaglev/ahead/images/antenna-guide/disconnect.png
diff --git a/boards/beaglev/ahead/media/antenna-guide/disconnect.webp b/boards/beaglev/ahead/images/antenna-guide/disconnect.webp
similarity index 100%
rename from boards/beaglev/ahead/media/antenna-guide/disconnect.webp
rename to boards/beaglev/ahead/images/antenna-guide/disconnect.webp
diff --git a/boards/beaglev/ahead/media/architecture.png b/boards/beaglev/ahead/images/architecture.png
similarity index 100%
rename from boards/beaglev/ahead/media/architecture.png
rename to boards/beaglev/ahead/images/architecture.png
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/01-introduction.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/01-introduction.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/01-introduction.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/01-introduction.jpg
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/02-quick-start.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/02-quick-start.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/02-quick-start.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/02-quick-start.jpg
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/03-design-and-specifications.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/03-design-and-specifications.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/03-design-and-specifications.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/03-design-and-specifications.jpg
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/04-connectors-and-pinouts.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/04-connectors-and-pinouts.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/05-demos-and-tutorials.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/05-demos-and-tutorials.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/05-demos-and-tutorials.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/05-demos-and-tutorials.jpg
diff --git a/boards/beaglev/ahead/media/chapter-thumbnails/06-support-documents.jpg b/boards/beaglev/ahead/images/chapter-thumbnails/06-support-documents.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/chapter-thumbnails/06-support-documents.jpg
rename to boards/beaglev/ahead/images/chapter-thumbnails/06-support-documents.jpg
diff --git a/boards/beaglev/ahead/media/components-back.jpg b/boards/beaglev/ahead/images/components-back.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/components-back.jpg
rename to boards/beaglev/ahead/images/components-back.jpg
diff --git a/boards/beaglev/ahead/media/components-front.jpg b/boards/beaglev/ahead/images/components-front.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/components-front.jpg
rename to boards/beaglev/ahead/images/components-front.jpg
diff --git a/boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.jpg b/boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.jpg
rename to boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.jpg
diff --git a/boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.png b/boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.png
similarity index 100%
rename from boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.png
rename to boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.png
diff --git a/boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.webp b/boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.webp
similarity index 100%
rename from boards/beaglev/ahead/media/debug/BeagleV-Ahead-UART-Debug.webp
rename to boards/beaglev/ahead/images/debug/BeagleV-Ahead-UART-Debug.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/BarrelJackInput.png b/boards/beaglev/ahead/images/hardware-design/BarrelJackInput.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/BarrelJackInput.png
rename to boards/beaglev/ahead/images/hardware-design/BarrelJackInput.png
diff --git a/boards/beaglev/ahead/media/hardware-design/BarrelJackInput.webp b/boards/beaglev/ahead/images/hardware-design/BarrelJackInput.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/BarrelJackInput.webp
rename to boards/beaglev/ahead/images/hardware-design/BarrelJackInput.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/BootSelect.png b/boards/beaglev/ahead/images/hardware-design/BootSelect.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/BootSelect.png
rename to boards/beaglev/ahead/images/hardware-design/BootSelect.png
diff --git a/boards/beaglev/ahead/media/hardware-design/BootSelect.webp b/boards/beaglev/ahead/images/hardware-design/BootSelect.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/BootSelect.webp
rename to boards/beaglev/ahead/images/hardware-design/BootSelect.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI-DSI-LevelShifter.png b/boards/beaglev/ahead/images/hardware-design/CSI-DSI-LevelShifter.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI-DSI-LevelShifter.png
rename to boards/beaglev/ahead/images/hardware-design/CSI-DSI-LevelShifter.png
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI-DSI-LevelShifter.webp b/boards/beaglev/ahead/images/hardware-design/CSI-DSI-LevelShifter.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI-DSI-LevelShifter.webp
rename to boards/beaglev/ahead/images/hardware-design/CSI-DSI-LevelShifter.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI0.png b/boards/beaglev/ahead/images/hardware-design/CSI0.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI0.png
rename to boards/beaglev/ahead/images/hardware-design/CSI0.png
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI0.webp b/boards/beaglev/ahead/images/hardware-design/CSI0.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI0.webp
rename to boards/beaglev/ahead/images/hardware-design/CSI0.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI1.png b/boards/beaglev/ahead/images/hardware-design/CSI1.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI1.png
rename to boards/beaglev/ahead/images/hardware-design/CSI1.png
diff --git a/boards/beaglev/ahead/media/hardware-design/CSI1.webp b/boards/beaglev/ahead/images/hardware-design/CSI1.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/CSI1.webp
rename to boards/beaglev/ahead/images/hardware-design/CSI1.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DCDC0V8.png b/boards/beaglev/ahead/images/hardware-design/DCDC0V8.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DCDC0V8.png
rename to boards/beaglev/ahead/images/hardware-design/DCDC0V8.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DCDC0V8.webp b/boards/beaglev/ahead/images/hardware-design/DCDC0V8.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DCDC0V8.webp
rename to boards/beaglev/ahead/images/hardware-design/DCDC0V8.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DCDC3V3.png b/boards/beaglev/ahead/images/hardware-design/DCDC3V3.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DCDC3V3.png
rename to boards/beaglev/ahead/images/hardware-design/DCDC3V3.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DCDC3V3.webp b/boards/beaglev/ahead/images/hardware-design/DCDC3V3.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DCDC3V3.webp
rename to boards/beaglev/ahead/images/hardware-design/DCDC3V3.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DDR4-0-1.png b/boards/beaglev/ahead/images/hardware-design/DDR4-0-1.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DDR4-0-1.png
rename to boards/beaglev/ahead/images/hardware-design/DDR4-0-1.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DDR4-0-1.webp b/boards/beaglev/ahead/images/hardware-design/DDR4-0-1.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DDR4-0-1.webp
rename to boards/beaglev/ahead/images/hardware-design/DDR4-0-1.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DDR4-2-3.png b/boards/beaglev/ahead/images/hardware-design/DDR4-2-3.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DDR4-2-3.png
rename to boards/beaglev/ahead/images/hardware-design/DDR4-2-3.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DDR4-2-3.webp b/boards/beaglev/ahead/images/hardware-design/DDR4-2-3.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DDR4-2-3.webp
rename to boards/beaglev/ahead/images/hardware-design/DDR4-2-3.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DSI.png b/boards/beaglev/ahead/images/hardware-design/DSI.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DSI.png
rename to boards/beaglev/ahead/images/hardware-design/DSI.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DSI.webp b/boards/beaglev/ahead/images/hardware-design/DSI.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DSI.webp
rename to boards/beaglev/ahead/images/hardware-design/DSI.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/DebugPort.png b/boards/beaglev/ahead/images/hardware-design/DebugPort.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DebugPort.png
rename to boards/beaglev/ahead/images/hardware-design/DebugPort.png
diff --git a/boards/beaglev/ahead/media/hardware-design/DebugPort.webp b/boards/beaglev/ahead/images/hardware-design/DebugPort.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/DebugPort.webp
rename to boards/beaglev/ahead/images/hardware-design/DebugPort.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/EEPROM.png b/boards/beaglev/ahead/images/hardware-design/EEPROM.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/EEPROM.png
rename to boards/beaglev/ahead/images/hardware-design/EEPROM.png
diff --git a/boards/beaglev/ahead/media/hardware-design/EEPROM.webp b/boards/beaglev/ahead/images/hardware-design/EEPROM.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/EEPROM.webp
rename to boards/beaglev/ahead/images/hardware-design/EEPROM.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/EMMC.png b/boards/beaglev/ahead/images/hardware-design/EMMC.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/EMMC.png
rename to boards/beaglev/ahead/images/hardware-design/EMMC.png
diff --git a/boards/beaglev/ahead/media/hardware-design/EMMC.webp b/boards/beaglev/ahead/images/hardware-design/EMMC.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/EMMC.webp
rename to boards/beaglev/ahead/images/hardware-design/EMMC.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/Ethernet-LevelShifter-Strapping.png b/boards/beaglev/ahead/images/hardware-design/Ethernet-LevelShifter-Strapping.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Ethernet-LevelShifter-Strapping.png
rename to boards/beaglev/ahead/images/hardware-design/Ethernet-LevelShifter-Strapping.png
diff --git a/boards/beaglev/ahead/media/hardware-design/Ethernet-LevelShifter-Strapping.webp b/boards/beaglev/ahead/images/hardware-design/Ethernet-LevelShifter-Strapping.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Ethernet-LevelShifter-Strapping.webp
rename to boards/beaglev/ahead/images/hardware-design/Ethernet-LevelShifter-Strapping.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/Ethernet.png b/boards/beaglev/ahead/images/hardware-design/Ethernet.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Ethernet.png
rename to boards/beaglev/ahead/images/hardware-design/Ethernet.png
diff --git a/boards/beaglev/ahead/media/hardware-design/Ethernet.webp b/boards/beaglev/ahead/images/hardware-design/Ethernet.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Ethernet.webp
rename to boards/beaglev/ahead/images/hardware-design/Ethernet.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/HDMI.png b/boards/beaglev/ahead/images/hardware-design/HDMI.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/HDMI.png
rename to boards/beaglev/ahead/images/hardware-design/HDMI.png
diff --git a/boards/beaglev/ahead/media/hardware-design/HDMI.webp b/boards/beaglev/ahead/images/hardware-design/HDMI.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/HDMI.webp
rename to boards/beaglev/ahead/images/hardware-design/HDMI.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/I2C-Usage.png b/boards/beaglev/ahead/images/hardware-design/I2C-Usage.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/I2C-Usage.png
rename to boards/beaglev/ahead/images/hardware-design/I2C-Usage.png
diff --git a/boards/beaglev/ahead/media/hardware-design/I2C-Usage.webp b/boards/beaglev/ahead/images/hardware-design/I2C-Usage.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/I2C-Usage.webp
rename to boards/beaglev/ahead/images/hardware-design/I2C-Usage.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/JTAG.png b/boards/beaglev/ahead/images/hardware-design/JTAG.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/JTAG.png
rename to boards/beaglev/ahead/images/hardware-design/JTAG.png
diff --git a/boards/beaglev/ahead/media/hardware-design/JTAG.webp b/boards/beaglev/ahead/images/hardware-design/JTAG.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/JTAG.webp
rename to boards/beaglev/ahead/images/hardware-design/JTAG.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/LDO1V8.png b/boards/beaglev/ahead/images/hardware-design/LDO1V8.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/LDO1V8.png
rename to boards/beaglev/ahead/images/hardware-design/LDO1V8.png
diff --git a/boards/beaglev/ahead/media/hardware-design/LDO1V8.webp b/boards/beaglev/ahead/images/hardware-design/LDO1V8.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/LDO1V8.webp
rename to boards/beaglev/ahead/images/hardware-design/LDO1V8.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/P8-Header.png b/boards/beaglev/ahead/images/hardware-design/P8-Header.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P8-Header.png
rename to boards/beaglev/ahead/images/hardware-design/P8-Header.png
diff --git a/boards/beaglev/ahead/media/hardware-design/P8-Header.webp b/boards/beaglev/ahead/images/hardware-design/P8-Header.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P8-Header.webp
rename to boards/beaglev/ahead/images/hardware-design/P8-Header.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/P8-P9-mikroBUS-LevelShifter.png b/boards/beaglev/ahead/images/hardware-design/P8-P9-mikroBUS-LevelShifter.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P8-P9-mikroBUS-LevelShifter.png
rename to boards/beaglev/ahead/images/hardware-design/P8-P9-mikroBUS-LevelShifter.png
diff --git a/boards/beaglev/ahead/media/hardware-design/P8-P9-mikroBUS-LevelShifter.webp b/boards/beaglev/ahead/images/hardware-design/P8-P9-mikroBUS-LevelShifter.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P8-P9-mikroBUS-LevelShifter.webp
rename to boards/beaglev/ahead/images/hardware-design/P8-P9-mikroBUS-LevelShifter.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/P9-Header.png b/boards/beaglev/ahead/images/hardware-design/P9-Header.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P9-Header.png
rename to boards/beaglev/ahead/images/hardware-design/P9-Header.png
diff --git a/boards/beaglev/ahead/media/hardware-design/P9-Header.webp b/boards/beaglev/ahead/images/hardware-design/P9-Header.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/P9-Header.webp
rename to boards/beaglev/ahead/images/hardware-design/P9-Header.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-BUCK.png b/boards/beaglev/ahead/images/hardware-design/PMIC-BUCK.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-BUCK.png
rename to boards/beaglev/ahead/images/hardware-design/PMIC-BUCK.png
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-BUCK.webp b/boards/beaglev/ahead/images/hardware-design/PMIC-BUCK.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-BUCK.webp
rename to boards/beaglev/ahead/images/hardware-design/PMIC-BUCK.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-Control.png b/boards/beaglev/ahead/images/hardware-design/PMIC-Control.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-Control.png
rename to boards/beaglev/ahead/images/hardware-design/PMIC-Control.png
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-Control.webp b/boards/beaglev/ahead/images/hardware-design/PMIC-Control.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-Control.webp
rename to boards/beaglev/ahead/images/hardware-design/PMIC-Control.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-LDO.png b/boards/beaglev/ahead/images/hardware-design/PMIC-LDO.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-LDO.png
rename to boards/beaglev/ahead/images/hardware-design/PMIC-LDO.png
diff --git a/boards/beaglev/ahead/media/hardware-design/PMIC-LDO.webp b/boards/beaglev/ahead/images/hardware-design/PMIC-LDO.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/PMIC-LDO.webp
rename to boards/beaglev/ahead/images/hardware-design/PMIC-LDO.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/Power-Reset-Button.png b/boards/beaglev/ahead/images/hardware-design/Power-Reset-Button.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Power-Reset-Button.png
rename to boards/beaglev/ahead/images/hardware-design/Power-Reset-Button.png
diff --git a/boards/beaglev/ahead/media/hardware-design/Power-Reset-Button.webp b/boards/beaglev/ahead/images/hardware-design/Power-Reset-Button.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/Power-Reset-Button.webp
rename to boards/beaglev/ahead/images/hardware-design/Power-Reset-Button.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SD-EMMC-PowerSwitch.png b/boards/beaglev/ahead/images/hardware-design/SD-EMMC-PowerSwitch.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SD-EMMC-PowerSwitch.png
rename to boards/beaglev/ahead/images/hardware-design/SD-EMMC-PowerSwitch.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SD-EMMC-PowerSwitch.webp b/boards/beaglev/ahead/images/hardware-design/SD-EMMC-PowerSwitch.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SD-EMMC-PowerSwitch.webp
rename to boards/beaglev/ahead/images/hardware-design/SD-EMMC-PowerSwitch.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-DDR-Power.png b/boards/beaglev/ahead/images/hardware-design/SoC-DDR-Power.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-DDR-Power.png
rename to boards/beaglev/ahead/images/hardware-design/SoC-DDR-Power.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-DDR-Power.webp b/boards/beaglev/ahead/images/hardware-design/SoC-DDR-Power.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-DDR-Power.webp
rename to boards/beaglev/ahead/images/hardware-design/SoC-DDR-Power.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png b/boards/beaglev/ahead/images/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png
rename to boards/beaglev/ahead/images/hardware-design/SoC-MIPI-CSI-DSI-HDMI.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-MIPI-CSI-DSI-HDMI.webp b/boards/beaglev/ahead/images/hardware-design/SoC-MIPI-CSI-DSI-HDMI.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-MIPI-CSI-DSI-HDMI.webp
rename to boards/beaglev/ahead/images/hardware-design/SoC-MIPI-CSI-DSI-HDMI.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-Power.png b/boards/beaglev/ahead/images/hardware-design/SoC-Power.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-Power.png
rename to boards/beaglev/ahead/images/hardware-design/SoC-Power.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-Power.webp b/boards/beaglev/ahead/images/hardware-design/SoC-Power.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-Power.webp
rename to boards/beaglev/ahead/images/hardware-design/SoC-Power.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-SYS-ADC-Clock.png b/boards/beaglev/ahead/images/hardware-design/SoC-SYS-ADC-Clock.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-SYS-ADC-Clock.png
rename to boards/beaglev/ahead/images/hardware-design/SoC-SYS-ADC-Clock.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-SYS-ADC-Clock.webp b/boards/beaglev/ahead/images/hardware-design/SoC-SYS-ADC-Clock.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-SYS-ADC-Clock.webp
rename to boards/beaglev/ahead/images/hardware-design/SoC-SYS-ADC-Clock.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-USB-GMAC-Audio.png b/boards/beaglev/ahead/images/hardware-design/SoC-USB-GMAC-Audio.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-USB-GMAC-Audio.png
rename to boards/beaglev/ahead/images/hardware-design/SoC-USB-GMAC-Audio.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SoC-USB-GMAC-Audio.webp b/boards/beaglev/ahead/images/hardware-design/SoC-USB-GMAC-Audio.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SoC-USB-GMAC-Audio.webp
rename to boards/beaglev/ahead/images/hardware-design/SoC-USB-GMAC-Audio.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/SystemBlockDiagram.png b/boards/beaglev/ahead/images/hardware-design/SystemBlockDiagram.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SystemBlockDiagram.png
rename to boards/beaglev/ahead/images/hardware-design/SystemBlockDiagram.png
diff --git a/boards/beaglev/ahead/media/hardware-design/SystemBlockDiagram.webp b/boards/beaglev/ahead/images/hardware-design/SystemBlockDiagram.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/SystemBlockDiagram.webp
rename to boards/beaglev/ahead/images/hardware-design/SystemBlockDiagram.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/User-Power-LEDs.png b/boards/beaglev/ahead/images/hardware-design/User-Power-LEDs.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/User-Power-LEDs.png
rename to boards/beaglev/ahead/images/hardware-design/User-Power-LEDs.png
diff --git a/boards/beaglev/ahead/media/hardware-design/User-Power-LEDs.webp b/boards/beaglev/ahead/images/hardware-design/User-Power-LEDs.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/User-Power-LEDs.webp
rename to boards/beaglev/ahead/images/hardware-design/User-Power-LEDs.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/WiFi-Bluetooth.png b/boards/beaglev/ahead/images/hardware-design/WiFi-Bluetooth.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/WiFi-Bluetooth.png
rename to boards/beaglev/ahead/images/hardware-design/WiFi-Bluetooth.png
diff --git a/boards/beaglev/ahead/media/hardware-design/WiFi-Bluetooth.webp b/boards/beaglev/ahead/images/hardware-design/WiFi-Bluetooth.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/WiFi-Bluetooth.webp
rename to boards/beaglev/ahead/images/hardware-design/WiFi-Bluetooth.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/microSDCard.png b/boards/beaglev/ahead/images/hardware-design/microSDCard.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/microSDCard.png
rename to boards/beaglev/ahead/images/hardware-design/microSDCard.png
diff --git a/boards/beaglev/ahead/media/hardware-design/microSDCard.webp b/boards/beaglev/ahead/images/hardware-design/microSDCard.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/microSDCard.webp
rename to boards/beaglev/ahead/images/hardware-design/microSDCard.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/microUSB3.png b/boards/beaglev/ahead/images/hardware-design/microUSB3.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/microUSB3.png
rename to boards/beaglev/ahead/images/hardware-design/microUSB3.png
diff --git a/boards/beaglev/ahead/media/hardware-design/microUSB3.webp b/boards/beaglev/ahead/images/hardware-design/microUSB3.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/microUSB3.webp
rename to boards/beaglev/ahead/images/hardware-design/microUSB3.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/mikroBUS-reset.png b/boards/beaglev/ahead/images/hardware-design/mikroBUS-reset.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/mikroBUS-reset.png
rename to boards/beaglev/ahead/images/hardware-design/mikroBUS-reset.png
diff --git a/boards/beaglev/ahead/media/hardware-design/mikroBUS-reset.webp b/boards/beaglev/ahead/images/hardware-design/mikroBUS-reset.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/mikroBUS-reset.webp
rename to boards/beaglev/ahead/images/hardware-design/mikroBUS-reset.webp
diff --git a/boards/beaglev/ahead/media/hardware-design/mikroBUS.png b/boards/beaglev/ahead/images/hardware-design/mikroBUS.png
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/mikroBUS.png
rename to boards/beaglev/ahead/images/hardware-design/mikroBUS.png
diff --git a/boards/beaglev/ahead/media/hardware-design/mikroBUS.webp b/boards/beaglev/ahead/images/hardware-design/mikroBUS.webp
similarity index 100%
rename from boards/beaglev/ahead/media/hardware-design/mikroBUS.webp
rename to boards/beaglev/ahead/images/hardware-design/mikroBUS.webp
diff --git a/boards/beaglev/ahead/media/mechanical-design/bottom.png b/boards/beaglev/ahead/images/mechanical-design/bottom.png
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/bottom.png
rename to boards/beaglev/ahead/images/mechanical-design/bottom.png
diff --git a/boards/beaglev/ahead/media/mechanical-design/bottom.webp b/boards/beaglev/ahead/images/mechanical-design/bottom.webp
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/bottom.webp
rename to boards/beaglev/ahead/images/mechanical-design/bottom.webp
diff --git a/boards/beaglev/ahead/media/mechanical-design/front.png b/boards/beaglev/ahead/images/mechanical-design/front.png
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/front.png
rename to boards/beaglev/ahead/images/mechanical-design/front.png
diff --git a/boards/beaglev/ahead/media/mechanical-design/front.webp b/boards/beaglev/ahead/images/mechanical-design/front.webp
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/front.webp
rename to boards/beaglev/ahead/images/mechanical-design/front.webp
diff --git a/boards/beaglev/ahead/media/mechanical-design/left.png b/boards/beaglev/ahead/images/mechanical-design/left.png
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/left.png
rename to boards/beaglev/ahead/images/mechanical-design/left.png
diff --git a/boards/beaglev/ahead/media/mechanical-design/left.webp b/boards/beaglev/ahead/images/mechanical-design/left.webp
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/left.webp
rename to boards/beaglev/ahead/images/mechanical-design/left.webp
diff --git a/boards/beaglev/ahead/media/mechanical-design/right.png b/boards/beaglev/ahead/images/mechanical-design/right.png
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/right.png
rename to boards/beaglev/ahead/images/mechanical-design/right.png
diff --git a/boards/beaglev/ahead/media/mechanical-design/right.webp b/boards/beaglev/ahead/images/mechanical-design/right.webp
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/right.webp
rename to boards/beaglev/ahead/images/mechanical-design/right.webp
diff --git a/boards/beaglev/ahead/media/mechanical-design/top.png b/boards/beaglev/ahead/images/mechanical-design/top.png
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/top.png
rename to boards/beaglev/ahead/images/mechanical-design/top.png
diff --git a/boards/beaglev/ahead/media/mechanical-design/top.webp b/boards/beaglev/ahead/images/mechanical-design/top.webp
similarity index 100%
rename from boards/beaglev/ahead/media/mechanical-design/top.webp
rename to boards/beaglev/ahead/images/mechanical-design/top.webp
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.jpg b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.jpg
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.jpg
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.png b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.png
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.png
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.png
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.svg b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.svg
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.svg
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.svg
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.webp b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.webp
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P8.webp
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P8.webp
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.jpg b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.jpg
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.jpg
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.png b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.png
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.png
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.png
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.svg b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.svg
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.svg
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.svg
diff --git a/boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.webp b/boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.webp
similarity index 100%
rename from boards/beaglev/ahead/media/pinout/BeagleV-Ahead-P9.webp
rename to boards/beaglev/ahead/images/pinout/BeagleV-Ahead-P9.webp
diff --git a/boards/beaglev/ahead/media/product-pictures/back.jpg b/boards/beaglev/ahead/images/product-pictures/back.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/back.jpg
rename to boards/beaglev/ahead/images/product-pictures/back.jpg
diff --git a/boards/beaglev/ahead/media/product-pictures/back.webp b/boards/beaglev/ahead/images/product-pictures/back.webp
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/back.webp
rename to boards/beaglev/ahead/images/product-pictures/back.webp
diff --git a/boards/beaglev/ahead/media/product-pictures/bva-45front.jpg b/boards/beaglev/ahead/images/product-pictures/bva-45front.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/bva-45front.jpg
rename to boards/beaglev/ahead/images/product-pictures/bva-45front.jpg
diff --git a/boards/beaglev/ahead/media/product-pictures/bva-45front.webp b/boards/beaglev/ahead/images/product-pictures/bva-45front.webp
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/bva-45front.webp
rename to boards/beaglev/ahead/images/product-pictures/bva-45front.webp
diff --git a/boards/beaglev/ahead/media/product-pictures/front.jpg b/boards/beaglev/ahead/images/product-pictures/front.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/front.jpg
rename to boards/beaglev/ahead/images/product-pictures/front.jpg
diff --git a/boards/beaglev/ahead/media/product-pictures/front.webp b/boards/beaglev/ahead/images/product-pictures/front.webp
similarity index 100%
rename from boards/beaglev/ahead/media/product-pictures/front.webp
rename to boards/beaglev/ahead/images/product-pictures/front.webp
diff --git a/boards/beaglev/ahead/media/usb-guide/Flash-eMMC.jpg b/boards/beaglev/ahead/images/usb-guide/Flash-eMMC.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/Flash-eMMC.jpg
rename to boards/beaglev/ahead/images/usb-guide/Flash-eMMC.jpg
diff --git a/boards/beaglev/ahead/media/usb-guide/Flash-eMMC.png b/boards/beaglev/ahead/images/usb-guide/Flash-eMMC.png
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/Flash-eMMC.png
rename to boards/beaglev/ahead/images/usb-guide/Flash-eMMC.png
diff --git a/boards/beaglev/ahead/media/usb-guide/Flash-eMMC.webp b/boards/beaglev/ahead/images/usb-guide/Flash-eMMC.webp
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/Flash-eMMC.webp
rename to boards/beaglev/ahead/images/usb-guide/Flash-eMMC.webp
diff --git a/boards/beaglev/ahead/media/usb-guide/OTG-usage.jpg b/boards/beaglev/ahead/images/usb-guide/OTG-usage.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/OTG-usage.jpg
rename to boards/beaglev/ahead/images/usb-guide/OTG-usage.jpg
diff --git a/boards/beaglev/ahead/media/usb-guide/OTG-usage.png b/boards/beaglev/ahead/images/usb-guide/OTG-usage.png
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/OTG-usage.png
rename to boards/beaglev/ahead/images/usb-guide/OTG-usage.png
diff --git a/boards/beaglev/ahead/media/usb-guide/OTG-usage.webp b/boards/beaglev/ahead/images/usb-guide/OTG-usage.webp
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/OTG-usage.webp
rename to boards/beaglev/ahead/images/usb-guide/OTG-usage.webp
diff --git a/boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.jpg b/boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.jpg
rename to boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.jpg
diff --git a/boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.png b/boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.png
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.png
rename to boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.png
diff --git a/boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.webp b/boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.webp
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/high-speed-micro-B-connection.webp
rename to boards/beaglev/ahead/images/usb-guide/high-speed-micro-B-connection.webp
diff --git a/boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.jpg b/boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.jpg
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.jpg
rename to boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.jpg
diff --git a/boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.png b/boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.png
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.png
rename to boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.png
diff --git a/boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.webp b/boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.webp
similarity index 100%
rename from boards/beaglev/ahead/media/usb-guide/super-speed-micro-B-connection.webp
rename to boards/beaglev/ahead/images/usb-guide/super-speed-micro-B-connection.webp
diff --git a/boards/beaglev/ahead/index.rst b/boards/beaglev/ahead/index.rst
index 037102191a59eb3297e4902c81e683e1065a6b40..0a9b161d78249f16cb27dd8a17b1183017f100c1 100644
--- a/boards/beaglev/ahead/index.rst
+++ b/boards/beaglev/ahead/index.rst
@@ -13,7 +13,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
     .. grid-item::
         :columns: 12 12 12 4
 
-        .. figure:: media/OSHW_mark_US002535.*
+        .. figure:: images/OSHW_mark_US002535.*
             :width: 200
             :target: https://certification.oshwa.org/us002535.html
             :alt: BeagleV-Ahead OSHW Mark
@@ -29,7 +29,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
             * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglev-ahead>`__
             * For export, emissions and other compliance, see :ref:`beaglev-ahead-support`
 
-.. image:: media/BeagleV-Ahead-with-hand.*
+.. image:: images/BeagleV-Ahead-with-hand.*
     :align: center
     :alt: BeagleV Ahead with hand
 
@@ -50,7 +50,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **1. Introduction**
         ^^^
 
-        .. image:: media/chapter-thumbnails/01-introduction.*
+        .. image:: images/chapter-thumbnails/01-introduction.*
             :align: center
             :alt: BeagleV Ahead Chapter01 thumbnail
 
@@ -66,7 +66,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **2. Quick start**
         ^^^
 
-        .. image:: media/chapter-thumbnails/02-quick-start.*
+        .. image:: images/chapter-thumbnails/02-quick-start.*
             :align: center
             :alt: BeagleV Ahead Chapter02 thumbnail
 
@@ -82,7 +82,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **3. Design & Specifications**
         ^^^
 
-        .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+        .. image:: images/chapter-thumbnails/03-design-and-specifications.*
             :align: center
             :alt: BeagleV Ahead Chapter03 thumbnail
 
@@ -98,7 +98,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **4. Expansion**
         ^^^
 
-        .. image:: media/chapter-thumbnails/04-connectors-and-pinouts.*
+        .. image:: images/chapter-thumbnails/04-connectors-and-pinouts.*
             :align: center
             :alt: BeagleV Ahead Chapter04 thumbnail
 
@@ -114,7 +114,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **5. Demos**
         ^^^
 
-        .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+        .. image:: images/chapter-thumbnails/05-demos-and-tutorials.*
             :align: center
             :alt: BeagleV Ahead Chapter5 thumbnail
 
@@ -129,7 +129,7 @@ RISC-V enabled pocket-size computer for anybody who want's to dive deep into the
         **6. Support**
         ^^^
 
-        .. image:: media/chapter-thumbnails/06-support-documents.*
+        .. image:: images/chapter-thumbnails/06-support-documents.*
             :align: center
             :alt: BeagleV Ahead Chapter6 thumbnail
 
diff --git a/boards/beaglev/ahead/media/OSHW_mark_US002535.png b/boards/beaglev/ahead/media/OSHW_mark_US002535.png
deleted file mode 100644
index ebd8a8e04b4cb49763cb796e72d940789a238934..0000000000000000000000000000000000000000
Binary files a/boards/beaglev/ahead/media/OSHW_mark_US002535.png and /dev/null differ
diff --git a/boards/beaglev/fire/01-introduction.rst b/boards/beaglev/fire/01-introduction.rst
index 2ca6287bf1ae23673be3007f16c6fb19a78d1684..b3a034d528c46d098ca8debdd2a0e8c6583e7a95 100644
--- a/boards/beaglev/fire/01-introduction.rst
+++ b/boards/beaglev/fire/01-introduction.rst
@@ -14,7 +14,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
    :widths: auto
 
    +----------------------------------------------------+---------------------------------------------------------+
-   | .. image:: media/product-pictures/bvf-front.*      | .. image:: media/product-pictures/bvf-back.*            |
+   | .. image:: images/product-pictures/bvf-front.*     | .. image:: images/product-pictures/bvf-back.*           |
    |    :width: 700                                     |       :width: 700                                       |
    |    :align: center                                  |       :align: center                                    |
    |    :alt: BeagleV-Fire front                        |       :alt: BeagleV-Fire back                           |
@@ -29,7 +29,7 @@ Choose the cape header to see respective pinout diagram.
 
    .. group-tab:: P8 cape header
 
-        .. figure:: media/pinout/BeagleV-Fire-P8.*
+        .. figure:: images/pinout/BeagleV-Fire-P8.*
             :align: center
             :alt: BeagleV-Fire P8 cape header pinout
 
@@ -38,7 +38,7 @@ Choose the cape header to see respective pinout diagram.
 
    .. group-tab:: P9 cape header
 
-        .. figure:: media/pinout/BeagleV-Fire-P9.*
+        .. figure:: images/pinout/BeagleV-Fire-P9.*
             :align: center
             :alt: BeagleV-Fire P9 cape header pinout
 
@@ -83,7 +83,7 @@ This section describes the key components on the board, their location and funct
 Front components location
 ==========================
 
-.. figure:: media/BeagleV-Fire-Front-Annotated.*
+.. figure:: images/BeagleV-Fire-Front-Annotated.*
     :width: 1400
     :align: center
     :alt: BeagleV-Fire board front components location
@@ -131,7 +131,7 @@ Front components location
 Back components location
 =========================
 
-.. figure:: media/BeagleV-Fire-Back-Annotated.*
+.. figure:: images/BeagleV-Fire-Back-Annotated.*
     :width: 1400
     :align: center
     :alt: BeagleV-Fire board back components location
diff --git a/boards/beaglev/fire/02-quick-start.rst b/boards/beaglev/fire/02-quick-start.rst
index dc4c2722134f0ae402d9b0b105f4038fe60dcb2f..dcd2c253538e8bbc78df493034518ca3db0e1900 100644
--- a/boards/beaglev/fire/02-quick-start.rst
+++ b/boards/beaglev/fire/02-quick-start.rst
@@ -31,7 +31,7 @@ To connect BeagleV-Fire board to PC via USB Type C receptacle you need a USB typ
     1. `USB C cable 0.3m (mouser) <https://www.mouser.com/ProductDetail/Adafruit/4474?qs=CUBnOrq4ZJz9F%2FNF%252BRRALQ%3D%3D>`_
     2. `USB C cable 1.83m (digikey) <https://www.digikey.com/en/products/detail/coolgear/USB3-AC2MB/16384570>`_
 
-.. figure:: media/usb-guide/tethered-connection.*
+.. figure:: images/usb-guide/tethered-connection.*
     :align: center
     :alt: BeagleV-Fire tethered connection
     
@@ -57,7 +57,7 @@ Access UART debug console
 To access a BeagleV-Fire serial debug console you can connected a USB to UART 
 to your board as shown below:
 
-.. figure:: media/debug/BeagleV-Fire-UART-Debug.*
+.. figure:: images/debug/BeagleV-Fire-UART-Debug.*
     :align: center
     :alt: BeagleV-Fire UART debug port connection
 
diff --git a/boards/beaglev/fire/03-design.rst b/boards/beaglev/fire/03-design.rst
index c36908d872d733aac201c43c77f3e8b8f4c17660..239ea5ff1b99347783c861080b3ca2e40b1f5da0 100644
--- a/boards/beaglev/fire/03-design.rst
+++ b/boards/beaglev/fire/03-design.rst
@@ -16,21 +16,21 @@ specifications in  a short and crisp form as well.
 Block diagram
 **************
 
-.. figure:: media/hardware-design/system-block-diagram.*
+.. figure:: images/hardware-design/system-block-diagram.*
     :width: 720
     :align: center
     :alt: System block diagram
 
     System block diagram
 
-.. figure:: media/hardware-design/power-tree-diagram.*
+.. figure:: images/hardware-design/power-tree-diagram.*
     :width: 720
     :align: center
     :alt: Power tree diagram
 
     Power tree diagram
 
-.. figure:: media/hardware-design/iic-tree-diagram.*
+.. figure:: images/hardware-design/iic-tree-diagram.*
     :width: 420
     :align: center
     :alt: I2C tree diagram
@@ -40,42 +40,42 @@ Block diagram
 System on Chip (SoC)
 *********************
 
-.. figure:: media/hardware-design/soc-bank0.*
+.. figure:: images/hardware-design/soc-bank0.*
     :width: 720
     :align: center
     :alt: SoC bank0
 
     SoC bank0
 
-.. figure:: media/hardware-design/soc-bank1.*
+.. figure:: images/hardware-design/soc-bank1.*
     :width: 720
     :align: center
     :alt: SoC bank1
 
     SoC bank1
 
-.. figure:: media/hardware-design/soc-bank2.*
+.. figure:: images/hardware-design/soc-bank2.*
     :width: 540
     :align: center
     :alt: SoC bank2
 
     SoC bank2
 
-.. figure:: media/hardware-design/soc-bank3.*
+.. figure:: images/hardware-design/soc-bank3.*
     :width: 720
     :align: center
     :alt: SoC bank3
 
     SoC bank3
 
-.. figure:: media/hardware-design/soc-bank4.*
+.. figure:: images/hardware-design/soc-bank4.*
     :width: 420
     :align: center
     :alt: SoC bank4
 
     SoC bank4
 
-.. figure:: media/hardware-design/soc-power.*
+.. figure:: images/hardware-design/soc-power.*
     :width: 970
     :align: center
     :alt: SoC power
@@ -86,63 +86,63 @@ System on Chip (SoC)
 Power management
 *****************
 
-.. figure:: media/hardware-design/dc-5v-input.*
+.. figure:: images/hardware-design/dc-5v-input.*
     :width: 720
     :align: center
     :alt: DC 5V input
 
     DC 5V input
 
-.. figure:: media/hardware-design/ideal-diode.*
+.. figure:: images/hardware-design/ideal-diode.*
     :width: 420
     :align: center
     :alt: Ideal diode
 
     Ideal diode
 
-.. figure:: media/hardware-design/vcc-1v0.*
+.. figure:: images/hardware-design/vcc-1v0.*
     :width: 720
     :align: center
     :alt: VCC 1V0
 
     VCC 1V0
 
-.. figure:: media/hardware-design/vcc-1v1.*
+.. figure:: images/hardware-design/vcc-1v1.*
     :width: 720
     :align: center
     :alt: VCC 1V1
 
     VCC 1V1
 
-.. figure:: media/hardware-design/vcc-1v8.*
+.. figure:: images/hardware-design/vcc-1v8.*
     :width: 720
     :align: center
     :alt: VCC 1V8
 
     VCC 1V8
 
-.. figure:: media/hardware-design/vcc-2v5.*
+.. figure:: images/hardware-design/vcc-2v5.*
     :width: 270
     :align: center
     :alt: VCC 2V5
 
     VCC 2V5
 
-.. figure:: media/hardware-design/vcc-3v3.*
+.. figure:: images/hardware-design/vcc-3v3.*
     :width: 720
     :align: center
     :alt: VCC 3V3
 
     VCC 3V3
 
-.. figure:: media/hardware-design/vcca-1v0.*
+.. figure:: images/hardware-design/vcca-1v0.*
     :width: 540
     :align: center
     :alt: VCCA 1V0
 
     VCCA 1V0
 
-.. figure:: media/hardware-design/vio-enable.*
+.. figure:: images/hardware-design/vio-enable.*
     :width: 720
     :align: center
     :alt: VIO enable
@@ -155,7 +155,7 @@ General Connectivity and Expansion
 USB-C port
 ============
 
-.. figure:: media/hardware-design/usb-c.*
+.. figure:: images/hardware-design/usb-c.*
     :width: 970
     :align: center
     :alt: USB C
@@ -165,21 +165,21 @@ USB-C port
 P8 & P9 cape header pins
 =========================
 
-.. figure:: media/hardware-design/p8-header.*
+.. figure:: images/hardware-design/p8-header.*
     :width: 570
     :align: center
     :alt: P8 cape header
 
     P8 cape header
 
-.. figure:: media/hardware-design/p9-header.*
+.. figure:: images/hardware-design/p9-header.*
     :width: 570
     :align: center
     :alt: P9 cape header
 
     P9 cape header
 
-.. figure:: media/hardware-design/level-translator.*
+.. figure:: images/hardware-design/level-translator.*
     :width: 1070
     :align: center
     :alt: Cape header voltage level translator
@@ -189,14 +189,14 @@ P8 & P9 cape header pins
 ADC
 ===
 
-.. figure:: media/hardware-design/adc.*
+.. figure:: images/hardware-design/adc.*
     :width: 720
     :align: center
     :alt: 16bit Delta-Sigma ADC
 
     16bit Delta-Sigma ADC
 
-.. figure:: media/hardware-design/adc-ldo.*
+.. figure:: images/hardware-design/adc-ldo.*
     :width: 270
     :align: center
     :alt: ADC LDO power supply
@@ -209,7 +209,7 @@ Buttons and LEDs
 User LEDs and Power LED
 ========================
 
-.. figure:: media/hardware-design/leds.*
+.. figure:: images/hardware-design/leds.*
     :width: 720
     :align: center
     :alt: User LEDs and power LED
@@ -219,14 +219,14 @@ User LEDs and Power LED
 User and reset button
 =======================
 
-.. figure:: media/hardware-design/user-button.*
+.. figure:: images/hardware-design/user-button.*
     :width: 420
     :align: center
     :alt: User button
 
     User button
 
-.. figure:: media/hardware-design/reset-button.*
+.. figure:: images/hardware-design/reset-button.*
     :width: 420
     :align: center
     :alt: Reset button
@@ -239,7 +239,7 @@ Connectivity
 Ethernet
 ========
 
-.. figure:: media/hardware-design/gigabit-ethernet.*
+.. figure:: images/hardware-design/gigabit-ethernet.*
     :width: 970
     :align: center
     :alt: Gigabit ethernet
@@ -252,7 +252,7 @@ Memory, Media and Data storage
 DDR memory
 ==========
 
-.. figure:: media/hardware-design/lpdd4.*
+.. figure:: images/hardware-design/lpdd4.*
     :width: 970
     :align: center
     :alt: LPDDR memory
@@ -262,7 +262,7 @@ DDR memory
 eMMC
 =====
 
-.. figure:: media/hardware-design/emmc.*
+.. figure:: images/hardware-design/emmc.*
     :width: 970
     :align: center
     :alt: EMMC flash storage
@@ -272,7 +272,7 @@ eMMC
 microSD
 =======
 
-.. figure:: media/hardware-design/sdcard.*
+.. figure:: images/hardware-design/sdcard.*
     :width: 970
     :align: center
     :alt: SD Card socket
@@ -282,7 +282,7 @@ microSD
 EEPROM
 ======
 
-.. figure:: media/hardware-design/eeprom.*
+.. figure:: images/hardware-design/eeprom.*
     :width: 420
     :align: center
     :alt: EEPROM
@@ -292,7 +292,7 @@ EEPROM
 SPI flash
 ==========
 
-.. figure:: media/hardware-design/spi-flash.*
+.. figure:: images/hardware-design/spi-flash.*
     :width: 470
     :align: center
     :alt: SPI Flash
@@ -305,7 +305,7 @@ Multimedia I/O
 CSI
 ====
 
-.. figure:: media/hardware-design/csi.*
+.. figure:: images/hardware-design/csi.*
     :width: 470
     :align: center
     :alt: CSI
@@ -318,7 +318,7 @@ Debug
 UART debug port 
 ===============
 
-.. figure:: media/hardware-design/uart-debug-header.*
+.. figure:: images/hardware-design/uart-debug-header.*
     :width: 470
     :align: center
     :alt: UART debug header
@@ -328,7 +328,7 @@ UART debug port
 JTAG debug port
 ===============
 
-.. figure:: media/hardware-design/jtag.*
+.. figure:: images/hardware-design/jtag.*
     :width: 470
     :align: center
     :alt: JTAG debug header
diff --git a/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst b/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
index 52d52f6aa550c78705dcd3aa4f22beadf8adcaf4..ec0379e3bd059840df11991b6d51f83016f94b65 100644
--- a/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
@@ -112,7 +112,7 @@ Flashing eMMC
 
 Connect to BeagleV-Fire UART debug port using a 3.3v USB to UART bridge.
 
-.. figure:: ../media/debug/BeagleV-Fire-UART-Debug.*
+.. figure:: ../images/debug/BeagleV-Fire-UART-Debug.*
     :width: 1240
     :align: center
     :alt: UART debug connection
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
index 43554b4c4276f446c1b934f772894e00aa4213e0..62b7fdb37510d53ecdaafd287c540d366fcca4db 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
@@ -32,7 +32,7 @@ Navigate to BeagleV-Fire's `gateware source code repository <https://git.beagleb
 
 Click on the ``Forks`` button on the top-right corner.
 
-.. figure:: media/gateware-beaglev-fire-fork.png
+.. figure:: images/gateware-beaglev-fire-fork.png
     :align: center
     :width: 1040
     :alt: BeagleV-Fire gateware repo fork button 
@@ -43,7 +43,7 @@ Click on the ``Forks`` button on the top-right corner.
 On the Fork Project page, select your namespace and adjust the project name to help you manage multiple 
 custom gateware (e.g. ``my-lovely-gateware``). Click the ``Fork project`` button.
 
-.. figure:: media/verilog-gateware-fork.png
+.. figure:: images/verilog-gateware-fork.png
     :align: center
     :width: 1040
     :alt: Create gateware fork
@@ -360,7 +360,7 @@ Navigate to your forked repository. Click Pipelines in the left pane then the Do
 button on the right handside. Select ``build-job:archive``. This will result in an ``artifacts.zip`` file
 being downloaded.
 
-.. figure:: media/gateware-pipeline.png
+.. figure:: images/gateware-pipeline.png
     :align: center
     :width: 1040
     :alt: gateware pipeline 
@@ -401,7 +401,7 @@ device tree overlays:
 
     tree /proc/device-tree/chosen/overlays/
 
-.. figure:: media/gateware-lovely-overlay.png
+.. figure:: images/gateware-lovely-overlay.png
     :align: center
     :width: 740
     :alt: gateware lovely overlay
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
index 7dd296786dadd406bd6b8f24c55ab3baefb52442..1dd38c755efed3e6dad1934096bc13f9efe6af3d 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
@@ -37,7 +37,7 @@ The chip configuration applied by the HSS icludes the configuration of:
 Of course all these components need to be in synch with each other for the system to work properly.
 This is the reason for using a gateware build system rather than building and tracking each component individually.
 
-.. figure:: media/Gateware-Flow-bitstream-builder-full-picture.png
+.. figure:: images/Gateware-Flow-bitstream-builder-full-picture.png
     :align: center
     :alt: BeagleV-Fire Gateware Full Build Flow
 
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
index fbff959823e75cff914607870990150719af2a75..6c42f12434ddca42fd5ba54a4408b1feebe18c67 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
@@ -21,7 +21,7 @@ The gateware project is made up of:
 
 All these files are found in the FPGA-design directory.
 
-.. figure:: media/gateware-source-dir.*
+.. figure:: images/gateware-source-dir.*
     :align: center
 
 
@@ -37,7 +37,7 @@ The gateware is organized into 6 components:
 - MIPI camera interface
 - SYZYGY high speed interface
 
-.. figure:: media/gateware-components.*
+.. figure:: images/gateware-components.*
     :align: center
 
 Gateware Build Options
@@ -47,7 +47,7 @@ Each interface component may have a number of build options. For example, which
 supported by the generated gateware.
 
 
-.. figure:: media/gateware-cape-options.*
+.. figure:: images/gateware-cape-options.*
     :align: center
 
 The name of the directories within the component's directory are the option names passed to the
@@ -67,7 +67,7 @@ The component directory contains subdirectories for:
 - Device tree overlay
 - Optional HDL/Verilog source code
 
-.. figure:: media/gateware-cape-robotics-dirs.png
+.. figure:: images/gateware-cape-robotics-dirs.png
     :align: center
 
 Gareware TCL Scripts
@@ -78,7 +78,7 @@ The TCL script framework executes a hand-crafted ADD_<COMPONENT_NAME>.tcl script
 the component and stiches it to the base RISC-V subsystem and top level IOs. The other TCL scripts
 are typically IP configuration scripts and SmartDesign stiching scripts.
 
-.. figure:: media/gateware-cape-robotics-files.png
+.. figure:: images/gateware-cape-robotics-files.png
     :align: center
 
 
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
index 9c09856e92c274cb36cb2efeff0925857e0a9c90..009f32c61fa2767c4283017a107c74b719658837 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
@@ -16,7 +16,7 @@ You can retrieve that information using the following command:
 
 This should give an output similar to the one below.
 
-.. figure:: media/dts-design-info.png
+.. figure:: images/dts-design-info.png
     :align: center
 
 The gateware version can be retrieve by reading one of the overlay files. For example, the command:
@@ -28,7 +28,7 @@ The gateware version can be retrieve by reading one of the overlay files. For ex
 
 should result in:
 
-.. figure:: media/dts-design-version.png
+.. figure:: images/dts-design-version.png
     :align: center
 
 where the result of a "git describe" command on the gateware repository is displayed. This provides the
@@ -41,7 +41,7 @@ Bootloader messages
 The Hart Software Services display the gateware design name and design version retrieve from the FPGA
 at system start-up.
 
-.. figure:: media/hss-design-info.png
+.. figure:: images/hss-design-info.png
     :align: center
 
 The design name is the name of the build option selected when using the bitstream-builder to generate
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/Gateware-Flow-bitstream-builder-full-picture.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/Gateware-Flow-bitstream-builder-full-picture.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-simplified-overview.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/Gateware-Flow-simplified-overview.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-simplified-overview.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/Gateware-Flow-simplified-overview.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-info.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/dts-design-info.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-info.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/dts-design-info.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-version.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/dts-design-version.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-version.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/dts-design-version.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-beaglev-fire-fork.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-beaglev-fire-fork.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-beaglev-fire-fork.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-beaglev-fire-fork.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-options.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-options.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-options.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-options.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-robotics-dirs.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-robotics-dirs.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-robotics-dirs.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-robotics-dirs.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-robotics-files.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-robotics-files.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-cape-robotics-files.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-cape-robotics-files.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-components.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-components.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-components.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-components.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-lovely-overlay.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-lovely-overlay.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-lovely-overlay.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-lovely-overlay.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-pipeline.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-pipeline.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-pipeline.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-pipeline.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-source-dir.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-source-dir.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/gateware-source-dir.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/gateware-source-dir.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/hss-design-info.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/hss-design-info.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/hss-design-info.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/hss-design-info.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/media/verilog-gateware-fork.png b/boards/beaglev/fire/demos-and-tutorials/gateware/images/verilog-gateware-fork.png
similarity index 100%
rename from boards/beaglev/fire/demos-and-tutorials/gateware/media/verilog-gateware-fork.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/images/verilog-gateware-fork.png
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
index 27d346cf738fbfcf4f0f216f59ea3cc5ea57ffd9..90bd297691112dde3b41bd3c842ed72cb9da2b49 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
@@ -13,7 +13,7 @@ Gateware Architecture
 
 The diagram below is a simplified overview of the gateware's structure.
 
-.. figure:: media/Gateware-Flow-simplified-overview.*
+.. figure:: images/Gateware-Flow-simplified-overview.*
     :align: center
     :alt: BeagleV-Fire Simplified Gateware
 
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.jpg b/boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.jpg
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.jpg
rename to boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.jpg
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.png b/boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.png
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.png
rename to boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.png
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.webp b/boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.webp
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Back-Annotated.webp
rename to boards/beaglev/fire/images/BeagleV-Fire-Back-Annotated.webp
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.jpg b/boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.jpg
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.jpg
rename to boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.jpg
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.png b/boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.png
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.png
rename to boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.png
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.webp b/boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.webp
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-Front-Annotated.webp
rename to boards/beaglev/fire/images/BeagleV-Fire-Front-Annotated.webp
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-hero.jpg b/boards/beaglev/fire/images/BeagleV-Fire-hero.jpg
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-hero.jpg
rename to boards/beaglev/fire/images/BeagleV-Fire-hero.jpg
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-hero.png b/boards/beaglev/fire/images/BeagleV-Fire-hero.png
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-hero.png
rename to boards/beaglev/fire/images/BeagleV-Fire-hero.png
diff --git a/boards/beaglev/fire/media/BeagleV-Fire-hero.webp b/boards/beaglev/fire/images/BeagleV-Fire-hero.webp
similarity index 100%
rename from boards/beaglev/fire/media/BeagleV-Fire-hero.webp
rename to boards/beaglev/fire/images/BeagleV-Fire-hero.webp
diff --git a/boards/beaglev/fire/media/certification-mark-US002572-stacked.svg b/boards/beaglev/fire/images/certification-mark-US002572-stacked.svg
similarity index 100%
rename from boards/beaglev/fire/media/certification-mark-US002572-stacked.svg
rename to boards/beaglev/fire/images/certification-mark-US002572-stacked.svg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/01-introduction.jpg b/boards/beaglev/fire/images/chapter-thumbnails/01-introduction.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/01-introduction.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/01-introduction.jpg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/02-quick-start.jpg b/boards/beaglev/fire/images/chapter-thumbnails/02-quick-start.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/02-quick-start.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/02-quick-start.jpg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/03-design-and-specifications.jpg b/boards/beaglev/fire/images/chapter-thumbnails/03-design-and-specifications.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/03-design-and-specifications.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/03-design-and-specifications.jpg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/04-connectors-and-pinouts.jpg b/boards/beaglev/fire/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/04-connectors-and-pinouts.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/04-connectors-and-pinouts.jpg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/05-demos-and-tutorials.jpg b/boards/beaglev/fire/images/chapter-thumbnails/05-demos-and-tutorials.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/05-demos-and-tutorials.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/05-demos-and-tutorials.jpg
diff --git a/boards/beaglev/fire/media/chapter-thumbnails/06-support-documents.jpg b/boards/beaglev/fire/images/chapter-thumbnails/06-support-documents.jpg
similarity index 100%
rename from boards/beaglev/fire/media/chapter-thumbnails/06-support-documents.jpg
rename to boards/beaglev/fire/images/chapter-thumbnails/06-support-documents.jpg
diff --git a/boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.jpg b/boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.jpg
similarity index 100%
rename from boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.jpg
rename to boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.jpg
diff --git a/boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.png b/boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.png
similarity index 100%
rename from boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.png
rename to boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.png
diff --git a/boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.webp b/boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.webp
similarity index 100%
rename from boards/beaglev/fire/media/debug/BeagleV-Fire-UART-Debug.webp
rename to boards/beaglev/fire/images/debug/BeagleV-Fire-UART-Debug.webp
diff --git a/boards/beaglev/fire/media/hardware-design/100mhz-refclk.png b/boards/beaglev/fire/images/hardware-design/100mhz-refclk.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/100mhz-refclk.png
rename to boards/beaglev/fire/images/hardware-design/100mhz-refclk.png
diff --git a/boards/beaglev/fire/media/hardware-design/100mhz-refclk.svg b/boards/beaglev/fire/images/hardware-design/100mhz-refclk.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/100mhz-refclk.svg
rename to boards/beaglev/fire/images/hardware-design/100mhz-refclk.svg
diff --git a/boards/beaglev/fire/media/hardware-design/100mhz-refclk.webp b/boards/beaglev/fire/images/hardware-design/100mhz-refclk.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/100mhz-refclk.webp
rename to boards/beaglev/fire/images/hardware-design/100mhz-refclk.webp
diff --git a/boards/beaglev/fire/media/hardware-design/adc-ldo.png b/boards/beaglev/fire/images/hardware-design/adc-ldo.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc-ldo.png
rename to boards/beaglev/fire/images/hardware-design/adc-ldo.png
diff --git a/boards/beaglev/fire/media/hardware-design/adc-ldo.svg b/boards/beaglev/fire/images/hardware-design/adc-ldo.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc-ldo.svg
rename to boards/beaglev/fire/images/hardware-design/adc-ldo.svg
diff --git a/boards/beaglev/fire/media/hardware-design/adc-ldo.webp b/boards/beaglev/fire/images/hardware-design/adc-ldo.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc-ldo.webp
rename to boards/beaglev/fire/images/hardware-design/adc-ldo.webp
diff --git a/boards/beaglev/fire/media/hardware-design/adc.png b/boards/beaglev/fire/images/hardware-design/adc.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc.png
rename to boards/beaglev/fire/images/hardware-design/adc.png
diff --git a/boards/beaglev/fire/media/hardware-design/adc.svg b/boards/beaglev/fire/images/hardware-design/adc.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc.svg
rename to boards/beaglev/fire/images/hardware-design/adc.svg
diff --git a/boards/beaglev/fire/media/hardware-design/adc.webp b/boards/beaglev/fire/images/hardware-design/adc.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/adc.webp
rename to boards/beaglev/fire/images/hardware-design/adc.webp
diff --git a/boards/beaglev/fire/media/hardware-design/csi.png b/boards/beaglev/fire/images/hardware-design/csi.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/csi.png
rename to boards/beaglev/fire/images/hardware-design/csi.png
diff --git a/boards/beaglev/fire/media/hardware-design/csi.svg b/boards/beaglev/fire/images/hardware-design/csi.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/csi.svg
rename to boards/beaglev/fire/images/hardware-design/csi.svg
diff --git a/boards/beaglev/fire/media/hardware-design/csi.webp b/boards/beaglev/fire/images/hardware-design/csi.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/csi.webp
rename to boards/beaglev/fire/images/hardware-design/csi.webp
diff --git a/boards/beaglev/fire/media/hardware-design/dc-5v-input.png b/boards/beaglev/fire/images/hardware-design/dc-5v-input.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/dc-5v-input.png
rename to boards/beaglev/fire/images/hardware-design/dc-5v-input.png
diff --git a/boards/beaglev/fire/media/hardware-design/dc-5v-input.svg b/boards/beaglev/fire/images/hardware-design/dc-5v-input.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/dc-5v-input.svg
rename to boards/beaglev/fire/images/hardware-design/dc-5v-input.svg
diff --git a/boards/beaglev/fire/media/hardware-design/dc-5v-input.webp b/boards/beaglev/fire/images/hardware-design/dc-5v-input.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/dc-5v-input.webp
rename to boards/beaglev/fire/images/hardware-design/dc-5v-input.webp
diff --git a/boards/beaglev/fire/media/hardware-design/eeprom.png b/boards/beaglev/fire/images/hardware-design/eeprom.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/eeprom.png
rename to boards/beaglev/fire/images/hardware-design/eeprom.png
diff --git a/boards/beaglev/fire/media/hardware-design/eeprom.svg b/boards/beaglev/fire/images/hardware-design/eeprom.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/eeprom.svg
rename to boards/beaglev/fire/images/hardware-design/eeprom.svg
diff --git a/boards/beaglev/fire/media/hardware-design/eeprom.webp b/boards/beaglev/fire/images/hardware-design/eeprom.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/eeprom.webp
rename to boards/beaglev/fire/images/hardware-design/eeprom.webp
diff --git a/boards/beaglev/fire/media/hardware-design/emmc.png b/boards/beaglev/fire/images/hardware-design/emmc.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/emmc.png
rename to boards/beaglev/fire/images/hardware-design/emmc.png
diff --git a/boards/beaglev/fire/media/hardware-design/emmc.svg b/boards/beaglev/fire/images/hardware-design/emmc.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/emmc.svg
rename to boards/beaglev/fire/images/hardware-design/emmc.svg
diff --git a/boards/beaglev/fire/media/hardware-design/emmc.webp b/boards/beaglev/fire/images/hardware-design/emmc.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/emmc.webp
rename to boards/beaglev/fire/images/hardware-design/emmc.webp
diff --git a/boards/beaglev/fire/media/hardware-design/gigabit-ethernet.png b/boards/beaglev/fire/images/hardware-design/gigabit-ethernet.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/gigabit-ethernet.png
rename to boards/beaglev/fire/images/hardware-design/gigabit-ethernet.png
diff --git a/boards/beaglev/fire/media/hardware-design/gigabit-ethernet.svg b/boards/beaglev/fire/images/hardware-design/gigabit-ethernet.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/gigabit-ethernet.svg
rename to boards/beaglev/fire/images/hardware-design/gigabit-ethernet.svg
diff --git a/boards/beaglev/fire/media/hardware-design/gigabit-ethernet.webp b/boards/beaglev/fire/images/hardware-design/gigabit-ethernet.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/gigabit-ethernet.webp
rename to boards/beaglev/fire/images/hardware-design/gigabit-ethernet.webp
diff --git a/boards/beaglev/fire/media/hardware-design/high-speed-connector.png b/boards/beaglev/fire/images/hardware-design/high-speed-connector.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/high-speed-connector.png
rename to boards/beaglev/fire/images/hardware-design/high-speed-connector.png
diff --git a/boards/beaglev/fire/media/hardware-design/high-speed-connector.svg b/boards/beaglev/fire/images/hardware-design/high-speed-connector.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/high-speed-connector.svg
rename to boards/beaglev/fire/images/hardware-design/high-speed-connector.svg
diff --git a/boards/beaglev/fire/media/hardware-design/high-speed-connector.webp b/boards/beaglev/fire/images/hardware-design/high-speed-connector.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/high-speed-connector.webp
rename to boards/beaglev/fire/images/hardware-design/high-speed-connector.webp
diff --git a/boards/beaglev/fire/media/hardware-design/ideal-diode.png b/boards/beaglev/fire/images/hardware-design/ideal-diode.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/ideal-diode.png
rename to boards/beaglev/fire/images/hardware-design/ideal-diode.png
diff --git a/boards/beaglev/fire/media/hardware-design/ideal-diode.svg b/boards/beaglev/fire/images/hardware-design/ideal-diode.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/ideal-diode.svg
rename to boards/beaglev/fire/images/hardware-design/ideal-diode.svg
diff --git a/boards/beaglev/fire/media/hardware-design/ideal-diode.webp b/boards/beaglev/fire/images/hardware-design/ideal-diode.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/ideal-diode.webp
rename to boards/beaglev/fire/images/hardware-design/ideal-diode.webp
diff --git a/boards/beaglev/fire/media/hardware-design/iic-tree-diagram.png b/boards/beaglev/fire/images/hardware-design/iic-tree-diagram.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/iic-tree-diagram.png
rename to boards/beaglev/fire/images/hardware-design/iic-tree-diagram.png
diff --git a/boards/beaglev/fire/media/hardware-design/iic-tree-diagram.svg b/boards/beaglev/fire/images/hardware-design/iic-tree-diagram.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/iic-tree-diagram.svg
rename to boards/beaglev/fire/images/hardware-design/iic-tree-diagram.svg
diff --git a/boards/beaglev/fire/media/hardware-design/iic-tree-diagram.webp b/boards/beaglev/fire/images/hardware-design/iic-tree-diagram.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/iic-tree-diagram.webp
rename to boards/beaglev/fire/images/hardware-design/iic-tree-diagram.webp
diff --git a/boards/beaglev/fire/media/hardware-design/jtag.png b/boards/beaglev/fire/images/hardware-design/jtag.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/jtag.png
rename to boards/beaglev/fire/images/hardware-design/jtag.png
diff --git a/boards/beaglev/fire/media/hardware-design/jtag.svg b/boards/beaglev/fire/images/hardware-design/jtag.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/jtag.svg
rename to boards/beaglev/fire/images/hardware-design/jtag.svg
diff --git a/boards/beaglev/fire/media/hardware-design/jtag.webp b/boards/beaglev/fire/images/hardware-design/jtag.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/jtag.webp
rename to boards/beaglev/fire/images/hardware-design/jtag.webp
diff --git a/boards/beaglev/fire/media/hardware-design/leds.png b/boards/beaglev/fire/images/hardware-design/leds.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/leds.png
rename to boards/beaglev/fire/images/hardware-design/leds.png
diff --git a/boards/beaglev/fire/media/hardware-design/leds.svg b/boards/beaglev/fire/images/hardware-design/leds.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/leds.svg
rename to boards/beaglev/fire/images/hardware-design/leds.svg
diff --git a/boards/beaglev/fire/media/hardware-design/leds.webp b/boards/beaglev/fire/images/hardware-design/leds.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/leds.webp
rename to boards/beaglev/fire/images/hardware-design/leds.webp
diff --git a/boards/beaglev/fire/media/hardware-design/level-translator.png b/boards/beaglev/fire/images/hardware-design/level-translator.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/level-translator.png
rename to boards/beaglev/fire/images/hardware-design/level-translator.png
diff --git a/boards/beaglev/fire/media/hardware-design/level-translator.svg b/boards/beaglev/fire/images/hardware-design/level-translator.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/level-translator.svg
rename to boards/beaglev/fire/images/hardware-design/level-translator.svg
diff --git a/boards/beaglev/fire/media/hardware-design/level-translator.webp b/boards/beaglev/fire/images/hardware-design/level-translator.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/level-translator.webp
rename to boards/beaglev/fire/images/hardware-design/level-translator.webp
diff --git a/boards/beaglev/fire/media/hardware-design/lpdd4.png b/boards/beaglev/fire/images/hardware-design/lpdd4.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/lpdd4.png
rename to boards/beaglev/fire/images/hardware-design/lpdd4.png
diff --git a/boards/beaglev/fire/media/hardware-design/lpdd4.svg b/boards/beaglev/fire/images/hardware-design/lpdd4.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/lpdd4.svg
rename to boards/beaglev/fire/images/hardware-design/lpdd4.svg
diff --git a/boards/beaglev/fire/media/hardware-design/lpdd4.webp b/boards/beaglev/fire/images/hardware-design/lpdd4.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/lpdd4.webp
rename to boards/beaglev/fire/images/hardware-design/lpdd4.webp
diff --git a/boards/beaglev/fire/media/hardware-design/mdot2-keye.png b/boards/beaglev/fire/images/hardware-design/mdot2-keye.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/mdot2-keye.png
rename to boards/beaglev/fire/images/hardware-design/mdot2-keye.png
diff --git a/boards/beaglev/fire/media/hardware-design/mdot2-keye.svg b/boards/beaglev/fire/images/hardware-design/mdot2-keye.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/mdot2-keye.svg
rename to boards/beaglev/fire/images/hardware-design/mdot2-keye.svg
diff --git a/boards/beaglev/fire/media/hardware-design/mdot2-keye.webp b/boards/beaglev/fire/images/hardware-design/mdot2-keye.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/mdot2-keye.webp
rename to boards/beaglev/fire/images/hardware-design/mdot2-keye.webp
diff --git a/boards/beaglev/fire/media/hardware-design/p8-header.png b/boards/beaglev/fire/images/hardware-design/p8-header.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p8-header.png
rename to boards/beaglev/fire/images/hardware-design/p8-header.png
diff --git a/boards/beaglev/fire/media/hardware-design/p8-header.svg b/boards/beaglev/fire/images/hardware-design/p8-header.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p8-header.svg
rename to boards/beaglev/fire/images/hardware-design/p8-header.svg
diff --git a/boards/beaglev/fire/media/hardware-design/p8-header.webp b/boards/beaglev/fire/images/hardware-design/p8-header.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p8-header.webp
rename to boards/beaglev/fire/images/hardware-design/p8-header.webp
diff --git a/boards/beaglev/fire/media/hardware-design/p9-header.png b/boards/beaglev/fire/images/hardware-design/p9-header.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p9-header.png
rename to boards/beaglev/fire/images/hardware-design/p9-header.png
diff --git a/boards/beaglev/fire/media/hardware-design/p9-header.svg b/boards/beaglev/fire/images/hardware-design/p9-header.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p9-header.svg
rename to boards/beaglev/fire/images/hardware-design/p9-header.svg
diff --git a/boards/beaglev/fire/media/hardware-design/p9-header.webp b/boards/beaglev/fire/images/hardware-design/p9-header.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/p9-header.webp
rename to boards/beaglev/fire/images/hardware-design/p9-header.webp
diff --git a/boards/beaglev/fire/media/hardware-design/power-tree-diagram.png b/boards/beaglev/fire/images/hardware-design/power-tree-diagram.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/power-tree-diagram.png
rename to boards/beaglev/fire/images/hardware-design/power-tree-diagram.png
diff --git a/boards/beaglev/fire/media/hardware-design/power-tree-diagram.svg b/boards/beaglev/fire/images/hardware-design/power-tree-diagram.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/power-tree-diagram.svg
rename to boards/beaglev/fire/images/hardware-design/power-tree-diagram.svg
diff --git a/boards/beaglev/fire/media/hardware-design/power-tree-diagram.webp b/boards/beaglev/fire/images/hardware-design/power-tree-diagram.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/power-tree-diagram.webp
rename to boards/beaglev/fire/images/hardware-design/power-tree-diagram.webp
diff --git a/boards/beaglev/fire/media/hardware-design/reset-button.png b/boards/beaglev/fire/images/hardware-design/reset-button.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/reset-button.png
rename to boards/beaglev/fire/images/hardware-design/reset-button.png
diff --git a/boards/beaglev/fire/media/hardware-design/reset-button.svg b/boards/beaglev/fire/images/hardware-design/reset-button.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/reset-button.svg
rename to boards/beaglev/fire/images/hardware-design/reset-button.svg
diff --git a/boards/beaglev/fire/media/hardware-design/reset-button.webp b/boards/beaglev/fire/images/hardware-design/reset-button.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/reset-button.webp
rename to boards/beaglev/fire/images/hardware-design/reset-button.webp
diff --git a/boards/beaglev/fire/media/hardware-design/sdcard.png b/boards/beaglev/fire/images/hardware-design/sdcard.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/sdcard.png
rename to boards/beaglev/fire/images/hardware-design/sdcard.png
diff --git a/boards/beaglev/fire/media/hardware-design/sdcard.svg b/boards/beaglev/fire/images/hardware-design/sdcard.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/sdcard.svg
rename to boards/beaglev/fire/images/hardware-design/sdcard.svg
diff --git a/boards/beaglev/fire/media/hardware-design/sdcard.webp b/boards/beaglev/fire/images/hardware-design/sdcard.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/sdcard.webp
rename to boards/beaglev/fire/images/hardware-design/sdcard.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank0.png b/boards/beaglev/fire/images/hardware-design/soc-bank0.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank0.png
rename to boards/beaglev/fire/images/hardware-design/soc-bank0.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank0.svg b/boards/beaglev/fire/images/hardware-design/soc-bank0.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank0.svg
rename to boards/beaglev/fire/images/hardware-design/soc-bank0.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank0.webp b/boards/beaglev/fire/images/hardware-design/soc-bank0.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank0.webp
rename to boards/beaglev/fire/images/hardware-design/soc-bank0.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank1.png b/boards/beaglev/fire/images/hardware-design/soc-bank1.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank1.png
rename to boards/beaglev/fire/images/hardware-design/soc-bank1.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank1.svg b/boards/beaglev/fire/images/hardware-design/soc-bank1.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank1.svg
rename to boards/beaglev/fire/images/hardware-design/soc-bank1.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank1.webp b/boards/beaglev/fire/images/hardware-design/soc-bank1.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank1.webp
rename to boards/beaglev/fire/images/hardware-design/soc-bank1.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank2.png b/boards/beaglev/fire/images/hardware-design/soc-bank2.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank2.png
rename to boards/beaglev/fire/images/hardware-design/soc-bank2.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank2.svg b/boards/beaglev/fire/images/hardware-design/soc-bank2.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank2.svg
rename to boards/beaglev/fire/images/hardware-design/soc-bank2.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank2.webp b/boards/beaglev/fire/images/hardware-design/soc-bank2.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank2.webp
rename to boards/beaglev/fire/images/hardware-design/soc-bank2.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank3.png b/boards/beaglev/fire/images/hardware-design/soc-bank3.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank3.png
rename to boards/beaglev/fire/images/hardware-design/soc-bank3.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank3.svg b/boards/beaglev/fire/images/hardware-design/soc-bank3.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank3.svg
rename to boards/beaglev/fire/images/hardware-design/soc-bank3.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank3.webp b/boards/beaglev/fire/images/hardware-design/soc-bank3.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank3.webp
rename to boards/beaglev/fire/images/hardware-design/soc-bank3.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank4.png b/boards/beaglev/fire/images/hardware-design/soc-bank4.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank4.png
rename to boards/beaglev/fire/images/hardware-design/soc-bank4.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank4.svg b/boards/beaglev/fire/images/hardware-design/soc-bank4.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank4.svg
rename to boards/beaglev/fire/images/hardware-design/soc-bank4.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-bank4.webp b/boards/beaglev/fire/images/hardware-design/soc-bank4.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-bank4.webp
rename to boards/beaglev/fire/images/hardware-design/soc-bank4.webp
diff --git a/boards/beaglev/fire/media/hardware-design/soc-power.png b/boards/beaglev/fire/images/hardware-design/soc-power.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-power.png
rename to boards/beaglev/fire/images/hardware-design/soc-power.png
diff --git a/boards/beaglev/fire/media/hardware-design/soc-power.svg b/boards/beaglev/fire/images/hardware-design/soc-power.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-power.svg
rename to boards/beaglev/fire/images/hardware-design/soc-power.svg
diff --git a/boards/beaglev/fire/media/hardware-design/soc-power.webp b/boards/beaglev/fire/images/hardware-design/soc-power.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/soc-power.webp
rename to boards/beaglev/fire/images/hardware-design/soc-power.webp
diff --git a/boards/beaglev/fire/media/hardware-design/spi-flash.png b/boards/beaglev/fire/images/hardware-design/spi-flash.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/spi-flash.png
rename to boards/beaglev/fire/images/hardware-design/spi-flash.png
diff --git a/boards/beaglev/fire/media/hardware-design/spi-flash.svg b/boards/beaglev/fire/images/hardware-design/spi-flash.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/spi-flash.svg
rename to boards/beaglev/fire/images/hardware-design/spi-flash.svg
diff --git a/boards/beaglev/fire/media/hardware-design/spi-flash.webp b/boards/beaglev/fire/images/hardware-design/spi-flash.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/spi-flash.webp
rename to boards/beaglev/fire/images/hardware-design/spi-flash.webp
diff --git a/boards/beaglev/fire/media/hardware-design/system-block-diagram.png b/boards/beaglev/fire/images/hardware-design/system-block-diagram.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/system-block-diagram.png
rename to boards/beaglev/fire/images/hardware-design/system-block-diagram.png
diff --git a/boards/beaglev/fire/media/hardware-design/system-block-diagram.svg b/boards/beaglev/fire/images/hardware-design/system-block-diagram.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/system-block-diagram.svg
rename to boards/beaglev/fire/images/hardware-design/system-block-diagram.svg
diff --git a/boards/beaglev/fire/media/hardware-design/system-block-diagram.webp b/boards/beaglev/fire/images/hardware-design/system-block-diagram.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/system-block-diagram.webp
rename to boards/beaglev/fire/images/hardware-design/system-block-diagram.webp
diff --git a/boards/beaglev/fire/media/hardware-design/uart-debug-header.png b/boards/beaglev/fire/images/hardware-design/uart-debug-header.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/uart-debug-header.png
rename to boards/beaglev/fire/images/hardware-design/uart-debug-header.png
diff --git a/boards/beaglev/fire/media/hardware-design/uart-debug-header.svg b/boards/beaglev/fire/images/hardware-design/uart-debug-header.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/uart-debug-header.svg
rename to boards/beaglev/fire/images/hardware-design/uart-debug-header.svg
diff --git a/boards/beaglev/fire/media/hardware-design/uart-debug-header.webp b/boards/beaglev/fire/images/hardware-design/uart-debug-header.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/uart-debug-header.webp
rename to boards/beaglev/fire/images/hardware-design/uart-debug-header.webp
diff --git a/boards/beaglev/fire/media/hardware-design/usb-c.png b/boards/beaglev/fire/images/hardware-design/usb-c.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/usb-c.png
rename to boards/beaglev/fire/images/hardware-design/usb-c.png
diff --git a/boards/beaglev/fire/media/hardware-design/usb-c.svg b/boards/beaglev/fire/images/hardware-design/usb-c.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/usb-c.svg
rename to boards/beaglev/fire/images/hardware-design/usb-c.svg
diff --git a/boards/beaglev/fire/media/hardware-design/usb-c.webp b/boards/beaglev/fire/images/hardware-design/usb-c.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/usb-c.webp
rename to boards/beaglev/fire/images/hardware-design/usb-c.webp
diff --git a/boards/beaglev/fire/media/hardware-design/user-button.png b/boards/beaglev/fire/images/hardware-design/user-button.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/user-button.png
rename to boards/beaglev/fire/images/hardware-design/user-button.png
diff --git a/boards/beaglev/fire/media/hardware-design/user-button.svg b/boards/beaglev/fire/images/hardware-design/user-button.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/user-button.svg
rename to boards/beaglev/fire/images/hardware-design/user-button.svg
diff --git a/boards/beaglev/fire/media/hardware-design/user-button.webp b/boards/beaglev/fire/images/hardware-design/user-button.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/user-button.webp
rename to boards/beaglev/fire/images/hardware-design/user-button.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v0.png b/boards/beaglev/fire/images/hardware-design/vcc-1v0.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v0.png
rename to boards/beaglev/fire/images/hardware-design/vcc-1v0.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v0.svg b/boards/beaglev/fire/images/hardware-design/vcc-1v0.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v0.svg
rename to boards/beaglev/fire/images/hardware-design/vcc-1v0.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v0.webp b/boards/beaglev/fire/images/hardware-design/vcc-1v0.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v0.webp
rename to boards/beaglev/fire/images/hardware-design/vcc-1v0.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v1.png b/boards/beaglev/fire/images/hardware-design/vcc-1v1.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v1.png
rename to boards/beaglev/fire/images/hardware-design/vcc-1v1.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v1.svg b/boards/beaglev/fire/images/hardware-design/vcc-1v1.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v1.svg
rename to boards/beaglev/fire/images/hardware-design/vcc-1v1.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v1.webp b/boards/beaglev/fire/images/hardware-design/vcc-1v1.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v1.webp
rename to boards/beaglev/fire/images/hardware-design/vcc-1v1.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v8.png b/boards/beaglev/fire/images/hardware-design/vcc-1v8.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v8.png
rename to boards/beaglev/fire/images/hardware-design/vcc-1v8.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v8.svg b/boards/beaglev/fire/images/hardware-design/vcc-1v8.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v8.svg
rename to boards/beaglev/fire/images/hardware-design/vcc-1v8.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-1v8.webp b/boards/beaglev/fire/images/hardware-design/vcc-1v8.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-1v8.webp
rename to boards/beaglev/fire/images/hardware-design/vcc-1v8.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-2v5.png b/boards/beaglev/fire/images/hardware-design/vcc-2v5.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-2v5.png
rename to boards/beaglev/fire/images/hardware-design/vcc-2v5.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-2v5.svg b/boards/beaglev/fire/images/hardware-design/vcc-2v5.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-2v5.svg
rename to boards/beaglev/fire/images/hardware-design/vcc-2v5.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-2v5.webp b/boards/beaglev/fire/images/hardware-design/vcc-2v5.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-2v5.webp
rename to boards/beaglev/fire/images/hardware-design/vcc-2v5.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-3v3.png b/boards/beaglev/fire/images/hardware-design/vcc-3v3.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-3v3.png
rename to boards/beaglev/fire/images/hardware-design/vcc-3v3.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-3v3.svg b/boards/beaglev/fire/images/hardware-design/vcc-3v3.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-3v3.svg
rename to boards/beaglev/fire/images/hardware-design/vcc-3v3.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcc-3v3.webp b/boards/beaglev/fire/images/hardware-design/vcc-3v3.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcc-3v3.webp
rename to boards/beaglev/fire/images/hardware-design/vcc-3v3.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vcca-1v0.png b/boards/beaglev/fire/images/hardware-design/vcca-1v0.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcca-1v0.png
rename to boards/beaglev/fire/images/hardware-design/vcca-1v0.png
diff --git a/boards/beaglev/fire/media/hardware-design/vcca-1v0.svg b/boards/beaglev/fire/images/hardware-design/vcca-1v0.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcca-1v0.svg
rename to boards/beaglev/fire/images/hardware-design/vcca-1v0.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vcca-1v0.webp b/boards/beaglev/fire/images/hardware-design/vcca-1v0.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vcca-1v0.webp
rename to boards/beaglev/fire/images/hardware-design/vcca-1v0.webp
diff --git a/boards/beaglev/fire/media/hardware-design/vio-enable.png b/boards/beaglev/fire/images/hardware-design/vio-enable.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vio-enable.png
rename to boards/beaglev/fire/images/hardware-design/vio-enable.png
diff --git a/boards/beaglev/fire/media/hardware-design/vio-enable.svg b/boards/beaglev/fire/images/hardware-design/vio-enable.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vio-enable.svg
rename to boards/beaglev/fire/images/hardware-design/vio-enable.svg
diff --git a/boards/beaglev/fire/media/hardware-design/vio-enable.webp b/boards/beaglev/fire/images/hardware-design/vio-enable.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/vio-enable.webp
rename to boards/beaglev/fire/images/hardware-design/vio-enable.webp
diff --git a/boards/beaglev/fire/media/hardware-design/xcvr.png b/boards/beaglev/fire/images/hardware-design/xcvr.png
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/xcvr.png
rename to boards/beaglev/fire/images/hardware-design/xcvr.png
diff --git a/boards/beaglev/fire/media/hardware-design/xcvr.svg b/boards/beaglev/fire/images/hardware-design/xcvr.svg
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/xcvr.svg
rename to boards/beaglev/fire/images/hardware-design/xcvr.svg
diff --git a/boards/beaglev/fire/media/hardware-design/xcvr.webp b/boards/beaglev/fire/images/hardware-design/xcvr.webp
similarity index 100%
rename from boards/beaglev/fire/media/hardware-design/xcvr.webp
rename to boards/beaglev/fire/images/hardware-design/xcvr.webp
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.jpg b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.jpg
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.jpg
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.jpg
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.png b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.png
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.png
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.png
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.svg b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.svg
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.svg
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.svg
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.webp b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.webp
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P8.webp
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P8.webp
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.jpg b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.jpg
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.jpg
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.jpg
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.png b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.png
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.png
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.png
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.svg b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.svg
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.svg
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.svg
diff --git a/boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.webp b/boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.webp
similarity index 100%
rename from boards/beaglev/fire/media/pinout/BeagleV-Fire-P9.webp
rename to boards/beaglev/fire/images/pinout/BeagleV-Fire-P9.webp
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45back.jpg b/boards/beaglev/fire/images/product-pictures/bvf-45back.jpg
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45back.jpg
rename to boards/beaglev/fire/images/product-pictures/bvf-45back.jpg
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45back.png b/boards/beaglev/fire/images/product-pictures/bvf-45back.png
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45back.png
rename to boards/beaglev/fire/images/product-pictures/bvf-45back.png
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45back.webp b/boards/beaglev/fire/images/product-pictures/bvf-45back.webp
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45back.webp
rename to boards/beaglev/fire/images/product-pictures/bvf-45back.webp
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45front.jpg b/boards/beaglev/fire/images/product-pictures/bvf-45front.jpg
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45front.jpg
rename to boards/beaglev/fire/images/product-pictures/bvf-45front.jpg
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45front.png b/boards/beaglev/fire/images/product-pictures/bvf-45front.png
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45front.png
rename to boards/beaglev/fire/images/product-pictures/bvf-45front.png
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-45front.webp b/boards/beaglev/fire/images/product-pictures/bvf-45front.webp
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-45front.webp
rename to boards/beaglev/fire/images/product-pictures/bvf-45front.webp
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-back.jpg b/boards/beaglev/fire/images/product-pictures/bvf-back.jpg
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-back.jpg
rename to boards/beaglev/fire/images/product-pictures/bvf-back.jpg
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-back.png b/boards/beaglev/fire/images/product-pictures/bvf-back.png
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-back.png
rename to boards/beaglev/fire/images/product-pictures/bvf-back.png
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-back.webp b/boards/beaglev/fire/images/product-pictures/bvf-back.webp
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-back.webp
rename to boards/beaglev/fire/images/product-pictures/bvf-back.webp
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-front.jpg b/boards/beaglev/fire/images/product-pictures/bvf-front.jpg
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-front.jpg
rename to boards/beaglev/fire/images/product-pictures/bvf-front.jpg
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-front.png b/boards/beaglev/fire/images/product-pictures/bvf-front.png
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-front.png
rename to boards/beaglev/fire/images/product-pictures/bvf-front.png
diff --git a/boards/beaglev/fire/media/product-pictures/bvf-front.webp b/boards/beaglev/fire/images/product-pictures/bvf-front.webp
similarity index 100%
rename from boards/beaglev/fire/media/product-pictures/bvf-front.webp
rename to boards/beaglev/fire/images/product-pictures/bvf-front.webp
diff --git a/boards/beaglev/fire/media/usb-guide/tethered-connection.jpg b/boards/beaglev/fire/images/usb-guide/tethered-connection.jpg
similarity index 100%
rename from boards/beaglev/fire/media/usb-guide/tethered-connection.jpg
rename to boards/beaglev/fire/images/usb-guide/tethered-connection.jpg
diff --git a/boards/beaglev/fire/media/usb-guide/tethered-connection.png b/boards/beaglev/fire/images/usb-guide/tethered-connection.png
similarity index 100%
rename from boards/beaglev/fire/media/usb-guide/tethered-connection.png
rename to boards/beaglev/fire/images/usb-guide/tethered-connection.png
diff --git a/boards/beaglev/fire/media/usb-guide/tethered-connection.webp b/boards/beaglev/fire/images/usb-guide/tethered-connection.webp
similarity index 100%
rename from boards/beaglev/fire/media/usb-guide/tethered-connection.webp
rename to boards/beaglev/fire/images/usb-guide/tethered-connection.webp
diff --git a/boards/beaglev/fire/index.rst b/boards/beaglev/fire/index.rst
index 73c1c75cae762e6b1a382f3900eaaf6ddf7f2f17..e0f68a8fb04e6eb54b8f8df309499e316fe3eedb 100644
--- a/boards/beaglev/fire/index.rst
+++ b/boards/beaglev/fire/index.rst
@@ -14,7 +14,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
     .. grid-item::
         :columns: 12 12 12 4
 
-        .. figure:: media/certification-mark-US002572-stacked.*
+        .. figure:: images/certification-mark-US002572-stacked.*
             :width: 200
             :target: https://certification.oshwa.org/us002572.html
             :alt: BeagleV-Fire OSHW Mark
@@ -31,7 +31,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
             * For export, emissions and other compliance, see :ref:`beaglev-fire-support`
 
 
-.. image:: media/BeagleV-Fire-hero.*
+.. image:: images/BeagleV-Fire-hero.*
     :align: center
     :alt: BeagleV-Fire hero image
 
@@ -52,7 +52,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **1. Introduction**
         ^^^
 
-        .. image:: media/chapter-thumbnails/01-introduction.*
+        .. image:: images/chapter-thumbnails/01-introduction.*
             :align: center
             :alt: BeagleV-Fire Chapter01 thumbnail
         
@@ -68,7 +68,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **2. Quick start**
         ^^^
 
-        .. image:: media/chapter-thumbnails/02-quick-start.*
+        .. image:: images/chapter-thumbnails/02-quick-start.*
             :align: center
             :alt: BeagleV-Fire Chapter02 thumbnail
 
@@ -84,7 +84,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **3. Design & Specifications**
         ^^^
 
-        .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+        .. image:: images/chapter-thumbnails/03-design-and-specifications.*
             :align: center
             :alt: BeagleV-Fire Chapter03 thumbnail
 
@@ -100,7 +100,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **4. Expansion**
         ^^^
 
-        .. image:: media/chapter-thumbnails/04-connectors-and-pinouts.*
+        .. image:: images/chapter-thumbnails/04-connectors-and-pinouts.*
             :align: center
             :alt: BeagleV-Fire Chapter04 thumbnail
 
@@ -116,7 +116,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **5. Demos**
         ^^^
 
-        .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+        .. image:: images/chapter-thumbnails/05-demos-and-tutorials.*
             :align: center
             :alt: BeagleV-Fire Chapter5 thumbnail
 
@@ -131,7 +131,7 @@ BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists,
         **6. Support**
         ^^^
 
-        .. image:: media/chapter-thumbnails/06-support-documents.*
+        .. image:: images/chapter-thumbnails/06-support-documents.*
             :align: center
             :alt: BeagleV-Fire Chapter6 thumbnail
 
diff --git a/boards/beaglev/fire/media/certification-mark-US002572-stacked.png b/boards/beaglev/fire/media/certification-mark-US002572-stacked.png
deleted file mode 100644
index 6395288ea2674e6ba983232bdcc9289a09ef5ba2..0000000000000000000000000000000000000000
Binary files a/boards/beaglev/fire/media/certification-mark-US002572-stacked.png and /dev/null differ
diff --git a/boards/pocketbeagle/original/images/OSHW_mark_US000083.png b/boards/pocketbeagle/original/images/OSHW_mark_US000083.png
deleted file mode 100644
index 6a515b975fc47628c7919506564538c290315d70..0000000000000000000000000000000000000000
Binary files a/boards/pocketbeagle/original/images/OSHW_mark_US000083.png and /dev/null differ
diff --git a/boards/pocketbeagle/original/images/OSHW_mark_US000083.webp b/boards/pocketbeagle/original/images/OSHW_mark_US000083.webp
deleted file mode 100644
index a9e695522291bc7bb025be8a9d0199c660bf5fc3..0000000000000000000000000000000000000000
Binary files a/boards/pocketbeagle/original/images/OSHW_mark_US000083.webp and /dev/null differ
diff --git a/books/beaglebone-cookbook/04motors/motors.rst b/books/beaglebone-cookbook/04motors/motors.rst
index 94bd69f1aec2a8b7c70d999b8180f5f19ce10420..f256f739265f415264f876619d197972ce328137 100644
--- a/books/beaglebone-cookbook/04motors/motors.rst
+++ b/books/beaglebone-cookbook/04motors/motors.rst
@@ -125,12 +125,12 @@ Controlling a Servo with an Rotary Encoder
 Problem
 --------
 
-You have a rotary encoder from :ref:`digital_rotaryEncoder_js` that you want to control a servo motor.
+You have a rotary encoder from from chapter 2 rotary encoder example that you want to use to control a servo motor.
 
 Solution
 ---------
 
-Combine the code from :ref:`digital_rotaryEncoder_js` and :ref:`motors_servo`.
+Combine the code from ``rotaryEncoder.js`` and ``servoMotor.js``.
 
 
 .. code-block:: bash
diff --git a/projects/beagleconnect/media/BeagleConnect-Freedom-Front.png b/projects/beagleconnect/images/BeagleConnect-Freedom-Front.png
similarity index 100%
rename from projects/beagleconnect/media/BeagleConnect-Freedom-Front.png
rename to projects/beagleconnect/images/BeagleConnect-Freedom-Front.png
diff --git a/projects/beagleconnect/media/SoftwareProp.jpg b/projects/beagleconnect/images/SoftwareProp.jpg
similarity index 100%
rename from projects/beagleconnect/media/SoftwareProp.jpg
rename to projects/beagleconnect/images/SoftwareProp.jpg
diff --git a/projects/beagleconnect/media/bcf_block_diagram.png b/projects/beagleconnect/images/bcf_block_diagram.png
similarity index 100%
rename from projects/beagleconnect/media/bcf_block_diagram.png
rename to projects/beagleconnect/images/bcf_block_diagram.png
diff --git a/projects/beagleconnect/media/bcf_block_diagram.svg b/projects/beagleconnect/images/bcf_block_diagram.svg
similarity index 100%
rename from projects/beagleconnect/media/bcf_block_diagram.svg
rename to projects/beagleconnect/images/bcf_block_diagram.svg
diff --git a/projects/beagleconnect/index.rst b/projects/beagleconnect/index.rst
index 5da423616cb7498eb662f1c337cb9d6fc20815ff..588b63ffc70c4456e21983a95a876d72c564fbd4 100644
--- a/projects/beagleconnect/index.rst
+++ b/projects/beagleconnect/index.rst
@@ -20,7 +20,7 @@ the principles of operation.
 
 Background
 **********
-.. image:: media/SoftwareProp.jpg
+.. image:: images/SoftwareProp.jpg
    :width: 600
    :align: center
    :height: 400