diff --git a/breakout-hardware/tracking b/breakout-hardware/tracking
deleted file mode 160000
index 82d9859..0000000
--- a/breakout-hardware/tracking
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 82d98592fa104795f94b93f14341fd2aae29a887
diff --git a/hardware/bristolunilogo.bmp b/hardware/bristolunilogo.bmp
deleted file mode 100644
index df9f2d0..0000000
Binary files a/hardware/bristolunilogo.bmp and /dev/null differ
diff --git a/hardware/Makefile b/hardware/main/Makefile
similarity index 100%
rename from hardware/Makefile
rename to hardware/main/Makefile
diff --git a/hardware/Parts.md b/hardware/main/Parts.md
similarity index 100%
rename from hardware/Parts.md
rename to hardware/main/Parts.md
diff --git a/hardware/bristol_longshot.brd b/hardware/main/bristol_longshot.brd
similarity index 99%
rename from hardware/bristol_longshot.brd
rename to hardware/main/bristol_longshot.brd
index 56d25f2..b881999 100644
--- a/hardware/bristol_longshot.brd
+++ b/hardware/main/bristol_longshot.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.125" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="1" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -140,10 +140,10 @@
 <vertex x="3.5" y="0.5"/>
 <vertex x="0.5" y="0.5"/>
 </polygon>
-<wire x1="0" y1="0" x2="0" y2="50" width="0" layer="20"/>
-<wire x1="0" y1="50" x2="12" y2="50" width="0" layer="20"/>
-<wire x1="12" y1="50" x2="12" y2="0" width="0" layer="20"/>
-<wire x1="12" y1="0" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="0" y2="64" width="0" layer="20"/>
+<wire x1="0" y1="64" x2="14" y2="64" width="0" layer="20"/>
+<wire x1="14" y1="64" x2="14" y2="0" width="0" layer="20"/>
+<wire x1="14" y1="0" x2="0" y2="0" width="0" layer="20"/>
 <text x="10.25" y="31.5" size="0.762" layer="113" font="vector" ratio="20" rot="MR90">XxXxXxXxXxXx</text>
 <text x="10" y="24.375" size="0.635" layer="21" font="vector" ratio="16" rot="R270">100nF100pF</text>
 <text x="9" y="3.625" size="0.635" layer="21" font="vector" ratio="16" distance="16">
@@ -4466,11 +4466,11 @@ Covered vias can be set in Masks (Limit).
 <signals>
 <signal name="GND">
 <polygon width="0.2032" layer="1" isolate="0.2">
-<vertex x="0" y="50"/>
-<vertex x="7.5" y="50"/>
+<vertex x="0" y="64"/>
+<vertex x="7.5" y="64"/>
 <vertex x="7.5" y="45.5"/>
-<vertex x="12" y="45.5"/>
-<vertex x="12" y="0"/>
+<vertex x="14" y="45.5"/>
+<vertex x="14" y="0"/>
 <vertex x="8.375" y="0"/>
 <vertex x="8.375" y="2.875"/>
 <vertex x="3.625" y="2.875"/>
@@ -4478,9 +4478,9 @@ Covered vias can be set in Masks (Limit).
 <vertex x="0" y="0"/>
 </polygon>
 <polygon width="0.2032" layer="16" isolate="0.2">
-<vertex x="0" y="50"/>
-<vertex x="12" y="50"/>
-<vertex x="12" y="0"/>
+<vertex x="0" y="64"/>
+<vertex x="14" y="64"/>
+<vertex x="14" y="0"/>
 <vertex x="0" y="0"/>
 </polygon>
 <contactref element="U1" pad="33"/>
diff --git a/hardware/main/bristol_longshot.pdf b/hardware/main/bristol_longshot.pdf
new file mode 100644
index 0000000..10a76ad
Binary files /dev/null and b/hardware/main/bristol_longshot.pdf differ
diff --git a/hardware/bristol_longshot.sch b/hardware/main/bristol_longshot.sch
similarity index 100%
rename from hardware/bristol_longshot.sch
rename to hardware/main/bristol_longshot.sch
diff --git a/hardware/bristol_longshot_development.brd b/hardware/main/bristol_longshot_development.brd
similarity index 100%
rename from hardware/bristol_longshot_development.brd
rename to hardware/main/bristol_longshot_development.brd
diff --git a/hardware/bristol_longshot_development.sch b/hardware/main/bristol_longshot_development.sch
similarity index 100%
rename from hardware/bristol_longshot_development.sch
rename to hardware/main/bristol_longshot_development.sch
diff --git a/hardware/bristol_longshot_development_v_0_45_0.zip b/hardware/main/bristol_longshot_development_v_0_45_0.zip
similarity index 100%
rename from hardware/bristol_longshot_development_v_0_45_0.zip
rename to hardware/main/bristol_longshot_development_v_0_45_0.zip
diff --git a/hardware/bristol_longshot_v_0_95_0.zip b/hardware/main/bristol_longshot_v_0_95_0.zip
similarity index 100%
rename from hardware/bristol_longshot_v_0_95_0.zip
rename to hardware/main/bristol_longshot_v_0_95_0.zip
diff --git a/hardware/parts b/hardware/main/parts
similarity index 100%
rename from hardware/parts
rename to hardware/main/parts
diff --git a/hardware/partslist b/hardware/partslist
deleted file mode 160000
index 82d9859..0000000
--- a/hardware/partslist
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 82d98592fa104795f94b93f14341fd2aae29a887