diff --git a/boards/beaglev/fire/02-quick-start.rst b/boards/beaglev/fire/02-quick-start.rst
index 6aa989a3ba39cfe34819e7b6ca2f3676611ae955..53f58af2f5738f64f62003b07df462c2090d8715 100644
--- a/boards/beaglev/fire/02-quick-start.rst
+++ b/boards/beaglev/fire/02-quick-start.rst
@@ -75,5 +75,7 @@ It will be different for Mac and Windows operatig systems. To find serial port f
 Demos and Tutorials
 *******************
 
-:ref:`beaglev-fire-flashing-board`
+* :ref:`beaglev-fire-flashing-board`
+* :ref:`beaglev-fire-gateware-version`
+* :ref:`beaglev-fire-gateware-design`
 
diff --git a/boards/beaglev/fire/05-demos.rst b/boards/beaglev/fire/05-demos.rst
index f110bfd105784a8accfb447006d28156b48abbf9..1c2a2c698f3cdf6254c20181aa9b6f91b6171330 100644
--- a/boards/beaglev/fire/05-demos.rst
+++ b/boards/beaglev/fire/05-demos.rst
@@ -15,4 +15,6 @@ Demos
     :maxdepth: 1
     
     demos-and-tutorials/flashing-board
-    demos-and-tutorials/mchp-fpga-tools-installation-guide
\ No newline at end of file
+    demos-and-tutorials/mchp-fpga-tools-installation-guide
+    demos-and-tutorials/gateware
+    demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
diff --git a/boards/beaglev/fire/gateware/gateware-howto-find-out-whats-on-the-board.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
similarity index 98%
rename from boards/beaglev/fire/gateware/gateware-howto-find-out-whats-on-the-board.rst
rename to boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
index f026c3f78caa48c40e69f29b7b68cb8cf8cc6dfb..9c09856e92c274cb36cb2efeff0925857e0a9c90 100644
--- a/boards/beaglev/fire/gateware/gateware-howto-find-out-whats-on-the-board.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-version:
+
 How to retrieve BeagleV-Fire's gateware version
 ###############################################
 
diff --git a/boards/beaglev/fire/gateware/gateware-design-intro.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
similarity index 98%
rename from boards/beaglev/fire/gateware/gateware-design-intro.rst
rename to boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
index 05a3e3e30257061db6f00eccbecbf625cdb0a4f1..601861654618ccb0df0fd8f9c24269600052f086 100644
--- a/boards/beaglev/fire/gateware/gateware-design-intro.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/index.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-design:
+
 Gateware Design Introduction
 ############################
 
diff --git a/boards/beaglev/fire/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png b/boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png
similarity index 100%
rename from boards/beaglev/fire/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-bitstream-builder-full-picture.png
diff --git a/boards/beaglev/fire/gateware/media/Gateware-Flow-simplified-overview.png b/boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-simplified-overview.png
similarity index 100%
rename from boards/beaglev/fire/gateware/media/Gateware-Flow-simplified-overview.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/media/Gateware-Flow-simplified-overview.png
diff --git a/boards/beaglev/fire/gateware/media/dts-design-info.png b/boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-info.png
similarity index 100%
rename from boards/beaglev/fire/gateware/media/dts-design-info.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-info.png
diff --git a/boards/beaglev/fire/gateware/media/dts-design-version.png b/boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-version.png
similarity index 100%
rename from boards/beaglev/fire/gateware/media/dts-design-version.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/media/dts-design-version.png
diff --git a/boards/beaglev/fire/gateware/media/hss-design-info.png b/boards/beaglev/fire/demos-and-tutorials/gateware/media/hss-design-info.png
similarity index 100%
rename from boards/beaglev/fire/gateware/media/hss-design-info.png
rename to boards/beaglev/fire/demos-and-tutorials/gateware/media/hss-design-info.png