diff --git a/_static/images/oshw/PocketBeagle_pocketbeagle#original_US000083.svg b/_static/images/oshw/PocketBeagle_pocketbeagle_US000083.svg
similarity index 100%
rename from _static/images/oshw/PocketBeagle_pocketbeagle#original_US000083.svg
rename to _static/images/oshw/PocketBeagle_pocketbeagle_US000083.svg
diff --git a/boards/index.rst b/boards/index.rst
index 1460608ec81957737402a3aab5baa47575752527..89bacb47125ae903b5826638f40215722475a079 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -46,7 +46,7 @@ started.
    beaglebone/index
    beaglev/ahead/index
    beaglev/fire/index
-   pocketbeagle/original/index
+   pocketbeagle/index
    beagleconnect/freedom/index
    beagleconnect/index
    beagleboard/index
diff --git a/boards/pocketbeagle/original/System-Reference-Manual.wiki b/boards/pocketbeagle/System-Reference-Manual.wiki
similarity index 100%
rename from boards/pocketbeagle/original/System-Reference-Manual.wiki
rename to boards/pocketbeagle/System-Reference-Manual.wiki
diff --git a/boards/pocketbeagle/original/ch01.rst b/boards/pocketbeagle/ch01.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch01.rst
rename to boards/pocketbeagle/ch01.rst
diff --git a/boards/pocketbeagle/original/ch02.rst b/boards/pocketbeagle/ch02.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch02.rst
rename to boards/pocketbeagle/ch02.rst
diff --git a/boards/pocketbeagle/original/ch03.rst b/boards/pocketbeagle/ch03.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch03.rst
rename to boards/pocketbeagle/ch03.rst
diff --git a/boards/pocketbeagle/original/ch04.rst b/boards/pocketbeagle/ch04.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch04.rst
rename to boards/pocketbeagle/ch04.rst
diff --git a/boards/pocketbeagle/original/ch05.rst b/boards/pocketbeagle/ch05.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch05.rst
rename to boards/pocketbeagle/ch05.rst
diff --git a/boards/pocketbeagle/original/ch06.rst b/boards/pocketbeagle/ch06.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch06.rst
rename to boards/pocketbeagle/ch06.rst
diff --git a/boards/pocketbeagle/original/ch07.rst b/boards/pocketbeagle/ch07.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch07.rst
rename to boards/pocketbeagle/ch07.rst
diff --git a/boards/pocketbeagle/original/ch08.rst b/boards/pocketbeagle/ch08.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch08.rst
rename to boards/pocketbeagle/ch08.rst
diff --git a/boards/pocketbeagle/original/ch09.rst b/boards/pocketbeagle/ch09.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch09.rst
rename to boards/pocketbeagle/ch09.rst
diff --git a/boards/pocketbeagle/original/ch10.rst b/boards/pocketbeagle/ch10.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch10.rst
rename to boards/pocketbeagle/ch10.rst
diff --git a/boards/pocketbeagle/original/ch11.rst b/boards/pocketbeagle/ch11.rst
similarity index 100%
rename from boards/pocketbeagle/original/ch11.rst
rename to boards/pocketbeagle/ch11.rst
diff --git a/boards/pocketbeagle/original/images/10fig-PB-SDcardinsert1.jpg b/boards/pocketbeagle/images/10fig-PB-SDcardinsert1.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/10fig-PB-SDcardinsert1.jpg
rename to boards/pocketbeagle/images/10fig-PB-SDcardinsert1.jpg
diff --git a/boards/pocketbeagle/original/images/10fig-PB-SDcardinsert2.jpg b/boards/pocketbeagle/images/10fig-PB-SDcardinsert2.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/10fig-PB-SDcardinsert2.jpg
rename to boards/pocketbeagle/images/10fig-PB-SDcardinsert2.jpg
diff --git a/boards/pocketbeagle/original/images/11fig-PB-microUSBattach1.jpg b/boards/pocketbeagle/images/11fig-PB-microUSBattach1.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/11fig-PB-microUSBattach1.jpg
rename to boards/pocketbeagle/images/11fig-PB-microUSBattach1.jpg
diff --git a/boards/pocketbeagle/original/images/12fig-PB-USBtoPC1.jpg b/boards/pocketbeagle/images/12fig-PB-USBtoPC1.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/12fig-PB-USBtoPC1.jpg
rename to boards/pocketbeagle/images/12fig-PB-USBtoPC1.jpg
diff --git a/boards/pocketbeagle/original/images/13fig-PB-PowerLED1.png b/boards/pocketbeagle/images/13fig-PB-PowerLED1.png
similarity index 100%
rename from boards/pocketbeagle/original/images/13fig-PB-PowerLED1.png
rename to boards/pocketbeagle/images/13fig-PB-PowerLED1.png
diff --git a/boards/pocketbeagle/original/images/14fig-PB-UserLEDs1.png b/boards/pocketbeagle/images/14fig-PB-UserLEDs1.png
similarity index 100%
rename from boards/pocketbeagle/original/images/14fig-PB-UserLEDs1.png
rename to boards/pocketbeagle/images/14fig-PB-UserLEDs1.png
diff --git a/boards/pocketbeagle/original/images/15fig-PB-starthtmpage.png b/boards/pocketbeagle/images/15fig-PB-starthtmpage.png
similarity index 100%
rename from boards/pocketbeagle/original/images/15fig-PB-starthtmpage.png
rename to boards/pocketbeagle/images/15fig-PB-starthtmpage.png
diff --git a/boards/pocketbeagle/original/images/16fig-PB-enablenetwork.png b/boards/pocketbeagle/images/16fig-PB-enablenetwork.png
similarity index 100%
rename from boards/pocketbeagle/original/images/16fig-PB-enablenetwork.png
rename to boards/pocketbeagle/images/16fig-PB-enablenetwork.png
diff --git a/boards/pocketbeagle/original/images/17fig-PB-cloud9.png b/boards/pocketbeagle/images/17fig-PB-cloud9.png
similarity index 100%
rename from boards/pocketbeagle/original/images/17fig-PB-cloud9.png
rename to boards/pocketbeagle/images/17fig-PB-cloud9.png
diff --git a/boards/pocketbeagle/original/images/18fig-PB-cloud9exs.png b/boards/pocketbeagle/images/18fig-PB-cloud9exs.png
similarity index 100%
rename from boards/pocketbeagle/original/images/18fig-PB-cloud9exs.png
rename to boards/pocketbeagle/images/18fig-PB-cloud9exs.png
diff --git a/boards/pocketbeagle/original/images/19fig-PB-cloud9blink.png b/boards/pocketbeagle/images/19fig-PB-cloud9blink.png
similarity index 100%
rename from boards/pocketbeagle/original/images/19fig-PB-cloud9blink.png
rename to boards/pocketbeagle/images/19fig-PB-cloud9blink.png
diff --git a/boards/pocketbeagle/original/images/1fig-PB-homepage.png b/boards/pocketbeagle/images/1fig-PB-homepage.png
similarity index 100%
rename from boards/pocketbeagle/original/images/1fig-PB-homepage.png
rename to boards/pocketbeagle/images/1fig-PB-homepage.png
diff --git a/boards/pocketbeagle/original/images/20fig-PB-powerbutton.png b/boards/pocketbeagle/images/20fig-PB-powerbutton.png
similarity index 100%
rename from boards/pocketbeagle/original/images/20fig-PB-powerbutton.png
rename to boards/pocketbeagle/images/20fig-PB-powerbutton.png
diff --git a/boards/pocketbeagle/original/images/21fig-PB-walkaround.jpg b/boards/pocketbeagle/images/21fig-PB-walkaround.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/21fig-PB-walkaround.jpg
rename to boards/pocketbeagle/images/21fig-PB-walkaround.jpg
diff --git a/boards/pocketbeagle/original/images/21fig-PB-walkaround.webp b/boards/pocketbeagle/images/21fig-PB-walkaround.webp
similarity index 100%
rename from boards/pocketbeagle/original/images/21fig-PB-walkaround.webp
rename to boards/pocketbeagle/images/21fig-PB-walkaround.webp
diff --git a/boards/pocketbeagle/original/images/22fig-PB-blockdiagram.png b/boards/pocketbeagle/images/22fig-PB-blockdiagram.png
similarity index 100%
rename from boards/pocketbeagle/original/images/22fig-PB-blockdiagram.png
rename to boards/pocketbeagle/images/22fig-PB-blockdiagram.png
diff --git a/boards/pocketbeagle/original/images/24fig-PB-Headerphoto.png b/boards/pocketbeagle/images/24fig-PB-Headerphoto.png
similarity index 100%
rename from boards/pocketbeagle/original/images/24fig-PB-Headerphoto.png
rename to boards/pocketbeagle/images/24fig-PB-Headerphoto.png
diff --git a/boards/pocketbeagle/original/images/25fig-PB-SDcard.png b/boards/pocketbeagle/images/25fig-PB-SDcard.png
similarity index 100%
rename from boards/pocketbeagle/original/images/25fig-PB-SDcard.png
rename to boards/pocketbeagle/images/25fig-PB-SDcard.png
diff --git a/boards/pocketbeagle/original/images/26fig-PB-USB.png b/boards/pocketbeagle/images/26fig-PB-USB.png
similarity index 100%
rename from boards/pocketbeagle/original/images/26fig-PB-USB.png
rename to boards/pocketbeagle/images/26fig-PB-USB.png
diff --git a/boards/pocketbeagle/original/images/27fig-PB-JTAGpads.png b/boards/pocketbeagle/images/27fig-PB-JTAGpads.png
similarity index 100%
rename from boards/pocketbeagle/original/images/27fig-PB-JTAGpads.png
rename to boards/pocketbeagle/images/27fig-PB-JTAGpads.png
diff --git a/boards/pocketbeagle/original/images/28fig-PB-serialdebug.png b/boards/pocketbeagle/images/28fig-PB-serialdebug.png
similarity index 100%
rename from boards/pocketbeagle/original/images/28fig-PB-serialdebug.png
rename to boards/pocketbeagle/images/28fig-PB-serialdebug.png
diff --git a/boards/pocketbeagle/original/images/40fig-PB-PRU-block.png b/boards/pocketbeagle/images/40fig-PB-PRU-block.png
similarity index 100%
rename from boards/pocketbeagle/original/images/40fig-PB-PRU-block.png
rename to boards/pocketbeagle/images/40fig-PB-PRU-block.png
diff --git a/boards/pocketbeagle/original/images/41fig-PB-Headerback.png b/boards/pocketbeagle/images/41fig-PB-Headerback.png
similarity index 100%
rename from boards/pocketbeagle/original/images/41fig-PB-Headerback.png
rename to boards/pocketbeagle/images/41fig-PB-Headerback.png
diff --git a/boards/pocketbeagle/original/images/46fig-PB-Mikro.png b/boards/pocketbeagle/images/46fig-PB-Mikro.png
similarity index 100%
rename from boards/pocketbeagle/original/images/46fig-PB-Mikro.png
rename to boards/pocketbeagle/images/46fig-PB-Mikro.png
diff --git a/boards/pocketbeagle/original/images/5fig-PB-GetStarted.png b/boards/pocketbeagle/images/5fig-PB-GetStarted.png
similarity index 100%
rename from boards/pocketbeagle/original/images/5fig-PB-GetStarted.png
rename to boards/pocketbeagle/images/5fig-PB-GetStarted.png
diff --git a/boards/pocketbeagle/original/images/6fig-PB-DownloadSW.png b/boards/pocketbeagle/images/6fig-PB-DownloadSW.png
similarity index 100%
rename from boards/pocketbeagle/original/images/6fig-PB-DownloadSW.png
rename to boards/pocketbeagle/images/6fig-PB-DownloadSW.png
diff --git a/boards/pocketbeagle/original/images/7fig-PB-Etcherdownload.png b/boards/pocketbeagle/images/7fig-PB-Etcherdownload.png
similarity index 100%
rename from boards/pocketbeagle/original/images/7fig-PB-Etcherdownload.png
rename to boards/pocketbeagle/images/7fig-PB-Etcherdownload.png
diff --git a/boards/pocketbeagle/original/images/8fig-PB-Etcherselectimage.png b/boards/pocketbeagle/images/8fig-PB-Etcherselectimage.png
similarity index 100%
rename from boards/pocketbeagle/original/images/8fig-PB-Etcherselectimage.png
rename to boards/pocketbeagle/images/8fig-PB-Etcherselectimage.png
diff --git a/boards/pocketbeagle/original/images/9fig-PB-Etcherfinish.png b/boards/pocketbeagle/images/9fig-PB-Etcherfinish.png
similarity index 100%
rename from boards/pocketbeagle/original/images/9fig-PB-Etcherfinish.png
rename to boards/pocketbeagle/images/9fig-PB-Etcherfinish.png
diff --git a/boards/pocketbeagle/original/images/Bonescript-ex.png b/boards/pocketbeagle/images/Bonescript-ex.png
similarity index 100%
rename from boards/pocketbeagle/original/images/Bonescript-ex.png
rename to boards/pocketbeagle/images/Bonescript-ex.png
diff --git a/boards/pocketbeagle/original/images/Header-P1-sch.png b/boards/pocketbeagle/images/Header-P1-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/Header-P1-sch.png
rename to boards/pocketbeagle/images/Header-P1-sch.png
diff --git a/boards/pocketbeagle/original/images/Header-P2-sch.png b/boards/pocketbeagle/images/Header-P2-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/Header-P2-sch.png
rename to boards/pocketbeagle/images/Header-P2-sch.png
diff --git a/boards/pocketbeagle/original/images/Header-both-sch.png b/boards/pocketbeagle/images/Header-both-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/Header-both-sch.png
rename to boards/pocketbeagle/images/Header-both-sch.png
diff --git a/boards/pocketbeagle/original/images/JTAG-pads-sch.png b/boards/pocketbeagle/images/JTAG-pads-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/JTAG-pads-sch.png
rename to boards/pocketbeagle/images/JTAG-pads-sch.png
diff --git a/boards/pocketbeagle/original/images/OSD335x-color-block.jpg b/boards/pocketbeagle/images/OSD335x-color-block.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/OSD335x-color-block.jpg
rename to boards/pocketbeagle/images/OSD335x-color-block.jpg
diff --git a/boards/pocketbeagle/original/images/OSHW_mark_US000083.svg b/boards/pocketbeagle/images/OSHW_mark_US000083.svg
similarity index 100%
rename from boards/pocketbeagle/original/images/OSHW_mark_US000083.svg
rename to boards/pocketbeagle/images/OSHW_mark_US000083.svg
diff --git a/boards/pocketbeagle/original/images/PB-USB-photo.png b/boards/pocketbeagle/images/PB-USB-photo.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-USB-photo.png
rename to boards/pocketbeagle/images/PB-USB-photo.png
diff --git a/boards/pocketbeagle/original/images/PB-block-diag2.jpg b/boards/pocketbeagle/images/PB-block-diag2.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-block-diag2.jpg
rename to boards/pocketbeagle/images/PB-block-diag2.jpg
diff --git a/boards/pocketbeagle/original/images/PB-block-diag3.png b/boards/pocketbeagle/images/PB-block-diag3.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-block-diag3.png
rename to boards/pocketbeagle/images/PB-block-diag3.png
diff --git a/boards/pocketbeagle/original/images/PB-block-diagram.png b/boards/pocketbeagle/images/PB-block-diagram.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-block-diagram.png
rename to boards/pocketbeagle/images/PB-block-diagram.png
diff --git a/boards/pocketbeagle/original/images/PB-card-back-1.jpg b/boards/pocketbeagle/images/PB-card-back-1.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-card-back-1.jpg
rename to boards/pocketbeagle/images/PB-card-back-1.jpg
diff --git a/boards/pocketbeagle/original/images/PB-card-back.jpg b/boards/pocketbeagle/images/PB-card-back.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-card-back.jpg
rename to boards/pocketbeagle/images/PB-card-back.jpg
diff --git a/boards/pocketbeagle/original/images/PB-card-front-1.jpg b/boards/pocketbeagle/images/PB-card-front-1.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-card-front-1.jpg
rename to boards/pocketbeagle/images/PB-card-front-1.jpg
diff --git a/boards/pocketbeagle/original/images/PB-card-front.jpg b/boards/pocketbeagle/images/PB-card-front.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-card-front.jpg
rename to boards/pocketbeagle/images/PB-card-front.jpg
diff --git a/boards/pocketbeagle/original/images/PB-header-photo.png b/boards/pocketbeagle/images/PB-header-photo.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-header-photo.png
rename to boards/pocketbeagle/images/PB-header-photo.png
diff --git a/boards/pocketbeagle/original/images/PB-microSDphoto-small.jpg b/boards/pocketbeagle/images/PB-microSDphoto-small.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-microSDphoto-small.jpg
rename to boards/pocketbeagle/images/PB-microSDphoto-small.jpg
diff --git a/boards/pocketbeagle/original/images/PB-microSDphoto.jpg b/boards/pocketbeagle/images/PB-microSDphoto.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-microSDphoto.jpg
rename to boards/pocketbeagle/images/PB-microSDphoto.jpg
diff --git a/boards/pocketbeagle/original/images/PB-powerLED-photo.png b/boards/pocketbeagle/images/PB-powerLED-photo.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-powerLED-photo.png
rename to boards/pocketbeagle/images/PB-powerLED-photo.png
diff --git a/boards/pocketbeagle/original/images/PB-powerbutton.png b/boards/pocketbeagle/images/PB-powerbutton.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-powerbutton.png
rename to boards/pocketbeagle/images/PB-powerbutton.png
diff --git a/boards/pocketbeagle/original/images/PB-tethered.png b/boards/pocketbeagle/images/PB-tethered.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-tethered.png
rename to boards/pocketbeagle/images/PB-tethered.png
diff --git a/boards/pocketbeagle/original/images/PB-tutorials.png b/boards/pocketbeagle/images/PB-tutorials.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-tutorials.png
rename to boards/pocketbeagle/images/PB-tutorials.png
diff --git a/boards/pocketbeagle/original/images/PB-userLED-photo.png b/boards/pocketbeagle/images/PB-userLED-photo.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-userLED-photo.png
rename to boards/pocketbeagle/images/PB-userLED-photo.png
diff --git a/boards/pocketbeagle/original/images/PB-walkaround-2.jpg b/boards/pocketbeagle/images/PB-walkaround-2.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-walkaround-2.jpg
rename to boards/pocketbeagle/images/PB-walkaround-2.jpg
diff --git a/boards/pocketbeagle/original/images/PB-walkaround-2.png b/boards/pocketbeagle/images/PB-walkaround-2.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-walkaround-2.png
rename to boards/pocketbeagle/images/PB-walkaround-2.png
diff --git a/boards/pocketbeagle/original/images/PB-walkaround-3.jpg b/boards/pocketbeagle/images/PB-walkaround-3.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-walkaround-3.jpg
rename to boards/pocketbeagle/images/PB-walkaround-3.jpg
diff --git a/boards/pocketbeagle/original/images/PB-walkaround.png b/boards/pocketbeagle/images/PB-walkaround.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PB-walkaround.png
rename to boards/pocketbeagle/images/PB-walkaround.png
diff --git a/boards/pocketbeagle/original/images/PB1-fullPC-3.jpg b/boards/pocketbeagle/images/PB1-fullPC-3.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PB1-fullPC-3.jpg
rename to boards/pocketbeagle/images/PB1-fullPC-3.jpg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle-size-compare-small.jpg b/boards/pocketbeagle/images/PocketBeagle-size-compare-small.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle-size-compare-small.jpg
rename to boards/pocketbeagle/images/PocketBeagle-size-compare-small.jpg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Back_BW.jpg b/boards/pocketbeagle/images/PocketBeagle_Back_BW.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Back_BW.jpg
rename to boards/pocketbeagle/images/PocketBeagle_Back_BW.jpg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Back_BW.webp b/boards/pocketbeagle/images/PocketBeagle_Back_BW.webp
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Back_BW.webp
rename to boards/pocketbeagle/images/PocketBeagle_Back_BW.webp
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Expansion_Headers.ods b/boards/pocketbeagle/images/PocketBeagle_Expansion_Headers.ods
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Expansion_Headers.ods
rename to boards/pocketbeagle/images/PocketBeagle_Expansion_Headers.ods
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Front_BW-small.jpg b/boards/pocketbeagle/images/PocketBeagle_Front_BW-small.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Front_BW-small.jpg
rename to boards/pocketbeagle/images/PocketBeagle_Front_BW-small.jpg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Front_BW.jpg b/boards/pocketbeagle/images/PocketBeagle_Front_BW.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Front_BW.jpg
rename to boards/pocketbeagle/images/PocketBeagle_Front_BW.jpg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_Front_BW.webp b/boards/pocketbeagle/images/PocketBeagle_Front_BW.webp
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_Front_BW.webp
rename to boards/pocketbeagle/images/PocketBeagle_Front_BW.webp
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb.png b/boards/pocketbeagle/images/PocketBeagle_microUSB_bb.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb.png
rename to boards/pocketbeagle/images/PocketBeagle_microUSB_bb.png
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb.svg b/boards/pocketbeagle/images/PocketBeagle_microUSB_bb.svg
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb.svg
rename to boards/pocketbeagle/images/PocketBeagle_microUSB_bb.svg
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb1.png b/boards/pocketbeagle/images/PocketBeagle_microUSB_bb1.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_microUSB_bb1.png
rename to boards/pocketbeagle/images/PocketBeagle_microUSB_bb1.png
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_pinout.pdf b/boards/pocketbeagle/images/PocketBeagle_pinout.pdf
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_pinout.pdf
rename to boards/pocketbeagle/images/PocketBeagle_pinout.pdf
diff --git a/boards/pocketbeagle/original/images/PocketBeagle_pinout.png b/boards/pocketbeagle/images/PocketBeagle_pinout.png
similarity index 100%
rename from boards/pocketbeagle/original/images/PocketBeagle_pinout.png
rename to boards/pocketbeagle/images/PocketBeagle_pinout.png
diff --git a/boards/pocketbeagle/original/images/Power-button-sch.png b/boards/pocketbeagle/images/Power-button-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/Power-button-sch.png
rename to boards/pocketbeagle/images/Power-button-sch.png
diff --git a/boards/pocketbeagle/original/images/SRM1_cloud9blinkPB.png b/boards/pocketbeagle/images/SRM1_cloud9blinkPB.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SRM1_cloud9blinkPB.png
rename to boards/pocketbeagle/images/SRM1_cloud9blinkPB.png
diff --git a/boards/pocketbeagle/original/images/SRM2_cloud9blinkPB.png b/boards/pocketbeagle/images/SRM2_cloud9blinkPB.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SRM2_cloud9blinkPB.png
rename to boards/pocketbeagle/images/SRM2_cloud9blinkPB.png
diff --git a/boards/pocketbeagle/original/images/SRM3_cloud9blinkPB.png b/boards/pocketbeagle/images/SRM3_cloud9blinkPB.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SRM3_cloud9blinkPB.png
rename to boards/pocketbeagle/images/SRM3_cloud9blinkPB.png
diff --git a/boards/pocketbeagle/original/images/SRM4_cloud9blinkPB.png b/boards/pocketbeagle/images/SRM4_cloud9blinkPB.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SRM4_cloud9blinkPB.png
rename to boards/pocketbeagle/images/SRM4_cloud9blinkPB.png
diff --git a/boards/pocketbeagle/original/images/SiP-A-sch.png b/boards/pocketbeagle/images/SiP-A-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-A-sch.png
rename to boards/pocketbeagle/images/SiP-A-sch.png
diff --git a/boards/pocketbeagle/original/images/SiP-B-sch.png b/boards/pocketbeagle/images/SiP-B-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-B-sch.png
rename to boards/pocketbeagle/images/SiP-B-sch.png
diff --git a/boards/pocketbeagle/original/images/SiP-C-sch.png b/boards/pocketbeagle/images/SiP-C-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-C-sch.png
rename to boards/pocketbeagle/images/SiP-C-sch.png
diff --git a/boards/pocketbeagle/original/images/SiP-D-sch.png b/boards/pocketbeagle/images/SiP-D-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-D-sch.png
rename to boards/pocketbeagle/images/SiP-D-sch.png
diff --git a/boards/pocketbeagle/original/images/SiP-E-sch.png b/boards/pocketbeagle/images/SiP-E-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-E-sch.png
rename to boards/pocketbeagle/images/SiP-E-sch.png
diff --git a/boards/pocketbeagle/original/images/SiP-F-sch.png b/boards/pocketbeagle/images/SiP-F-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/SiP-F-sch.png
rename to boards/pocketbeagle/images/SiP-F-sch.png
diff --git a/boards/pocketbeagle/original/images/USB-sch.png b/boards/pocketbeagle/images/USB-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/USB-sch.png
rename to boards/pocketbeagle/images/USB-sch.png
diff --git a/boards/pocketbeagle/original/images/User-LEDs-sch.png b/boards/pocketbeagle/images/User-LEDs-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/User-LEDs-sch.png
rename to boards/pocketbeagle/images/User-LEDs-sch.png
diff --git a/boards/pocketbeagle/original/images/fig-PB-Headerphoto.png b/boards/pocketbeagle/images/fig-PB-Headerphoto.png
similarity index 100%
rename from boards/pocketbeagle/original/images/fig-PB-Headerphoto.png
rename to boards/pocketbeagle/images/fig-PB-Headerphoto.png
diff --git a/boards/pocketbeagle/original/images/green_check.png b/boards/pocketbeagle/images/green_check.png
similarity index 100%
rename from boards/pocketbeagle/original/images/green_check.png
rename to boards/pocketbeagle/images/green_check.png
diff --git a/boards/pocketbeagle/original/images/mikrobus-socket-pinout.jpg b/boards/pocketbeagle/images/mikrobus-socket-pinout.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/mikrobus-socket-pinout.jpg
rename to boards/pocketbeagle/images/mikrobus-socket-pinout.jpg
diff --git a/boards/pocketbeagle/original/images/pocketbeagle_package_small_size.jpg b/boards/pocketbeagle/images/pocketbeagle_package_small_size.jpg
similarity index 100%
rename from boards/pocketbeagle/original/images/pocketbeagle_package_small_size.jpg
rename to boards/pocketbeagle/images/pocketbeagle_package_small_size.jpg
diff --git a/boards/pocketbeagle/original/images/usdconnector-sch.png b/boards/pocketbeagle/images/usdconnector-sch.png
similarity index 100%
rename from boards/pocketbeagle/original/images/usdconnector-sch.png
rename to boards/pocketbeagle/images/usdconnector-sch.png
diff --git a/boards/pocketbeagle/original/images/vscode1.png b/boards/pocketbeagle/images/vscode1.png
similarity index 100%
rename from boards/pocketbeagle/original/images/vscode1.png
rename to boards/pocketbeagle/images/vscode1.png
diff --git a/boards/pocketbeagle/original/images/vscode2.png b/boards/pocketbeagle/images/vscode2.png
similarity index 100%
rename from boards/pocketbeagle/original/images/vscode2.png
rename to boards/pocketbeagle/images/vscode2.png
diff --git a/boards/pocketbeagle/original/images/vscode3.png b/boards/pocketbeagle/images/vscode3.png
similarity index 100%
rename from boards/pocketbeagle/original/images/vscode3.png
rename to boards/pocketbeagle/images/vscode3.png
diff --git a/boards/pocketbeagle/original/images/vscode4.png b/boards/pocketbeagle/images/vscode4.png
similarity index 100%
rename from boards/pocketbeagle/original/images/vscode4.png
rename to boards/pocketbeagle/images/vscode4.png
diff --git a/boards/pocketbeagle/original/images/warning_tri.png b/boards/pocketbeagle/images/warning_tri.png
similarity index 100%
rename from boards/pocketbeagle/original/images/warning_tri.png
rename to boards/pocketbeagle/images/warning_tri.png
diff --git a/boards/pocketbeagle/original/index.rst b/boards/pocketbeagle/index.rst
similarity index 100%
rename from boards/pocketbeagle/original/index.rst
rename to boards/pocketbeagle/index.rst
diff --git a/conf.py b/conf.py
index 9c0ccd2a49b514da60f78b4ee8d5666b8b23e1e0..3f41cbf59057001fb69bc9a7c887e383920ba210 100644
--- a/conf.py
+++ b/conf.py
@@ -29,7 +29,6 @@ oshw_logos_path = "_static/images/oshw/"
 oshw_details = []
 for (dirpath, dirnames, filenames) in os.walk(oshw_logos_path):
     for filename in filenames:
-        filename.replace("#","/")
         if filename.endswith('.svg'):
             oshw_logo_name = filename.split(".")[0]
             oshw_details.append(oshw_logo_name.split('_'))
diff --git a/index-tex.rst b/index-tex.rst
index 68b6f76923425f1c25aa19d9c08ab6c05a30b9e1..e156f11760807ab4cb735af2d7c3982f495137e8 100644
--- a/index-tex.rst
+++ b/index-tex.rst
@@ -20,7 +20,7 @@ BeagleBoard Docs
    boards/beaglev/ahead/index
    boards/beaglev/fire/index
    boards/capes/index
-   boards/pocketbeagle/original/index
+   boards/pocketbeagle/index
    boards/beagleconnect/freedom/index
    boards/beagleboard/index
    projects/index