diff --git a/eagle/sk00-supply.brd b/eagle/sk00-supply/sk00-supply.brd
similarity index 100%
rename from eagle/sk00-supply.brd
rename to eagle/sk00-supply/sk00-supply.brd
diff --git a/eagle/sk00-supply.sch b/eagle/sk00-supply/sk00-supply.sch
similarity index 100%
rename from eagle/sk00-supply.sch
rename to eagle/sk00-supply/sk00-supply.sch
diff --git a/eagle/sk01-sync-splitter.brd b/eagle/sk01-sync-splitter/sk01-sync-splitter.brd
similarity index 100%
rename from eagle/sk01-sync-splitter.brd
rename to eagle/sk01-sync-splitter/sk01-sync-splitter.brd
diff --git a/eagle/sk01-sync-splitter.sch b/eagle/sk01-sync-splitter/sk01-sync-splitter.sch
similarity index 100%
rename from eagle/sk01-sync-splitter.sch
rename to eagle/sk01-sync-splitter/sk01-sync-splitter.sch
diff --git a/eagle/sk02-resyncer.brd b/eagle/sk02-resyncer/sk02-resyncer.brd
similarity index 100%
rename from eagle/sk02-resyncer.brd
rename to eagle/sk02-resyncer/sk02-resyncer.brd
diff --git a/eagle/sk02-resyncer.sch b/eagle/sk02-resyncer/sk02-resyncer.sch
similarity index 100%
rename from eagle/sk02-resyncer.sch
rename to eagle/sk02-resyncer/sk02-resyncer.sch
diff --git a/eagle/sk03_backporch_clamp.brd b/eagle/sk03-backporch_clamp/sk03-backporch-clamp.brd
similarity index 100%
rename from eagle/sk03_backporch_clamp.brd
rename to eagle/sk03-backporch_clamp/sk03-backporch-clamp.brd
diff --git a/eagle/sk03_backporch_clamp.sch b/eagle/sk03-backporch_clamp/sk03-backporcvh-clamp.sch
similarity index 100%
rename from eagle/sk03_backporch_clamp.sch
rename to eagle/sk03-backporch_clamp/sk03-backporcvh-clamp.sch
diff --git a/eagle/sk04-aux-in.brd b/eagle/sk04-aux-in/sk04-aux-in.brd
similarity index 100%
rename from eagle/sk04-aux-in.brd
rename to eagle/sk04-aux-in/sk04-aux-in.brd
diff --git a/eagle/sk04-aux-in.sch b/eagle/sk04-aux-in/sk04-aux-in.sch
similarity index 100%
rename from eagle/sk04-aux-in.sch
rename to eagle/sk04-aux-in/sk04-aux-in.sch
diff --git a/eagle/sk05-mux.brd b/eagle/sk05-mux/sk05-mux.brd
similarity index 100%
rename from eagle/sk05-mux.brd
rename to eagle/sk05-mux/sk05-mux.brd
diff --git a/eagle/sk05-mux.sch b/eagle/sk05-mux/sk05-mux.sch
similarity index 100%
rename from eagle/sk05-mux.sch
rename to eagle/sk05-mux/sk05-mux.sch
diff --git a/eagle/sk06-dist.brd b/eagle/sk06-dist/sk06-dist.brd
similarity index 100%
rename from eagle/sk06-dist.brd
rename to eagle/sk06-dist/sk06-dist.brd
diff --git a/eagle/sk06-dist.sch b/eagle/sk06-dist/sk06-dist.sch
similarity index 100%
rename from eagle/sk06-dist.sch
rename to eagle/sk06-dist/sk06-dist.sch
diff --git a/eagle/sk07-comparator.brd b/eagle/sk07-comparator/sk07-comparator.brd
similarity index 100%
rename from eagle/sk07-comparator.brd
rename to eagle/sk07-comparator/sk07-comparator.brd
diff --git a/eagle/sk07-comparator.sch b/eagle/sk07-comparator/sk07-comparator.sch
similarity index 100%
rename from eagle/sk07-comparator.sch
rename to eagle/sk07-comparator/sk07-comparator.sch
diff --git a/eagle/sk08-inverter.brd b/eagle/sk08-inverter/sk08-inverter.brd
similarity index 100%
rename from eagle/sk08-inverter.brd
rename to eagle/sk08-inverter/sk08-inverter.brd
diff --git a/eagle/sk08-inverter.sch b/eagle/sk08-inverter/sk08-inverter.sch
similarity index 100%
rename from eagle/sk08-inverter.sch
rename to eagle/sk08-inverter/sk08-inverter.sch
diff --git a/eagle/sk09-scale-bias.brd b/eagle/sk09-scale-bias/sk09-scale-bias.brd
similarity index 100%
rename from eagle/sk09-scale-bias.brd
rename to eagle/sk09-scale-bias/sk09-scale-bias.brd
diff --git a/eagle/sk09-scale-bias.sch b/eagle/sk09-scale-bias/sk09-scale-bias.sch
similarity index 100%
rename from eagle/sk09-scale-bias.sch
rename to eagle/sk09-scale-bias/sk09-scale-bias.sch
diff --git a/eagle/sk10-vca.brd b/eagle/sk10-vca/sk10-vca.brd
similarity index 100%
rename from eagle/sk10-vca.brd
rename to eagle/sk10-vca/sk10-vca.brd
diff --git a/eagle/sk10-vca.sch b/eagle/sk10-vca/sk10-vca.sch
similarity index 100%
rename from eagle/sk10-vca.sch
rename to eagle/sk10-vca/sk10-vca.sch
diff --git a/eagle/sk11-adder.brd b/eagle/sk11-adder/sk11-adder.brd
similarity index 100%
rename from eagle/sk11-adder.brd
rename to eagle/sk11-adder/sk11-adder.brd
diff --git a/eagle/sk11-adder.sch b/eagle/sk11-adder/sk11-adder.sch
similarity index 100%
rename from eagle/sk11-adder.sch
rename to eagle/sk11-adder/sk11-adder.sch
diff --git a/eagle/sk12-difference.brd b/eagle/sk12-difference/sk12-difference.brd
similarity index 100%
rename from eagle/sk12-difference.brd
rename to eagle/sk12-difference/sk12-difference.brd
diff --git a/eagle/sk12-difference.sch b/eagle/sk12-difference/sk12-difference.sch
similarity index 100%
rename from eagle/sk12-difference.sch
rename to eagle/sk12-difference/sk12-difference.sch
diff --git a/eagle/sk14-twoway_mixer.brd b/eagle/sk14-twoway_mixer/sk14-twoway_mixer.brd
similarity index 100%
rename from eagle/sk14-twoway_mixer.brd
rename to eagle/sk14-twoway_mixer/sk14-twoway_mixer.brd
diff --git a/eagle/sk14-twoway_mixer.sch b/eagle/sk14-twoway_mixer/sk14-twoway_mixer.sch
similarity index 100%
rename from eagle/sk14-twoway_mixer.sch
rename to eagle/sk14-twoway_mixer/sk14-twoway_mixer.sch
diff --git a/eagle/sk15-fourway_mixer.brd b/eagle/sk15-fourway_mixer/sk15-fourway_mixer.brd
similarity index 100%
rename from eagle/sk15-fourway_mixer.brd
rename to eagle/sk15-fourway_mixer/sk15-fourway_mixer.brd
diff --git a/eagle/sk15-fourway_mixer.sch b/eagle/sk15-fourway_mixer/sk15-fourway_mixer.sch
similarity index 100%
rename from eagle/sk15-fourway_mixer.sch
rename to eagle/sk15-fourway_mixer/sk15-fourway_mixer.sch
diff --git a/eagle/sk16-6channel-mixer.brd b/eagle/sk16-6channel-mixer/sk16-6channel-mixer.brd
similarity index 100%
rename from eagle/sk16-6channel-mixer.brd
rename to eagle/sk16-6channel-mixer/sk16-6channel-mixer.brd
diff --git a/eagle/sk16-6channel-mixer.sch b/eagle/sk16-6channel-mixer/sk16-6channel-mixer.sch
similarity index 100%
rename from eagle/sk16-6channel-mixer.sch
rename to eagle/sk16-6channel-mixer/sk16-6channel-mixer.sch
diff --git a/eagle/sk19-vca_rohm.brd b/eagle/sk19-vca_rohm/sk19-vca_rohm.brd
similarity index 100%
rename from eagle/sk19-vca_rohm.brd
rename to eagle/sk19-vca_rohm/sk19-vca_rohm.brd
diff --git a/eagle/sk19-vca_rohm.sch b/eagle/sk19-vca_rohm/sk19-vca_rohm.sch
similarity index 100%
rename from eagle/sk19-vca_rohm.sch
rename to eagle/sk19-vca_rohm/sk19-vca_rohm.sch
diff --git a/eagle/sk20-bandpass.brd b/eagle/sk20-bandpass/sk20-bandpass.brd
similarity index 100%
rename from eagle/sk20-bandpass.brd
rename to eagle/sk20-bandpass/sk20-bandpass.brd
diff --git a/eagle/sk20-bandpass.sch b/eagle/sk20-bandpass/sk20-bandpass.sch
similarity index 100%
rename from eagle/sk20-bandpass.sch
rename to eagle/sk20-bandpass/sk20-bandpass.sch
diff --git a/eagle/sk21-trimmable_bandpass.brd b/eagle/sk21-trimmable_bandpass/sk21-trimmable_bandpass.brd
similarity index 100%
rename from eagle/sk21-trimmable_bandpass.brd
rename to eagle/sk21-trimmable_bandpass/sk21-trimmable_bandpass.brd
diff --git a/eagle/sk21-trimmable_bandpass.sch b/eagle/sk21-trimmable_bandpass/sk21-trimmable_bandpass.sch
similarity index 100%
rename from eagle/sk21-trimmable_bandpass.sch
rename to eagle/sk21-trimmable_bandpass/sk21-trimmable_bandpass.sch
diff --git a/eagle/sk21-twowaypass.brd b/eagle/sk22-twowaypass/sk22-twowaypass.brd
similarity index 100%
rename from eagle/sk21-twowaypass.brd
rename to eagle/sk22-twowaypass/sk22-twowaypass.brd
diff --git a/eagle/sk21-twowaypass.sch b/eagle/sk22-twowaypass/sk22-twowaypass.sch
similarity index 100%
rename from eagle/sk21-twowaypass.sch
rename to eagle/sk22-twowaypass/sk22-twowaypass.sch
diff --git a/eagle/sk30-gamma.brd b/eagle/sk30-gamma/sk30-gamma.brd
similarity index 100%
rename from eagle/sk30-gamma.brd
rename to eagle/sk30-gamma/sk30-gamma.brd
diff --git a/eagle/sk30-gamma.sch b/eagle/sk30-gamma/sk30-gamma.sch
similarity index 100%
rename from eagle/sk30-gamma.sch
rename to eagle/sk30-gamma/sk30-gamma.sch
diff --git a/eagle/sk50-lfo_triple.brd b/eagle/sk50-lfo_triple/sk50-lfo_triple.brd
similarity index 100%
rename from eagle/sk50-lfo_triple.brd
rename to eagle/sk50-lfo_triple/sk50-lfo_triple.brd
diff --git a/eagle/sk50-lfo_triple.sch b/eagle/sk50-lfo_triple/sk50-lfo_triple.sch
similarity index 100%
rename from eagle/sk50-lfo_triple.sch
rename to eagle/sk50-lfo_triple/sk50-lfo_triple.sch
diff --git a/eagle/sk51-env-follower.brd b/eagle/sk51-env-follower/sk51-env-follower.brd
similarity index 100%
rename from eagle/sk51-env-follower.brd
rename to eagle/sk51-env-follower/sk51-env-follower.brd
diff --git a/eagle/sk51-env-follower.sch b/eagle/sk51-env-follower/sk51-env-follower.sch
similarity index 100%
rename from eagle/sk51-env-follower.sch
rename to eagle/sk51-env-follower/sk51-env-follower.sch
diff --git a/eagle/sk51-pulsedelay.brd b/eagle/sk52-pulsedelay/sk52-pulsedelay.brf
similarity index 100%
rename from eagle/sk51-pulsedelay.brd
rename to eagle/sk52-pulsedelay/sk52-pulsedelay.brf
diff --git a/eagle/sk51-pulsedelay.sch b/eagle/sk52-pulsedelay/sk52-pulsedelay.sch
similarity index 100%
rename from eagle/sk51-pulsedelay.sch
rename to eagle/sk52-pulsedelay/sk52-pulsedelay.sch
diff --git a/eagle/sk60-delay.brd b/eagle/sk60-delay/sk60-delay.brd
similarity index 100%
rename from eagle/sk60-delay.brd
rename to eagle/sk60-delay/sk60-delay.brd
diff --git a/eagle/sk60-delay.sch b/eagle/sk60-delay/sk60-delay.sch
similarity index 100%
rename from eagle/sk60-delay.sch
rename to eagle/sk60-delay/sk60-delay.sch
diff --git a/eagle/sk60_memory_module.brd b/eagle/sk60-delay/sk60_memory_module.brd
similarity index 100%
rename from eagle/sk60_memory_module.brd
rename to eagle/sk60-delay/sk60_memory_module.brd
diff --git a/eagle/sk60_memory_module.sch b/eagle/sk60-delay/sk60_memory_module.sch
similarity index 100%
rename from eagle/sk60_memory_module.sch
rename to eagle/sk60-delay/sk60_memory_module.sch
diff --git a/eagle/sk65-bit-crusher.brd b/eagle/sk65-bit-crusher/sk65-bit-crusher.brd
similarity index 100%
rename from eagle/sk65-bit-crusher.brd
rename to eagle/sk65-bit-crusher/sk65-bit-crusher.brd
diff --git a/eagle/sk65-bit-crusher.sch b/eagle/sk65-bit-crusher/sk65-bit-crusher.sch
similarity index 100%
rename from eagle/sk65-bit-crusher.sch
rename to eagle/sk65-bit-crusher/sk65-bit-crusher.sch
diff --git a/eagle/sk70-16step-sequencer.brd b/eagle/sk70-16step-sequencer/sk70-16step-sequencer.brd
similarity index 100%
rename from eagle/sk70-16step-sequencer.brd
rename to eagle/sk70-16step-sequencer/sk70-16step-sequencer.brd
diff --git a/eagle/sk70-16step-sequencer.sch b/eagle/sk70-16step-sequencer/sk70-16step-sequencer.sch
similarity index 100%
rename from eagle/sk70-16step-sequencer.sch
rename to eagle/sk70-16step-sequencer/sk70-16step-sequencer.sch