diff --git a/firmware/README b/firmware/README
index 2d28d936..1ef06d4f 100644
--- a/firmware/README
+++ b/firmware/README
@@ -1,7 +1,8 @@
 The primary firmware source code for USB HackRF devices is hackrf_usb.  Most of
 the other directories contain firmware source code for test and development.
 The common directory contains source code shared by multiple HackRF firmware
-projects.
+projects.  The cpld directory contains HDL source for the CPLD present on the
+Jawbreaker and Jellybean designs.
 
 The firmware is set up for compilation with the GCC toolchain available here:
 
diff --git a/hardware/jellybean/sgpio_if/README.md b/firmware/cpld/sgpio_if/README.md
similarity index 100%
rename from hardware/jellybean/sgpio_if/README.md
rename to firmware/cpld/sgpio_if/README.md
diff --git a/hardware/jellybean/sgpio_if/default.svf b/firmware/cpld/sgpio_if/default.svf
similarity index 100%
rename from hardware/jellybean/sgpio_if/default.svf
rename to firmware/cpld/sgpio_if/default.svf
diff --git a/hardware/jellybean/sgpio_if/default.xsvf b/firmware/cpld/sgpio_if/default.xsvf
similarity index 100%
rename from hardware/jellybean/sgpio_if/default.xsvf
rename to firmware/cpld/sgpio_if/default.xsvf
diff --git a/hardware/jellybean/sgpio_if/program b/firmware/cpld/sgpio_if/program
similarity index 100%
rename from hardware/jellybean/sgpio_if/program
rename to firmware/cpld/sgpio_if/program
diff --git a/hardware/jellybean/sgpio_if/sgpio_if.xise b/firmware/cpld/sgpio_if/sgpio_if.xise
similarity index 100%
rename from hardware/jellybean/sgpio_if/sgpio_if.xise
rename to firmware/cpld/sgpio_if/sgpio_if.xise
diff --git a/hardware/jellybean/sgpio_if/top.jed b/firmware/cpld/sgpio_if/top.jed
similarity index 100%
rename from hardware/jellybean/sgpio_if/top.jed
rename to firmware/cpld/sgpio_if/top.jed
diff --git a/hardware/jellybean/sgpio_if/top.ucf b/firmware/cpld/sgpio_if/top.ucf
similarity index 100%
rename from hardware/jellybean/sgpio_if/top.ucf
rename to firmware/cpld/sgpio_if/top.ucf
diff --git a/hardware/jellybean/sgpio_if/top.vhd b/firmware/cpld/sgpio_if/top.vhd
similarity index 100%
rename from hardware/jellybean/sgpio_if/top.vhd
rename to firmware/cpld/sgpio_if/top.vhd
diff --git a/hardware/jellybean/sgpio_if/top_tb.vhd b/firmware/cpld/sgpio_if/top_tb.vhd
similarity index 100%
rename from hardware/jellybean/sgpio_if/top_tb.vhd
rename to firmware/cpld/sgpio_if/top_tb.vhd
diff --git a/hardware/jellybean/sgpio_if_passthrough/README.md b/firmware/cpld/sgpio_if_passthrough/README.md
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/README.md
rename to firmware/cpld/sgpio_if_passthrough/README.md
diff --git a/hardware/jellybean/sgpio_if_passthrough/program b/firmware/cpld/sgpio_if_passthrough/program
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/program
rename to firmware/cpld/sgpio_if_passthrough/program
diff --git a/hardware/jellybean/sgpio_if_passthrough/sgpio_if_passthrough.svf b/firmware/cpld/sgpio_if_passthrough/sgpio_if_passthrough.svf
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/sgpio_if_passthrough.svf
rename to firmware/cpld/sgpio_if_passthrough/sgpio_if_passthrough.svf
diff --git a/hardware/jellybean/sgpio_if_passthrough/sgpio_if_passthrough.xise b/firmware/cpld/sgpio_if_passthrough/sgpio_if_passthrough.xise
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/sgpio_if_passthrough.xise
rename to firmware/cpld/sgpio_if_passthrough/sgpio_if_passthrough.xise
diff --git a/hardware/jellybean/sgpio_if_passthrough/top.ucf b/firmware/cpld/sgpio_if_passthrough/top.ucf
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/top.ucf
rename to firmware/cpld/sgpio_if_passthrough/top.ucf
diff --git a/hardware/jellybean/sgpio_if_passthrough/top.vhd b/firmware/cpld/sgpio_if_passthrough/top.vhd
similarity index 100%
rename from hardware/jellybean/sgpio_if_passthrough/top.vhd
rename to firmware/cpld/sgpio_if_passthrough/top.vhd