diff --git a/CAD/Fusion 360/Frame v6.f3d b/CAD/3D Printed Build/Fusion 360/Frame v6.f3d
similarity index 100%
rename from CAD/Fusion 360/Frame v6.f3d
rename to CAD/3D Printed Build/Fusion 360/Frame v6.f3d
diff --git a/CAD/Fusion 360/Integrated Sensor Base Left v5.f3d b/CAD/3D Printed Build/Fusion 360/Integrated Sensor Base Left v5.f3d
similarity index 100%
rename from CAD/Fusion 360/Integrated Sensor Base Left v5.f3d
rename to CAD/3D Printed Build/Fusion 360/Integrated Sensor Base Left v5.f3d
diff --git a/CAD/Fusion 360/Key v13.f3d b/CAD/3D Printed Build/Fusion 360/Key v13.f3d
similarity index 100%
rename from CAD/Fusion 360/Key v13.f3d
rename to CAD/3D Printed Build/Fusion 360/Key v13.f3d
diff --git a/CAD/Fusion 360/Key-US_Cust v6.f3d b/CAD/3D Printed Build/Fusion 360/Key-US_Cust v6.f3d
similarity index 100%
rename from CAD/Fusion 360/Key-US_Cust v6.f3d
rename to CAD/3D Printed Build/Fusion 360/Key-US_Cust v6.f3d
diff --git a/CAD/Fusion 360/OpeNITHM PCB v3.f3d b/CAD/3D Printed Build/Fusion 360/OpeNITHM PCB v3.f3d
similarity index 100%
rename from CAD/Fusion 360/OpeNITHM PCB v3.f3d
rename to CAD/3D Printed Build/Fusion 360/OpeNITHM PCB v3.f3d
diff --git a/CAD/Fusion 360/Sensor Stand Left v9.f3d b/CAD/3D Printed Build/Fusion 360/Sensor Stand Left v9.f3d
similarity index 100%
rename from CAD/Fusion 360/Sensor Stand Left v9.f3d
rename to CAD/3D Printed Build/Fusion 360/Sensor Stand Left v9.f3d
diff --git a/CAD/STL/Center Frame.stl b/CAD/3D Printed Build/STL/Center Frame.stl
similarity index 100%
rename from CAD/STL/Center Frame.stl
rename to CAD/3D Printed Build/STL/Center Frame.stl
diff --git a/CAD/STL/Integrated Frame Mount Left.stl b/CAD/3D Printed Build/STL/Integrated Frame Mount Left.stl
similarity index 100%
rename from CAD/STL/Integrated Frame Mount Left.stl
rename to CAD/3D Printed Build/STL/Integrated Frame Mount Left.stl
diff --git a/CAD/STL/Integrated Sensor Base Left.stl b/CAD/3D Printed Build/STL/Integrated Sensor Base Left.stl
similarity index 100%
rename from CAD/STL/Integrated Sensor Base Left.stl
rename to CAD/3D Printed Build/STL/Integrated Sensor Base Left.stl
diff --git a/CAD/STL/Key-US_Cust.stl b/CAD/3D Printed Build/STL/Key-US_Cust.stl
similarity index 100%
rename from CAD/STL/Key-US_Cust.stl
rename to CAD/3D Printed Build/STL/Key-US_Cust.stl
diff --git a/CAD/STL/Key.stl b/CAD/3D Printed Build/STL/Key.stl
similarity index 100%
rename from CAD/STL/Key.stl
rename to CAD/3D Printed Build/STL/Key.stl
diff --git a/CAD/STL/LED Clamp.stl b/CAD/3D Printed Build/STL/LED Clamp.stl
similarity index 100%
rename from CAD/STL/LED Clamp.stl
rename to CAD/3D Printed Build/STL/LED Clamp.stl
diff --git a/CAD/STL/Left Frame.stl b/CAD/3D Printed Build/STL/Left Frame.stl
similarity index 100%
rename from CAD/STL/Left Frame.stl
rename to CAD/3D Printed Build/STL/Left Frame.stl
diff --git a/CAD/STL/Right Frame.stl b/CAD/3D Printed Build/STL/Right Frame.stl
similarity index 100%
rename from CAD/STL/Right Frame.stl
rename to CAD/3D Printed Build/STL/Right Frame.stl
diff --git a/CAD/STL/Sensor Base Left.stl b/CAD/3D Printed Build/STL/Sensor Base Left.stl
similarity index 100%
rename from CAD/STL/Sensor Base Left.stl
rename to CAD/3D Printed Build/STL/Sensor Base Left.stl
diff --git a/CAD/STL/Sensor Cover Left.stl b/CAD/3D Printed Build/STL/Sensor Cover Left.stl
similarity index 100%
rename from CAD/STL/Sensor Cover Left.stl
rename to CAD/3D Printed Build/STL/Sensor Cover Left.stl
diff --git a/CAD/STL/Sensor Rail.stl b/CAD/3D Printed Build/STL/Sensor Rail.stl
similarity index 100%
rename from CAD/STL/Sensor Rail.stl
rename to CAD/3D Printed Build/STL/Sensor Rail.stl
diff --git a/CAD/STL/Sensor Spacer Left.stl b/CAD/3D Printed Build/STL/Sensor Spacer Left.stl
similarity index 100%
rename from CAD/STL/Sensor Spacer Left.stl
rename to CAD/3D Printed Build/STL/Sensor Spacer Left.stl
diff --git a/CAD/readme.md b/CAD/3D Printed Build/readme.md
similarity index 100%
rename from CAD/readme.md
rename to CAD/3D Printed Build/readme.md
diff --git a/v2-cad/Black 3mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/Black 3mm Acrylic.svg
similarity index 100%
rename from v2-cad/Black 3mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/Black 3mm Acrylic.svg
diff --git a/v2-cad/Black 5.6mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/Black 5.6mm Acrylic.svg
similarity index 100%
rename from v2-cad/Black 5.6mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/Black 5.6mm Acrylic.svg
diff --git a/v2-cad/Black paper.svg b/CAD/All Acrylic Lasercut Build/Black paper.svg
similarity index 100%
rename from v2-cad/Black paper.svg
rename to CAD/All Acrylic Lasercut Build/Black paper.svg
diff --git a/v2-cad/Clear 3mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/Clear 3mm Acrylic.svg
similarity index 100%
rename from v2-cad/Clear 3mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/Clear 3mm Acrylic.svg
diff --git a/v2-cad/P95 Clear 3mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/P95 Clear 3mm Acrylic.svg
similarity index 100%
rename from v2-cad/P95 Clear 3mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/P95 Clear 3mm Acrylic.svg
diff --git a/v2-cad/Smoked 5.6mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/Smoked 5.6mm Acrylic.svg
similarity index 100%
rename from v2-cad/Smoked 5.6mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/Smoked 5.6mm Acrylic.svg
diff --git a/v2-cad/White 3mm Acrylic.svg b/CAD/All Acrylic Lasercut Build/White 3mm Acrylic.svg
similarity index 100%
rename from v2-cad/White 3mm Acrylic.svg
rename to CAD/All Acrylic Lasercut Build/White 3mm Acrylic.svg
diff --git a/v2-cad/all_layers.jpg b/CAD/All Acrylic Lasercut Build/all_layers.jpg
similarity index 100%
rename from v2-cad/all_layers.jpg
rename to CAD/All Acrylic Lasercut Build/all_layers.jpg
diff --git a/v2-cad/readme.md b/CAD/All Acrylic Lasercut Build/readme.md
similarity index 100%
rename from v2-cad/readme.md
rename to CAD/All Acrylic Lasercut Build/readme.md
diff --git a/Circuit-Teensy32/Old Revisions/OpeNITHM_Teensy_Schematic_v2.0.pdf b/Circuit-Teensy32/Old Revisions/OpeNITHM_Teensy_Schematic_v2.0.pdf
deleted file mode 100644
index a907281..0000000
Binary files a/Circuit-Teensy32/Old Revisions/OpeNITHM_Teensy_Schematic_v2.0.pdf and /dev/null differ
diff --git a/Circuit-Teensy32/Old Revisions/gerbers_v2.0.zip b/Circuit-Teensy32/Old Revisions/gerbers_v2.0.zip
deleted file mode 100644
index e36e3f0..0000000
Binary files a/Circuit-Teensy32/Old Revisions/gerbers_v2.0.zip and /dev/null differ
diff --git a/Circuit-AirSensor/AirSensor_Local.pretty/LED_D5.0mm_FlatTop.kicad_mod b/PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/LED_D5.0mm_FlatTop.kicad_mod
similarity index 100%
rename from Circuit-AirSensor/AirSensor_Local.pretty/LED_D5.0mm_FlatTop.kicad_mod
rename to PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/LED_D5.0mm_FlatTop.kicad_mod
diff --git a/Circuit-AirSensor/AirSensor_Local.pretty/SMD_3Pin.kicad_mod b/PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/SMD_3Pin.kicad_mod
similarity index 100%
rename from Circuit-AirSensor/AirSensor_Local.pretty/SMD_3Pin.kicad_mod
rename to PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/SMD_3Pin.kicad_mod
diff --git a/Circuit-AirSensor/AirSensor_Local.pretty/SMD_7Pin.kicad_mod b/PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/SMD_7Pin.kicad_mod
similarity index 100%
rename from Circuit-AirSensor/AirSensor_Local.pretty/SMD_7Pin.kicad_mod
rename to PCB Files/Circuit-AirSensor/AirSensor_Local.pretty/SMD_7Pin.kicad_mod
diff --git a/Circuit-AirSensor/Circuit-AirSensor-cache.lib b/PCB Files/Circuit-AirSensor/Circuit-AirSensor-cache.lib
similarity index 100%
rename from Circuit-AirSensor/Circuit-AirSensor-cache.lib
rename to PCB Files/Circuit-AirSensor/Circuit-AirSensor-cache.lib
diff --git a/Circuit-AirSensor/Circuit-AirSensor.kicad_pcb b/PCB Files/Circuit-AirSensor/Circuit-AirSensor.kicad_pcb
similarity index 100%
rename from Circuit-AirSensor/Circuit-AirSensor.kicad_pcb
rename to PCB Files/Circuit-AirSensor/Circuit-AirSensor.kicad_pcb
diff --git a/Circuit-AirSensor/Circuit-AirSensor.pro b/PCB Files/Circuit-AirSensor/Circuit-AirSensor.pro
similarity index 100%
rename from Circuit-AirSensor/Circuit-AirSensor.pro
rename to PCB Files/Circuit-AirSensor/Circuit-AirSensor.pro
diff --git a/Circuit-AirSensor/Circuit-AirSensor.sch b/PCB Files/Circuit-AirSensor/Circuit-AirSensor.sch
similarity index 100%
rename from Circuit-AirSensor/Circuit-AirSensor.sch
rename to PCB Files/Circuit-AirSensor/Circuit-AirSensor.sch
diff --git a/Circuit-AirSensor/fp-info-cache b/PCB Files/Circuit-AirSensor/fp-info-cache
similarity index 100%
rename from Circuit-AirSensor/fp-info-cache
rename to PCB Files/Circuit-AirSensor/fp-info-cache
diff --git a/Circuit-AirSensor/fp-lib-table b/PCB Files/Circuit-AirSensor/fp-lib-table
similarity index 100%
rename from Circuit-AirSensor/fp-lib-table
rename to PCB Files/Circuit-AirSensor/fp-lib-table
diff --git a/Circuit-AirSensor/gerbers.zip b/PCB Files/Circuit-AirSensor/gerbers.zip
similarity index 100%
rename from Circuit-AirSensor/gerbers.zip
rename to PCB Files/Circuit-AirSensor/gerbers.zip
diff --git a/Circuit-AirSensor/readme.md b/PCB Files/Circuit-AirSensor/readme.md
similarity index 100%
rename from Circuit-AirSensor/readme.md
rename to PCB Files/Circuit-AirSensor/readme.md
diff --git a/Circuit-Teensy32/74HC4051.dcm b/PCB Files/Circuit-Teensy32/74HC4051.dcm
similarity index 100%
rename from Circuit-Teensy32/74HC4051.dcm
rename to PCB Files/Circuit-Teensy32/74HC4051.dcm
diff --git a/Circuit-Teensy32/74HC4051.lib b/PCB Files/Circuit-Teensy32/74HC4051.lib
similarity index 100%
rename from Circuit-Teensy32/74HC4051.lib
rename to PCB Files/Circuit-Teensy32/74HC4051.lib
diff --git a/Circuit-Teensy32/74HC4051.pretty/74HC4051_Sparkfun_Aliexpress.kicad_mod b/PCB Files/Circuit-Teensy32/74HC4051.pretty/74HC4051_Sparkfun_Aliexpress.kicad_mod
similarity index 100%
rename from Circuit-Teensy32/74HC4051.pretty/74HC4051_Sparkfun_Aliexpress.kicad_mod
rename to PCB Files/Circuit-Teensy32/74HC4051.pretty/74HC4051_Sparkfun_Aliexpress.kicad_mod
diff --git a/Circuit-Teensy32/OpeNITHM-cache.lib b/PCB Files/Circuit-Teensy32/OpeNITHM-cache.lib
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM-cache.lib
rename to PCB Files/Circuit-Teensy32/OpeNITHM-cache.lib
diff --git a/Circuit-Teensy32/OpeNITHM.kicad_mod b/PCB Files/Circuit-Teensy32/OpeNITHM.kicad_mod
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.kicad_mod
rename to PCB Files/Circuit-Teensy32/OpeNITHM.kicad_mod
diff --git a/Circuit-Teensy32/OpeNITHM.kicad_pcb b/PCB Files/Circuit-Teensy32/OpeNITHM.kicad_pcb
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.kicad_pcb
rename to PCB Files/Circuit-Teensy32/OpeNITHM.kicad_pcb
diff --git a/Circuit-Teensy32/OpeNITHM.net b/PCB Files/Circuit-Teensy32/OpeNITHM.net
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.net
rename to PCB Files/Circuit-Teensy32/OpeNITHM.net
diff --git a/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo-old.kicad_mod b/PCB Files/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo-old.kicad_mod
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.pretty/openithm-logo-old.kicad_mod
rename to PCB Files/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo-old.kicad_mod
diff --git a/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo.kicad_mod b/PCB Files/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo.kicad_mod
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.pretty/openithm-logo.kicad_mod
rename to PCB Files/Circuit-Teensy32/OpeNITHM.pretty/openithm-logo.kicad_mod
diff --git a/Circuit-Teensy32/OpeNITHM.pro b/PCB Files/Circuit-Teensy32/OpeNITHM.pro
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.pro
rename to PCB Files/Circuit-Teensy32/OpeNITHM.pro
diff --git a/Circuit-Teensy32/OpeNITHM.sch b/PCB Files/Circuit-Teensy32/OpeNITHM.sch
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM.sch
rename to PCB Files/Circuit-Teensy32/OpeNITHM.sch
diff --git a/Circuit-Teensy32/OpeNITHM_Teensy_Schematic_v2.1.pdf b/PCB Files/Circuit-Teensy32/OpeNITHM_Teensy_Schematic_v2.1.pdf
similarity index 100%
rename from Circuit-Teensy32/OpeNITHM_Teensy_Schematic_v2.1.pdf
rename to PCB Files/Circuit-Teensy32/OpeNITHM_Teensy_Schematic_v2.1.pdf
diff --git a/Circuit-Teensy32/fp-info-cache b/PCB Files/Circuit-Teensy32/fp-info-cache
similarity index 100%
rename from Circuit-Teensy32/fp-info-cache
rename to PCB Files/Circuit-Teensy32/fp-info-cache
diff --git a/Circuit-Teensy32/fp-lib-table b/PCB Files/Circuit-Teensy32/fp-lib-table
similarity index 100%
rename from Circuit-Teensy32/fp-lib-table
rename to PCB Files/Circuit-Teensy32/fp-lib-table
diff --git a/Circuit-Teensy32/gerbers_v2.1.zip b/PCB Files/Circuit-Teensy32/gerbers_v2.1.zip
similarity index 100%
rename from Circuit-Teensy32/gerbers_v2.1.zip
rename to PCB Files/Circuit-Teensy32/gerbers_v2.1.zip
diff --git a/Circuit-Teensy32/sym-lib-table b/PCB Files/Circuit-Teensy32/sym-lib-table
similarity index 100%
rename from Circuit-Teensy32/sym-lib-table
rename to PCB Files/Circuit-Teensy32/sym-lib-table