diff --git a/cad/mech_sketch b/cad/mech_sketch.png
similarity index 100%
rename from cad/mech_sketch
rename to cad/mech_sketch.png
diff --git a/pcbs/CurrentSource/.gitignore b/pcbs/current_source/.gitignore
similarity index 100%
rename from pcbs/CurrentSource/.gitignore
rename to pcbs/current_source/.gitignore
diff --git a/pcbs/CurrentSource/CurrentSource.PrjPcb b/pcbs/current_source/CurrentSource.PrjPcb
similarity index 100%
rename from pcbs/CurrentSource/CurrentSource.PrjPcb
rename to pcbs/current_source/CurrentSource.PrjPcb
diff --git a/pcbs/CurrentSource/CurrentSource.PrjPcbStructure b/pcbs/current_source/CurrentSource.PrjPcbStructure
similarity index 100%
rename from pcbs/CurrentSource/CurrentSource.PrjPcbStructure
rename to pcbs/current_source/CurrentSource.PrjPcbStructure
diff --git a/pcbs/CurrentSource/currentsource.PcbDoc b/pcbs/current_source/currentsource.PcbDoc
similarity index 100%
rename from pcbs/CurrentSource/currentsource.PcbDoc
rename to pcbs/current_source/currentsource.PcbDoc
diff --git a/pcbs/CurrentSource/currentsource.SchDoc b/pcbs/current_source/currentsource.SchDoc
similarity index 100%
rename from pcbs/CurrentSource/currentsource.SchDoc
rename to pcbs/current_source/currentsource.SchDoc
diff --git a/pcb/transimpedance_amp/.gitignore b/pcbs/transimpedance_amp/.gitignore
similarity index 100%
rename from pcb/transimpedance_amp/.gitignore
rename to pcbs/transimpedance_amp/.gitignore
diff --git a/pcb/transimpedance_amp/Photodiode.pretty/BPW34FA.kicad_mod b/pcbs/transimpedance_amp/Photodiode.pretty/BPW34FA.kicad_mod
similarity index 100%
rename from pcb/transimpedance_amp/Photodiode.pretty/BPW34FA.kicad_mod
rename to pcbs/transimpedance_amp/Photodiode.pretty/BPW34FA.kicad_mod
diff --git a/pcb/transimpedance_amp/Photodiodes.pretty/BPW34FA.kicad_mod b/pcbs/transimpedance_amp/Photodiodes.pretty/BPW34FA.kicad_mod
similarity index 100%
rename from pcb/transimpedance_amp/Photodiodes.pretty/BPW34FA.kicad_mod
rename to pcbs/transimpedance_amp/Photodiodes.pretty/BPW34FA.kicad_mod
diff --git a/pcb/transimpedance_amp/Testpoints.pretty/TP_SMD_quadr_3mm.kicad_mod b/pcbs/transimpedance_amp/Testpoints.pretty/TP_SMD_quadr_3mm.kicad_mod
similarity index 100%
rename from pcb/transimpedance_amp/Testpoints.pretty/TP_SMD_quadr_3mm.kicad_mod
rename to pcbs/transimpedance_amp/Testpoints.pretty/TP_SMD_quadr_3mm.kicad_mod
diff --git a/pcb/transimpedance_amp/photodiodes.pretty/BPW34FA.kicad_mod b/pcbs/transimpedance_amp/photodiodes.pretty/BPW34FA.kicad_mod
similarity index 100%
rename from pcb/transimpedance_amp/photodiodes.pretty/BPW34FA.kicad_mod
rename to pcbs/transimpedance_amp/photodiodes.pretty/BPW34FA.kicad_mod
diff --git a/pcb/transimpedance_amp/schematicSymb/ad8616.dcm b/pcbs/transimpedance_amp/schematicSymb/ad8616.dcm
similarity index 100%
rename from pcb/transimpedance_amp/schematicSymb/ad8616.dcm
rename to pcbs/transimpedance_amp/schematicSymb/ad8616.dcm
diff --git a/pcb/transimpedance_amp/schematicSymb/ad8616.lib b/pcbs/transimpedance_amp/schematicSymb/ad8616.lib
similarity index 100%
rename from pcb/transimpedance_amp/schematicSymb/ad8616.lib
rename to pcbs/transimpedance_amp/schematicSymb/ad8616.lib
diff --git a/pcb/transimpedance_amp/transimpedance_amp-cache.lib b/pcbs/transimpedance_amp/transimpedance_amp-cache.lib
similarity index 100%
rename from pcb/transimpedance_amp/transimpedance_amp-cache.lib
rename to pcbs/transimpedance_amp/transimpedance_amp-cache.lib
diff --git a/pcb/transimpedance_amp/transimpedance_amp.jpg b/pcbs/transimpedance_amp/transimpedance_amp.jpg
similarity index 100%
rename from pcb/transimpedance_amp/transimpedance_amp.jpg
rename to pcbs/transimpedance_amp/transimpedance_amp.jpg
diff --git a/pcb/transimpedance_amp/transimpedance_amp.kicad_pcb b/pcbs/transimpedance_amp/transimpedance_amp.kicad_pcb
similarity index 100%
rename from pcb/transimpedance_amp/transimpedance_amp.kicad_pcb
rename to pcbs/transimpedance_amp/transimpedance_amp.kicad_pcb
diff --git a/pcb/transimpedance_amp/transimpedance_amp.pro b/pcbs/transimpedance_amp/transimpedance_amp.pro
similarity index 100%
rename from pcb/transimpedance_amp/transimpedance_amp.pro
rename to pcbs/transimpedance_amp/transimpedance_amp.pro
diff --git a/pcb/transimpedance_amp/transimpedance_amp.sch b/pcbs/transimpedance_amp/transimpedance_amp.sch
similarity index 100%
rename from pcb/transimpedance_amp/transimpedance_amp.sch
rename to pcbs/transimpedance_amp/transimpedance_amp.sch