diff --git a/.gitignore b/.gitignore
index a007a13..1b688fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ dist
 /ergogen/output
 
 # Kicad temporary files
-/kicad/*-backups/
+/kicad/*/*-backups/
 *.bak
 *.kicad_pcb-bak
 *.kicad_sch-bak
diff --git a/kicad/eepyboard.kicad_pcb b/kicad/rev1/eepyboard.kicad_pcb
similarity index 100%
rename from kicad/eepyboard.kicad_pcb
rename to kicad/rev1/eepyboard.kicad_pcb
diff --git a/kicad/eepyboard.kicad_pro b/kicad/rev1/eepyboard.kicad_pro
similarity index 100%
rename from kicad/eepyboard.kicad_pro
rename to kicad/rev1/eepyboard.kicad_pro
diff --git a/kicad/gerber/rev1/eepyboard-B_Cu.gbr b/kicad/rev1/gerber/eepyboard-B_Cu.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-B_Cu.gbr
rename to kicad/rev1/gerber/eepyboard-B_Cu.gbr
diff --git a/kicad/gerber/rev1/eepyboard-B_Mask.gbr b/kicad/rev1/gerber/eepyboard-B_Mask.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-B_Mask.gbr
rename to kicad/rev1/gerber/eepyboard-B_Mask.gbr
diff --git a/kicad/gerber/rev1/eepyboard-B_Paste.gbr b/kicad/rev1/gerber/eepyboard-B_Paste.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-B_Paste.gbr
rename to kicad/rev1/gerber/eepyboard-B_Paste.gbr
diff --git a/kicad/gerber/rev1/eepyboard-B_Silkscreen.gbr b/kicad/rev1/gerber/eepyboard-B_Silkscreen.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-B_Silkscreen.gbr
rename to kicad/rev1/gerber/eepyboard-B_Silkscreen.gbr
diff --git a/kicad/gerber/rev1/eepyboard-Edge_Cuts.gbr b/kicad/rev1/gerber/eepyboard-Edge_Cuts.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-Edge_Cuts.gbr
rename to kicad/rev1/gerber/eepyboard-Edge_Cuts.gbr
diff --git a/kicad/gerber/rev1/eepyboard-F_Cu.gbr b/kicad/rev1/gerber/eepyboard-F_Cu.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-F_Cu.gbr
rename to kicad/rev1/gerber/eepyboard-F_Cu.gbr
diff --git a/kicad/gerber/rev1/eepyboard-F_Mask.gbr b/kicad/rev1/gerber/eepyboard-F_Mask.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-F_Mask.gbr
rename to kicad/rev1/gerber/eepyboard-F_Mask.gbr
diff --git a/kicad/gerber/rev1/eepyboard-F_Paste.gbr b/kicad/rev1/gerber/eepyboard-F_Paste.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-F_Paste.gbr
rename to kicad/rev1/gerber/eepyboard-F_Paste.gbr
diff --git a/kicad/gerber/rev1/eepyboard-F_Silkscreen.gbr b/kicad/rev1/gerber/eepyboard-F_Silkscreen.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-F_Silkscreen.gbr
rename to kicad/rev1/gerber/eepyboard-F_Silkscreen.gbr
diff --git a/kicad/gerber/rev1/eepyboard-In1_Cu.gbr b/kicad/rev1/gerber/eepyboard-In1_Cu.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-In1_Cu.gbr
rename to kicad/rev1/gerber/eepyboard-In1_Cu.gbr
diff --git a/kicad/gerber/rev1/eepyboard-In2_Cu.gbr b/kicad/rev1/gerber/eepyboard-In2_Cu.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-In2_Cu.gbr
rename to kicad/rev1/gerber/eepyboard-In2_Cu.gbr
diff --git a/kicad/gerber/rev1/eepyboard-NPTH-drl_map.gbr b/kicad/rev1/gerber/eepyboard-NPTH-drl_map.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-NPTH-drl_map.gbr
rename to kicad/rev1/gerber/eepyboard-NPTH-drl_map.gbr
diff --git a/kicad/gerber/rev1/eepyboard-NPTH.drl b/kicad/rev1/gerber/eepyboard-NPTH.drl
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-NPTH.drl
rename to kicad/rev1/gerber/eepyboard-NPTH.drl
diff --git a/kicad/gerber/rev1/eepyboard-PTH-drl_map.gbr b/kicad/rev1/gerber/eepyboard-PTH-drl_map.gbr
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-PTH-drl_map.gbr
rename to kicad/rev1/gerber/eepyboard-PTH-drl_map.gbr
diff --git a/kicad/gerber/rev1/eepyboard-PTH.drl b/kicad/rev1/gerber/eepyboard-PTH.drl
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-PTH.drl
rename to kicad/rev1/gerber/eepyboard-PTH.drl
diff --git a/kicad/gerber/rev1/eepyboard-job.gbrjob b/kicad/rev1/gerber/eepyboard-job.gbrjob
similarity index 100%
rename from kicad/gerber/rev1/eepyboard-job.gbrjob
rename to kicad/rev1/gerber/eepyboard-job.gbrjob
diff --git a/kicad/gerber/eepyboard_rev1.zip b/kicad/rev1/gerber/eepyboard_rev1.zip
similarity index 100%
rename from kicad/gerber/eepyboard_rev1.zip
rename to kicad/rev1/gerber/eepyboard_rev1.zip