diff --git a/samples/Arturia MicroBrute/1.wav b/Samples/Arturia MicroBrute/microbrute-1.wav
similarity index 100%
rename from samples/Arturia MicroBrute/1.wav
rename to Samples/Arturia MicroBrute/microbrute-1.wav
diff --git a/samples/Arturia MicroBrute/2.wav b/Samples/Arturia MicroBrute/microbrute-2.wav
similarity index 100%
rename from samples/Arturia MicroBrute/2.wav
rename to Samples/Arturia MicroBrute/microbrute-2.wav
diff --git a/samples/Arturia MicroBrute/3-bass.wav b/Samples/Arturia MicroBrute/microbrute-3-bass.wav
similarity index 100%
rename from samples/Arturia MicroBrute/3-bass.wav
rename to Samples/Arturia MicroBrute/microbrute-3-bass.wav
diff --git a/samples/Arturia MicroBrute/4-blip.wav b/Samples/Arturia MicroBrute/microbrute-4-blip.wav
similarity index 100%
rename from samples/Arturia MicroBrute/4-blip.wav
rename to Samples/Arturia MicroBrute/microbrute-4-blip.wav
diff --git a/samples/Arturia MicroBrute/5-blip.wav b/Samples/Arturia MicroBrute/microbrute-5-blip.wav
similarity index 100%
rename from samples/Arturia MicroBrute/5-blip.wav
rename to Samples/Arturia MicroBrute/microbrute-5-blip.wav
diff --git a/samples/Korg Monolouge/1.wav b/Samples/Korg Monolouge/monolouge-1.wav
similarity index 100%
rename from samples/Korg Monolouge/1.wav
rename to Samples/Korg Monolouge/monolouge-1.wav
diff --git a/samples/Korg Monolouge/2-bass.wav b/Samples/Korg Monolouge/monolouge-2-bass.wav
similarity index 100%
rename from samples/Korg Monolouge/2-bass.wav
rename to Samples/Korg Monolouge/monolouge-2-bass.wav
diff --git a/samples/Korg Monolouge/3-lead.wav b/Samples/Korg Monolouge/monolouge-3-lead.wav
similarity index 100%
rename from samples/Korg Monolouge/3-lead.wav
rename to Samples/Korg Monolouge/monolouge-3-lead.wav
diff --git a/samples/Korg Monolouge/4-bass.wav b/Samples/Korg Monolouge/monolouge-4-bass.wav
similarity index 100%
rename from samples/Korg Monolouge/4-bass.wav
rename to Samples/Korg Monolouge/monolouge-4-bass.wav
diff --git a/samples/Korg Monolouge/5-deep-bass.wav b/Samples/Korg Monolouge/monolouge-5-deep-bass.wav
similarity index 100%
rename from samples/Korg Monolouge/5-deep-bass.wav
rename to Samples/Korg Monolouge/monolouge-5-deep-bass.wav
diff --git a/samples/Korg Monolouge/5-pure-bass.wav b/Samples/Korg Monolouge/monolouge-5-pure-bass.wav
similarity index 100%
rename from samples/Korg Monolouge/5-pure-bass.wav
rename to Samples/Korg Monolouge/monolouge-5-pure-bass.wav
diff --git a/samples/Korg Monolouge/6-bass.wav b/Samples/Korg Monolouge/monolouge-6-bass.wav
similarity index 100%
rename from samples/Korg Monolouge/6-bass.wav
rename to Samples/Korg Monolouge/monolouge-6-bass.wav
diff --git a/samples/Korg Monolouge/7-lead.wav b/Samples/Korg Monolouge/monolouge-7-lead.wav
similarity index 100%
rename from samples/Korg Monolouge/7-lead.wav
rename to Samples/Korg Monolouge/monolouge-7-lead.wav
diff --git a/samples/Korg Monolouge/8-schreeching.wav b/Samples/Korg Monolouge/monolouge-8-schreeching.wav
similarity index 100%
rename from samples/Korg Monolouge/8-schreeching.wav
rename to Samples/Korg Monolouge/monolouge-8-schreeching.wav
diff --git a/samples/Korg VolcaKeys/1-ringmodwav.wav b/Samples/Korg VolcaKeys/volcakeys-1-ringmodwav.wav
similarity index 100%
rename from samples/Korg VolcaKeys/1-ringmodwav.wav
rename to Samples/Korg VolcaKeys/volcakeys-1-ringmodwav.wav
diff --git a/samples/Korg VolcaKeys/11.wav b/Samples/Korg VolcaKeys/volcakeys-11.wav
similarity index 100%
rename from samples/Korg VolcaKeys/11.wav
rename to Samples/Korg VolcaKeys/volcakeys-11.wav
diff --git a/samples/Korg VolcaKeys/2-ringmodblip.wav b/Samples/Korg VolcaKeys/volcakeys-2-ringmodblip.wav
similarity index 100%
rename from samples/Korg VolcaKeys/2-ringmodblip.wav
rename to Samples/Korg VolcaKeys/volcakeys-2-ringmodblip.wav
diff --git a/samples/Korg VolcaKeys/3-ringmodblip.wav b/Samples/Korg VolcaKeys/volcakeys-3-ringmodblip.wav
similarity index 100%
rename from samples/Korg VolcaKeys/3-ringmodblip.wav
rename to Samples/Korg VolcaKeys/volcakeys-3-ringmodblip.wav
diff --git a/samples/Korg VolcaKeys/4-ringmod.wav b/Samples/Korg VolcaKeys/volcakeys-4-ringmod.wav
similarity index 100%
rename from samples/Korg VolcaKeys/4-ringmod.wav
rename to Samples/Korg VolcaKeys/volcakeys-4-ringmod.wav
diff --git a/samples/Korg VolcaKeys/5-ringmodbass.wav b/Samples/Korg VolcaKeys/volcakeys-5-ringmodbass.wav
similarity index 100%
rename from samples/Korg VolcaKeys/5-ringmodbass.wav
rename to Samples/Korg VolcaKeys/volcakeys-5-ringmodbass.wav
diff --git a/samples/Korg VolcaKeys/6-ringmodbass.wav b/Samples/Korg VolcaKeys/volcakeys-6-ringmodbass.wav
similarity index 100%
rename from samples/Korg VolcaKeys/6-ringmodbass.wav
rename to Samples/Korg VolcaKeys/volcakeys-6-ringmodbass.wav
diff --git a/samples/Korg VolcaKeys/7-bass.wav b/Samples/Korg VolcaKeys/volcakeys-7-bass.wav
similarity index 100%
rename from samples/Korg VolcaKeys/7-bass.wav
rename to Samples/Korg VolcaKeys/volcakeys-7-bass.wav
diff --git a/samples/Korg VolcaKeys/8-bass.wav b/Samples/Korg VolcaKeys/volcakeys-8-bass.wav
similarity index 100%
rename from samples/Korg VolcaKeys/8-bass.wav
rename to Samples/Korg VolcaKeys/volcakeys-8-bass.wav
diff --git a/samples/Korg VolcaKeys/9-lead.wav b/Samples/Korg VolcaKeys/volcakeys-9-lead.wav
similarity index 100%
rename from samples/Korg VolcaKeys/9-lead.wav
rename to Samples/Korg VolcaKeys/volcakeys-9-lead.wav
diff --git a/samples/MakeNoise 0-Coast/1-short.wav b/Samples/MakeNoise 0-Coast/0coast-1-short.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/1-short.wav
rename to Samples/MakeNoise 0-Coast/0coast-1-short.wav
diff --git a/samples/MakeNoise 0-Coast/2-blip.wav b/Samples/MakeNoise 0-Coast/0coast-2-blip.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/2-blip.wav
rename to Samples/MakeNoise 0-Coast/0coast-2-blip.wav
diff --git a/samples/MakeNoise 0-Coast/3-blip.wav b/Samples/MakeNoise 0-Coast/0coast-3-blip.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/3-blip.wav
rename to Samples/MakeNoise 0-Coast/0coast-3-blip.wav
diff --git a/samples/MakeNoise 0-Coast/4.wav b/Samples/MakeNoise 0-Coast/0coast-4.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/4.wav
rename to Samples/MakeNoise 0-Coast/0coast-4.wav
diff --git a/samples/MakeNoise 0-Coast/5-bass.wav b/Samples/MakeNoise 0-Coast/0coast-5-bass.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/5-bass.wav
rename to Samples/MakeNoise 0-Coast/0coast-5-bass.wav
diff --git a/samples/MakeNoise 0-Coast/6-bass.wav b/Samples/MakeNoise 0-Coast/0coast-6-bass.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/6-bass.wav
rename to Samples/MakeNoise 0-Coast/0coast-6-bass.wav
diff --git a/samples/MakeNoise 0-Coast/7-bass.wav b/Samples/MakeNoise 0-Coast/0coast-7-bass.wav
similarity index 100%
rename from samples/MakeNoise 0-Coast/7-bass.wav
rename to Samples/MakeNoise 0-Coast/0coast-7-bass.wav
diff --git a/samples/Moog Sub37/1-high.wav b/Samples/Moog Sub37/sub37-1-high.wav
similarity index 100%
rename from samples/Moog Sub37/1-high.wav
rename to Samples/Moog Sub37/sub37-1-high.wav
diff --git a/samples/Moog Sub37/2-low.wav b/Samples/Moog Sub37/sub37-2-low.wav
similarity index 100%
rename from samples/Moog Sub37/2-low.wav
rename to Samples/Moog Sub37/sub37-2-low.wav
diff --git a/samples/Moog Sub37/3-monster.wav b/Samples/Moog Sub37/sub37-3-monster.wav
similarity index 100%
rename from samples/Moog Sub37/3-monster.wav
rename to Samples/Moog Sub37/sub37-3-monster.wav
diff --git a/samples/Moog Sub37/4-monster.wav b/Samples/Moog Sub37/sub37-4-monster.wav
similarity index 100%
rename from samples/Moog Sub37/4-monster.wav
rename to Samples/Moog Sub37/sub37-4-monster.wav
diff --git a/samples/Moog Sub37/5-lead.wav b/Samples/Moog Sub37/sub37-5-lead.wav
similarity index 100%
rename from samples/Moog Sub37/5-lead.wav
rename to Samples/Moog Sub37/sub37-5-lead.wav
diff --git a/samples/Moog Sub37/5-monster.wav b/Samples/Moog Sub37/sub37-5-monster.wav
similarity index 100%
rename from samples/Moog Sub37/5-monster.wav
rename to Samples/Moog Sub37/sub37-5-monster.wav
diff --git a/samples/Moog Sub37/6-filtered.wav b/Samples/Moog Sub37/sub37-6-filtered.wav
similarity index 100%
rename from samples/Moog Sub37/6-filtered.wav
rename to Samples/Moog Sub37/sub37-6-filtered.wav
diff --git a/samples/Moog Sub37/7-filtered.wav b/Samples/Moog Sub37/sub37-7-filtered.wav
similarity index 100%
rename from samples/Moog Sub37/7-filtered.wav
rename to Samples/Moog Sub37/sub37-7-filtered.wav
diff --git a/samples/Moog Sub37/8-blip.wav b/Samples/Moog Sub37/sub37-8-blip.wav
similarity index 100%
rename from samples/Moog Sub37/8-blip.wav
rename to Samples/Moog Sub37/sub37-8-blip.wav
diff --git a/samples/Moog Sub37/9-blip.wav b/Samples/Moog Sub37/sub37-9-blip.wav
similarity index 100%
rename from samples/Moog Sub37/9-blip.wav
rename to Samples/Moog Sub37/sub37-9-blip.wav
diff --git a/samples/NI Monark/1-bass.wav b/Samples/NI Monark/monark-1-bass.wav
similarity index 100%
rename from samples/NI Monark/1-bass.wav
rename to Samples/NI Monark/monark-1-bass.wav
diff --git a/samples/NI Monark/2-lead.wav b/Samples/NI Monark/monark-2-lead.wav
similarity index 100%
rename from samples/NI Monark/2-lead.wav
rename to Samples/NI Monark/monark-2-lead.wav
diff --git a/samples/Roland JP-08/1-bass.wav b/Samples/Roland JP-08/jp08-1-bass.wav
similarity index 100%
rename from samples/Roland JP-08/1-bass.wav
rename to Samples/Roland JP-08/jp08-1-bass.wav
diff --git a/samples/Roland JP-08/10-growl.wav b/Samples/Roland JP-08/jp08-10-growl.wav
similarity index 100%
rename from samples/Roland JP-08/10-growl.wav
rename to Samples/Roland JP-08/jp08-10-growl.wav
diff --git a/samples/Roland JP-08/11-chord.wav b/Samples/Roland JP-08/jp08-11-chord.wav
similarity index 100%
rename from samples/Roland JP-08/11-chord.wav
rename to Samples/Roland JP-08/jp08-11-chord.wav
diff --git a/samples/Roland JP-08/2-lead.wav b/Samples/Roland JP-08/jp08-2-lead.wav
similarity index 100%
rename from samples/Roland JP-08/2-lead.wav
rename to Samples/Roland JP-08/jp08-2-lead.wav
diff --git a/samples/Roland JP-08/3-bass.wav b/Samples/Roland JP-08/jp08-3-bass.wav
similarity index 100%
rename from samples/Roland JP-08/3-bass.wav
rename to Samples/Roland JP-08/jp08-3-bass.wav
diff --git a/samples/Roland JP-08/4.wav b/Samples/Roland JP-08/jp08-4.wav
similarity index 100%
rename from samples/Roland JP-08/4.wav
rename to Samples/Roland JP-08/jp08-4.wav
diff --git a/samples/Roland JP-08/5-filtered.wav b/Samples/Roland JP-08/jp08-5-filtered.wav
similarity index 100%
rename from samples/Roland JP-08/5-filtered.wav
rename to Samples/Roland JP-08/jp08-5-filtered.wav
diff --git a/samples/Roland JP-08/6-fifth.wav b/Samples/Roland JP-08/jp08-6-fifth.wav
similarity index 100%
rename from samples/Roland JP-08/6-fifth.wav
rename to Samples/Roland JP-08/jp08-6-fifth.wav
diff --git a/samples/Roland JP-08/7-filtered.wav b/Samples/Roland JP-08/jp08-7-filtered.wav
similarity index 100%
rename from samples/Roland JP-08/7-filtered.wav
rename to Samples/Roland JP-08/jp08-7-filtered.wav
diff --git a/samples/Roland JP-08/8-filtered.wav b/Samples/Roland JP-08/jp08-8-filtered.wav
similarity index 100%
rename from samples/Roland JP-08/8-filtered.wav
rename to Samples/Roland JP-08/jp08-8-filtered.wav
diff --git a/samples/Roland JP-08/9-blip.wav b/Samples/Roland JP-08/jp08-9-blip.wav
similarity index 100%
rename from samples/Roland JP-08/9-blip.wav
rename to Samples/Roland JP-08/jp08-9-blip.wav
diff --git a/samples/Roland TR-8/highhat1.wav b/Samples/Roland TR-8/tr8-highhat1.wav
similarity index 100%
rename from samples/Roland TR-8/highhat1.wav
rename to Samples/Roland TR-8/tr8-highhat1.wav
diff --git a/samples/Roland TR-8/kick1.wav b/Samples/Roland TR-8/tr8-kick1.wav
similarity index 100%
rename from samples/Roland TR-8/kick1.wav
rename to Samples/Roland TR-8/tr8-kick1.wav
diff --git a/samples/Roland TR-8/kick2.wav b/Samples/Roland TR-8/tr8-kick2.wav
similarity index 100%
rename from samples/Roland TR-8/kick2.wav
rename to Samples/Roland TR-8/tr8-kick2.wav
diff --git a/samples/Roland TR-8/kick3.wav b/Samples/Roland TR-8/tr8-kick3.wav
similarity index 100%
rename from samples/Roland TR-8/kick3.wav
rename to Samples/Roland TR-8/tr8-kick3.wav
diff --git a/samples/Roland TR-8/kick4.wav b/Samples/Roland TR-8/tr8-kick4.wav
similarity index 100%
rename from samples/Roland TR-8/kick4.wav
rename to Samples/Roland TR-8/tr8-kick4.wav
diff --git a/samples/Roland TR-8/kick5.wav b/Samples/Roland TR-8/tr8-kick5.wav
similarity index 100%
rename from samples/Roland TR-8/kick5.wav
rename to Samples/Roland TR-8/tr8-kick5.wav
diff --git a/samples/Roland TR-8/openhat1.wav b/Samples/Roland TR-8/tr8-openhat1.wav
similarity index 100%
rename from samples/Roland TR-8/openhat1.wav
rename to Samples/Roland TR-8/tr8-openhat1.wav
diff --git a/samples/Roland TR-8/snare1.wav b/Samples/Roland TR-8/tr8-snare1.wav
similarity index 100%
rename from samples/Roland TR-8/snare1.wav
rename to Samples/Roland TR-8/tr8-snare1.wav
diff --git a/samples/Roland TR-8/snare2.wav b/Samples/Roland TR-8/tr8-snare2.wav
similarity index 100%
rename from samples/Roland TR-8/snare2.wav
rename to Samples/Roland TR-8/tr8-snare2.wav
diff --git a/samples/Korg VolcaKeys/10-detuned.wav b/samples/Korg VolcaKeys/10-detuned.wav
deleted file mode 100644
index 403d2b3..0000000
Binary files a/samples/Korg VolcaKeys/10-detuned.wav and /dev/null differ