diff --git a/board_carrier/board_carrier-cache.lib b/hardware/board_carrier/board_carrier-cache.lib
similarity index 100%
rename from board_carrier/board_carrier-cache.lib
rename to hardware/board_carrier/board_carrier-cache.lib
diff --git a/board_carrier/board_carrier.kicad_pcb b/hardware/board_carrier/board_carrier.kicad_pcb
similarity index 100%
rename from board_carrier/board_carrier.kicad_pcb
rename to hardware/board_carrier/board_carrier.kicad_pcb
diff --git a/board_carrier/board_carrier.pro b/hardware/board_carrier/board_carrier.pro
similarity index 100%
rename from board_carrier/board_carrier.pro
rename to hardware/board_carrier/board_carrier.pro
diff --git a/board_carrier/board_carrier.sch b/hardware/board_carrier/board_carrier.sch
similarity index 100%
rename from board_carrier/board_carrier.sch
rename to hardware/board_carrier/board_carrier.sch
diff --git a/board_carrier/export/board_carrier.step b/hardware/board_carrier/export/board_carrier.step
similarity index 100%
rename from board_carrier/export/board_carrier.step
rename to hardware/board_carrier/export/board_carrier.step
diff --git a/board_carrier/export/carrier_bom.csv b/hardware/board_carrier/export/carrier_bom.csv
similarity index 100%
rename from board_carrier/export/carrier_bom.csv
rename to hardware/board_carrier/export/carrier_bom.csv
diff --git a/board_carrier/export/carrier_gerber.zip b/hardware/board_carrier/export/carrier_gerber.zip
similarity index 100%
rename from board_carrier/export/carrier_gerber.zip
rename to hardware/board_carrier/export/carrier_gerber.zip
diff --git a/board_carrier/export/carrier_pos.csv b/hardware/board_carrier/export/carrier_pos.csv
similarity index 100%
rename from board_carrier/export/carrier_pos.csv
rename to hardware/board_carrier/export/carrier_pos.csv
diff --git a/board_carrier/export/carrier_schematic.pdf b/hardware/board_carrier/export/carrier_schematic.pdf
similarity index 100%
rename from board_carrier/export/carrier_schematic.pdf
rename to hardware/board_carrier/export/carrier_schematic.pdf
diff --git a/board_carrier/fp-lib-table b/hardware/board_carrier/fp-lib-table
similarity index 100%
rename from board_carrier/fp-lib-table
rename to hardware/board_carrier/fp-lib-table
diff --git a/board_carrier/mx120.pretty/367831201.stp b/hardware/board_carrier/mx120.pretty/367831201.stp
similarity index 100%
rename from board_carrier/mx120.pretty/367831201.stp
rename to hardware/board_carrier/mx120.pretty/367831201.stp
diff --git a/board_carrier/mx120.pretty/mx120g-12.kicad_mod b/hardware/board_carrier/mx120.pretty/mx120g-12.kicad_mod
similarity index 100%
rename from board_carrier/mx120.pretty/mx120g-12.kicad_mod
rename to hardware/board_carrier/mx120.pretty/mx120g-12.kicad_mod
diff --git a/board_dev/export/bom.csv b/hardware/board_dev/export/bom.csv
similarity index 100%
rename from board_dev/export/bom.csv
rename to hardware/board_dev/export/bom.csv
diff --git a/board_dev/export/gerber.zip b/hardware/board_dev/export/gerber.zip
similarity index 100%
rename from board_dev/export/gerber.zip
rename to hardware/board_dev/export/gerber.zip
diff --git a/board_dev/export/pos.csv b/hardware/board_dev/export/pos.csv
similarity index 100%
rename from board_dev/export/pos.csv
rename to hardware/board_dev/export/pos.csv
diff --git a/board_dev/export/wideband_controller.pdf b/hardware/board_dev/export/wideband_controller.pdf
similarity index 100%
rename from board_dev/export/wideband_controller.pdf
rename to hardware/board_dev/export/wideband_controller.pdf
diff --git a/board_dev/wideband_controller-cache.lib b/hardware/board_dev/wideband_controller-cache.lib
similarity index 100%
rename from board_dev/wideband_controller-cache.lib
rename to hardware/board_dev/wideband_controller-cache.lib
diff --git a/board_dev/wideband_controller.kicad_pcb b/hardware/board_dev/wideband_controller.kicad_pcb
similarity index 100%
rename from board_dev/wideband_controller.kicad_pcb
rename to hardware/board_dev/wideband_controller.kicad_pcb
diff --git a/board_dev/wideband_controller.pro b/hardware/board_dev/wideband_controller.pro
similarity index 100%
rename from board_dev/wideband_controller.pro
rename to hardware/board_dev/wideband_controller.pro
diff --git a/board_dev/wideband_controller.sch b/hardware/board_dev/wideband_controller.sch
similarity index 100%
rename from board_dev/wideband_controller.sch
rename to hardware/board_dev/wideband_controller.sch
diff --git a/board_fw_tool/board_fw_tool-cache.lib b/hardware/board_fw_tool/board_fw_tool-cache.lib
similarity index 100%
rename from board_fw_tool/board_fw_tool-cache.lib
rename to hardware/board_fw_tool/board_fw_tool-cache.lib
diff --git a/board_fw_tool/board_fw_tool.kicad_pcb b/hardware/board_fw_tool/board_fw_tool.kicad_pcb
similarity index 100%
rename from board_fw_tool/board_fw_tool.kicad_pcb
rename to hardware/board_fw_tool/board_fw_tool.kicad_pcb
diff --git a/board_fw_tool/board_fw_tool.pro b/hardware/board_fw_tool/board_fw_tool.pro
similarity index 100%
rename from board_fw_tool/board_fw_tool.pro
rename to hardware/board_fw_tool/board_fw_tool.pro
diff --git a/board_fw_tool/board_fw_tool.sch b/hardware/board_fw_tool/board_fw_tool.sch
similarity index 100%
rename from board_fw_tool/board_fw_tool.sch
rename to hardware/board_fw_tool/board_fw_tool.sch
diff --git a/board_fw_tool/export/gerber.zip b/hardware/board_fw_tool/export/gerber.zip
similarity index 100%
rename from board_fw_tool/export/gerber.zip
rename to hardware/board_fw_tool/export/gerber.zip
diff --git a/board_module/export/module_bom.csv b/hardware/board_module/export/module_bom.csv
similarity index 100%
rename from board_module/export/module_bom.csv
rename to hardware/board_module/export/module_bom.csv
diff --git a/board_module/export/module_gerber.zip b/hardware/board_module/export/module_gerber.zip
similarity index 100%
rename from board_module/export/module_gerber.zip
rename to hardware/board_module/export/module_gerber.zip
diff --git a/board_module/export/module_pos.csv b/hardware/board_module/export/module_pos.csv
similarity index 100%
rename from board_module/export/module_pos.csv
rename to hardware/board_module/export/module_pos.csv
diff --git a/board_module/export/module_schematic.pdf b/hardware/board_module/export/module_schematic.pdf
similarity index 100%
rename from board_module/export/module_schematic.pdf
rename to hardware/board_module/export/module_schematic.pdf
diff --git a/board_module/wideband_controller-cache.lib b/hardware/board_module/wideband_controller-cache.lib
similarity index 100%
rename from board_module/wideband_controller-cache.lib
rename to hardware/board_module/wideband_controller-cache.lib
diff --git a/board_module/wideband_controller.kicad_pcb b/hardware/board_module/wideband_controller.kicad_pcb
similarity index 100%
rename from board_module/wideband_controller.kicad_pcb
rename to hardware/board_module/wideband_controller.kicad_pcb
diff --git a/board_module/wideband_controller.pro b/hardware/board_module/wideband_controller.pro
similarity index 100%
rename from board_module/wideband_controller.pro
rename to hardware/board_module/wideband_controller.pro
diff --git a/board_module/wideband_controller.sch b/hardware/board_module/wideband_controller.sch
similarity index 100%
rename from board_module/wideband_controller.sch
rename to hardware/board_module/wideband_controller.sch
diff --git a/simulation/.gitignore b/hardware/simulation/.gitignore
similarity index 100%
rename from simulation/.gitignore
rename to hardware/simulation/.gitignore
diff --git a/simulation/NernstSenseModel.asc b/hardware/simulation/NernstSenseModel.asc
similarity index 100%
rename from simulation/NernstSenseModel.asc
rename to hardware/simulation/NernstSenseModel.asc
diff --git a/simulation/PumpDriverModel.asc b/hardware/simulation/PumpDriverModel.asc
similarity index 100%
rename from simulation/PumpDriverModel.asc
rename to hardware/simulation/PumpDriverModel.asc