diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/board-discovered.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/board-discovered.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/board-discovered.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/board-discovered.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/chromestore.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/chromestore.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/chromestore.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/chromestore.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/circuit.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/circuit.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/circuit.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/circuit.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/hex-file-desktop.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/hex-file-desktop.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/hex-file-desktop.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/hex-file-desktop.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/windows-success.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/windows-success.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/assets/windows-success.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/assets/windows-success.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/uno-wifi-r2-chromebook-installation.md b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/uno-wifi-r2-chromebook-installation.md
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-chromebook-installation/uno-wifi-r2-chromebook-installation.md
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-chromebook-installation/uno-wifi-r2-chromebook-installation.md
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG01.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG01.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG01.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG01.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG02.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG02.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG02.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG02.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG03.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG03.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG03.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/assets/UnoWiFiRev2_T1_IMG03.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/uno-wifi-r2-hosting-a-webserver.md b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/uno-wifi-r2-hosting-a-webserver.md
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-hosting-a-webserver/uno-wifi-r2-hosting-a-webserver.md
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-hosting-a-webserver/uno-wifi-r2-hosting-a-webserver.md
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG01.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG01.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG01.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG01.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG02.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG02.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG02.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG02.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG03.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG03.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG03.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG03.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG04.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG04.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG04.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG04.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG05.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG05.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG05.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG05.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG06.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG06.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG06.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG06.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG07.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG07.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG07.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG07.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG08.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG08.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG08.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/assets/UnoWiFiRev2_T2_IMG08.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/uno-wifi-r2-mqtt-device-to-device.md b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/uno-wifi-r2-mqtt-device-to-device.md
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-mqtt-device-to-device/uno-wifi-r2-mqtt-device-to-device.md
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-mqtt-device-to-device/uno-wifi-r2-mqtt-device-to-device.md
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG01.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG01.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG01.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG01.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG02.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG02.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG02.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG02.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG03.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG03.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG03.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/assets/UnoWiFiRev2_T4_IMG03.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/uno-wifi-r2-scan-networks.md b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/uno-wifi-r2-scan-networks.md
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-scan-networks/uno-wifi-r2-scan-networks.md
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-scan-networks/uno-wifi-r2-scan-networks.md
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG01.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG01.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG01.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG01.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG02.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG02.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG02.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG02.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG03.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG03.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG03.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG03.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG04.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG04.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG04.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG04.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG05.png b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG05.png
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG05.png
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/assets/UnoWiFiRev2_T3_IMG05.png
diff --git a/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/uno-wifi-r2-web-server-ap-mode.md b/content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/uno-wifi-r2-web-server-ap-mode.md
similarity index 100%
rename from content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-rev-2/uno-wifi-r2-web-server-ap-mode/uno-wifi-r2-web-server-ap-mode.md
rename to content/hardware/02.hero/boards/uno-wifi-rev2/tutorials/uno-wifi-r2-web-server-ap-mode/uno-wifi-r2-web-server-ap-mode.md