diff --git a/.gitignore b/.gitignore
index fcdd034..7287a0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-console/console-backups/*
-console/console-rescue*
-console/fp-info-cache
+console/leonardo/console-backups/*
+console/leonardo/console-rescue*
+console/leonardo/fp-info-cache
diff --git a/console/BOM.html b/console/leonardo/BOM.html
similarity index 100%
rename from console/BOM.html
rename to console/leonardo/BOM.html
diff --git a/console/console-B_Cu.gbr b/console/leonardo/console-B_Cu.gbr
similarity index 100%
rename from console/console-B_Cu.gbr
rename to console/leonardo/console-B_Cu.gbr
diff --git a/console/console-B_Mask.gbr b/console/leonardo/console-B_Mask.gbr
similarity index 100%
rename from console/console-B_Mask.gbr
rename to console/leonardo/console-B_Mask.gbr
diff --git a/console/console-B_Paste.gbr b/console/leonardo/console-B_Paste.gbr
similarity index 100%
rename from console/console-B_Paste.gbr
rename to console/leonardo/console-B_Paste.gbr
diff --git a/console/console-B_SilkS.gbr b/console/leonardo/console-B_SilkS.gbr
similarity index 100%
rename from console/console-B_SilkS.gbr
rename to console/leonardo/console-B_SilkS.gbr
diff --git a/console/console-B_Silkscreen.gbr b/console/leonardo/console-B_Silkscreen.gbr
similarity index 100%
rename from console/console-B_Silkscreen.gbr
rename to console/leonardo/console-B_Silkscreen.gbr
diff --git a/console/console-Edge_Cuts.gbr b/console/leonardo/console-Edge_Cuts.gbr
similarity index 100%
rename from console/console-Edge_Cuts.gbr
rename to console/leonardo/console-Edge_Cuts.gbr
diff --git a/console/console-F_Cu.gbr b/console/leonardo/console-F_Cu.gbr
similarity index 100%
rename from console/console-F_Cu.gbr
rename to console/leonardo/console-F_Cu.gbr
diff --git a/console/console-F_Mask.gbr b/console/leonardo/console-F_Mask.gbr
similarity index 100%
rename from console/console-F_Mask.gbr
rename to console/leonardo/console-F_Mask.gbr
diff --git a/console/console-F_Paste.gbr b/console/leonardo/console-F_Paste.gbr
similarity index 100%
rename from console/console-F_Paste.gbr
rename to console/leonardo/console-F_Paste.gbr
diff --git a/console/console-F_SilkS.gbr b/console/leonardo/console-F_SilkS.gbr
similarity index 100%
rename from console/console-F_SilkS.gbr
rename to console/leonardo/console-F_SilkS.gbr
diff --git a/console/console-F_Silkscreen.gbr b/console/leonardo/console-F_Silkscreen.gbr
similarity index 100%
rename from console/console-F_Silkscreen.gbr
rename to console/leonardo/console-F_Silkscreen.gbr
diff --git a/console/console-NPTH.drl b/console/leonardo/console-NPTH.drl
similarity index 100%
rename from console/console-NPTH.drl
rename to console/leonardo/console-NPTH.drl
diff --git a/console/console-PTH.drl b/console/leonardo/console-PTH.drl
similarity index 100%
rename from console/console-PTH.drl
rename to console/leonardo/console-PTH.drl
diff --git a/console/console-cache.lib b/console/leonardo/console-cache.lib
similarity index 100%
rename from console/console-cache.lib
rename to console/leonardo/console-cache.lib
diff --git a/console/console-rescue.kicad_sym b/console/leonardo/console-rescue.kicad_sym
similarity index 100%
rename from console/console-rescue.kicad_sym
rename to console/leonardo/console-rescue.kicad_sym
diff --git a/console/console.kicad_pcb b/console/leonardo/console.kicad_pcb
similarity index 100%
rename from console/console.kicad_pcb
rename to console/leonardo/console.kicad_pcb
diff --git a/console/console.kicad_pcb-bak b/console/leonardo/console.kicad_pcb-bak
similarity index 100%
rename from console/console.kicad_pcb-bak
rename to console/leonardo/console.kicad_pcb-bak
diff --git a/console/console.kicad_prl b/console/leonardo/console.kicad_prl
similarity index 100%
rename from console/console.kicad_prl
rename to console/leonardo/console.kicad_prl
diff --git a/console/console.kicad_pro b/console/leonardo/console.kicad_pro
similarity index 100%
rename from console/console.kicad_pro
rename to console/leonardo/console.kicad_pro
diff --git a/console/console.kicad_sch b/console/leonardo/console.kicad_sch
similarity index 100%
rename from console/console.kicad_sch
rename to console/leonardo/console.kicad_sch
diff --git a/console/console.pro b/console/leonardo/console.pro
similarity index 100%
rename from console/console.pro
rename to console/leonardo/console.pro
diff --git a/console/console.sch b/console/leonardo/console.sch
similarity index 100%
rename from console/console.sch
rename to console/leonardo/console.sch
diff --git a/console/console.sch-bak b/console/leonardo/console.sch-bak
similarity index 100%
rename from console/console.sch-bak
rename to console/leonardo/console.sch-bak
diff --git a/console/console.xml b/console/leonardo/console.xml
similarity index 100%
rename from console/console.xml
rename to console/leonardo/console.xml
diff --git a/console/fp-info-cache b/console/leonardo/fp-info-cache
similarity index 100%
rename from console/fp-info-cache
rename to console/leonardo/fp-info-cache
diff --git a/console/fp-lib-table b/console/leonardo/fp-lib-table
similarity index 100%
rename from console/fp-lib-table
rename to console/leonardo/fp-lib-table
diff --git a/console/sym-lib-table b/console/leonardo/sym-lib-table
similarity index 100%
rename from console/sym-lib-table
rename to console/leonardo/sym-lib-table
diff --git a/mixxx_controller/mixxx_controller.ino b/src/mixxx_controller/mixxx_controller.ino
similarity index 100%
rename from mixxx_controller/mixxx_controller.ino
rename to src/mixxx_controller/mixxx_controller.ino
diff --git a/mixxx_controller_with_mux/mixxx_controller_with_mux.ino b/src/mixxx_controller_with_mux/mixxx_controller_with_mux.ino
similarity index 100%
rename from mixxx_controller_with_mux/mixxx_controller_with_mux.ino
rename to src/mixxx_controller_with_mux/mixxx_controller_with_mux.ino