diff --git a/artista_desconocido/a_h/hdn-cllo.mid b/artista_desconocido/a_h/hdn_cllo.mid
similarity index 100%
rename from artista_desconocido/a_h/hdn-cllo.mid
rename to artista_desconocido/a_h/hdn_cllo.mid
diff --git a/artista_desconocido/a_h/hdncllo.mid b/artista_desconocido/a_h/hdncllo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ecbaf1d8d7596f0a46de2b728126c7ad934beb91
Binary files /dev/null and b/artista_desconocido/a_h/hdncllo.mid differ
diff --git a/artista_desconocido/i_o/jeux-int.mid b/artista_desconocido/i_o/jeux_int.mid
similarity index 100%
rename from artista_desconocido/i_o/jeux-int.mid
rename to artista_desconocido/i_o/jeux_int.mid
diff --git a/artista_desconocido/i_o/jeuxint.mid b/artista_desconocido/i_o/jeuxint.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3d149e391de1cae6beb5eb94bdfd1784775afa2c
Binary files /dev/null and b/artista_desconocido/i_o/jeuxint.mid differ
diff --git a/artista_desconocido/i_o/mzt-k117.mid b/artista_desconocido/i_o/mzt_k117.mid
similarity index 100%
rename from artista_desconocido/i_o/mzt-k117.mid
rename to artista_desconocido/i_o/mzt_k117.mid
diff --git a/artista_desconocido/i_o/mztk117.mid b/artista_desconocido/i_o/mztk117.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4be0deb4ebd7350ae0c093b526179cc62902eab7
Binary files /dev/null and b/artista_desconocido/i_o/mztk117.mid differ
diff --git a/artista_desconocido/p_z/ros-barb.mid b/artista_desconocido/p_z/ros_barb.mid
similarity index 100%
rename from artista_desconocido/p_z/ros-barb.mid
rename to artista_desconocido/p_z/ros_barb.mid
diff --git a/artista_desconocido/p_z/rosbarb.mid b/artista_desconocido/p_z/rosbarb.mid
new file mode 100644
index 0000000000000000000000000000000000000000..742a4852dfaf4563bd56b7e56d9ad61189266ae7
Binary files /dev/null and b/artista_desconocido/p_z/rosbarb.mid differ
diff --git a/artista_desconocido/p_z/rv-107.mid b/artista_desconocido/p_z/rv107.mid
similarity index 100%
rename from artista_desconocido/p_z/rv-107.mid
rename to artista_desconocido/p_z/rv107.mid
diff --git a/artista_desconocido/p_z/rv_107.mid b/artista_desconocido/p_z/rv_107.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0c88cad74d78d1626018ac967ec39daf538000a5
Binary files /dev/null and b/artista_desconocido/p_z/rv_107.mid differ
diff --git a/artista_desconocido/p_z/schu-120.mid b/artista_desconocido/p_z/schu120.mid
similarity index 100%
rename from artista_desconocido/p_z/schu-120.mid
rename to artista_desconocido/p_z/schu120.mid
diff --git a/artista_desconocido/p_z/schu_120.mid b/artista_desconocido/p_z/schu_120.mid
new file mode 100644
index 0000000000000000000000000000000000000000..bb07e1ade97eefff5e07a97263727af9632be8e5
Binary files /dev/null and b/artista_desconocido/p_z/schu_120.mid differ
diff --git a/artista_desconocido/p_z/sor-17.mid b/artista_desconocido/p_z/sor17.mid
similarity index 100%
rename from artista_desconocido/p_z/sor-17.mid
rename to artista_desconocido/p_z/sor17.mid
diff --git a/artista_desconocido/p_z/sor_17.mid b/artista_desconocido/p_z/sor_17.mid
new file mode 100644
index 0000000000000000000000000000000000000000..cb4646c333c8828fa2517d4a69f0c71793fd72b2
Binary files /dev/null and b/artista_desconocido/p_z/sor_17.mid differ
diff --git a/artista_desconocido/p_z/str-danc.mid b/artista_desconocido/p_z/str_danc.mid
similarity index 100%
rename from artista_desconocido/p_z/str-danc.mid
rename to artista_desconocido/p_z/str_danc.mid
diff --git a/artista_desconocido/p_z/strdanc.mid b/artista_desconocido/p_z/strdanc.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ec15a267c47366b5640e616e7e3166b6633295a9
Binary files /dev/null and b/artista_desconocido/p_z/strdanc.mid differ
diff --git a/bach/bwv001-_400_chorales/bwv0066.mid b/bach/bwv001-_400_chorales/bwv006_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0066.mid
rename to bach/bwv001-_400_chorales/bwv006_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0077.mid b/bach/bwv001-_400_chorales/bwv007_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0077.mid
rename to bach/bwv001-_400_chorales/bwv007_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0086.mid b/bach/bwv001-_400_chorales/bwv008_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0086.mid
rename to bach/bwv001-_400_chorales/bwv008_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0097.mid b/bach/bwv001-_400_chorales/bwv009_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0097.mid
rename to bach/bwv001-_400_chorales/bwv009_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0107.mid b/bach/bwv001-_400_chorales/bwv010_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0107.mid
rename to bach/bwv001-_400_chorales/bwv010_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0116.mid b/bach/bwv001-_400_chorales/bwv011_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0116.mid
rename to bach/bwv001-_400_chorales/bwv011_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0127.mid b/bach/bwv001-_400_chorales/bwv012_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0127.mid
rename to bach/bwv001-_400_chorales/bwv012_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0136.mid b/bach/bwv001-_400_chorales/bwv013_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0136.mid
rename to bach/bwv001-_400_chorales/bwv013_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0145.mid b/bach/bwv001-_400_chorales/bwv014_5.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0145.mid
rename to bach/bwv001-_400_chorales/bwv014_5.mid
diff --git a/bach/bwv001-_400_chorales/bwv0166.mid b/bach/bwv001-_400_chorales/bwv016_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0166.mid
rename to bach/bwv001-_400_chorales/bwv016_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0177.mid b/bach/bwv001-_400_chorales/bwv017_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0177.mid
rename to bach/bwv001-_400_chorales/bwv017_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0185.mid b/bach/bwv001-_400_chorales/bwv018_5.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0185.mid
rename to bach/bwv001-_400_chorales/bwv018_5.mid
diff --git a/bach/bwv001-_400_chorales/bwv018a5.mid b/bach/bwv001-_400_chorales/bwv018a_5.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv018a5.mid
rename to bach/bwv001-_400_chorales/bwv018a_5.mid
diff --git a/bach/bwv001-_400_chorales/bwv0197.mid b/bach/bwv001-_400_chorales/bwv019_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0197.mid
rename to bach/bwv001-_400_chorales/bwv019_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0197ch.mid b/bach/bwv001-_400_chorales/bwv019_7ch.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0197ch.mid
rename to bach/bwv001-_400_chorales/bwv019_7ch.mid
diff --git a/bach/bwv001-_400_chorales/bwv0207.mid b/bach/bwv001-_400_chorales/bwv020_11.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0207.mid
rename to bach/bwv001-_400_chorales/bwv020_11.mid
diff --git a/bach/bwv001-_400_chorales/bwv02011.mid b/bach/bwv001-_400_chorales/bwv020_7.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv02011.mid
rename to bach/bwv001-_400_chorales/bwv020_7.mid
diff --git a/bach/bwv001-_400_chorales/bwv0246.mid b/bach/bwv001-_400_chorales/bwv024_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0246.mid
rename to bach/bwv001-_400_chorales/bwv024_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0246s.mid b/bach/bwv001-_400_chorales/bwv024_6s.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0246s.mid
rename to bach/bwv001-_400_chorales/bwv024_6s.mid
diff --git a/bach/bwv001-_400_chorales/bwv0256.mid b/bach/bwv001-_400_chorales/bwv025_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0256.mid
rename to bach/bwv001-_400_chorales/bwv025_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0256v1.mid b/bach/bwv001-_400_chorales/bwv025_6v1.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0256v1.mid
rename to bach/bwv001-_400_chorales/bwv025_6v1.mid
diff --git a/bach/bwv001-_400_chorales/bwv0256v2.mid b/bach/bwv001-_400_chorales/bwv025_6v2.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0256v2.mid
rename to bach/bwv001-_400_chorales/bwv025_6v2.mid
diff --git a/bach/bwv001-_400_chorales/bwv0266.mid b/bach/bwv001-_400_chorales/bwv026_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0266.mid
rename to bach/bwv001-_400_chorales/bwv026_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0276.mid b/bach/bwv001-_400_chorales/bwv027_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0276.mid
rename to bach/bwv001-_400_chorales/bwv027_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0286.mid b/bach/bwv001-_400_chorales/bwv028_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0286.mid
rename to bach/bwv001-_400_chorales/bwv028_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0298.mid b/bach/bwv001-_400_chorales/bwv029_8.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0298.mid
rename to bach/bwv001-_400_chorales/bwv029_8.mid
diff --git a/bach/bwv001-_400_chorales/bwv0298ch.mid b/bach/bwv001-_400_chorales/bwv029_8ch.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0298ch.mid
rename to bach/bwv001-_400_chorales/bwv029_8ch.mid
diff --git a/bach/bwv001-_400_chorales/bwv0306.mid b/bach/bwv001-_400_chorales/bwv030_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0306.mid
rename to bach/bwv001-_400_chorales/bwv030_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0306v.mid b/bach/bwv001-_400_chorales/bwv030_6v.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0306v.mid
rename to bach/bwv001-_400_chorales/bwv030_6v.mid
diff --git a/bach/bwv001-_400_chorales/bwv0319.mid b/bach/bwv001-_400_chorales/bwv031_9.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0319.mid
rename to bach/bwv001-_400_chorales/bwv031_9.mid
diff --git a/bach/bwv001-_400_chorales/bwv0326.mid b/bach/bwv001-_400_chorales/bwv032_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0326.mid
rename to bach/bwv001-_400_chorales/bwv032_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv0336.mid b/bach/bwv001-_400_chorales/bwv033_6.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv0336.mid
rename to bach/bwv001-_400_chorales/bwv033_6.mid
diff --git a/bach/bwv001-_400_chorales/bwv03624.mid b/bach/bwv001-_400_chorales/bwv0362_4.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv03624.mid
rename to bach/bwv001-_400_chorales/bwv0362_4.mid
diff --git a/bach/bwv001-_400_chorales/bwv03628.mid b/bach/bwv001-_400_chorales/bwv0362_8.mid
similarity index 100%
rename from bach/bwv001-_400_chorales/bwv03628.mid
rename to bach/bwv001-_400_chorales/bwv0362_8.mid
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n15_trio-largo.mid b/bach/bwv1079_the_musical_offering/musical_offering_n15_trio_largo.mid
similarity index 100%
rename from bach/bwv1079_the_musical_offering/musical_offering_n15_trio-largo.mid
rename to bach/bwv1079_the_musical_offering/musical_offering_n15_trio_largo.mid
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n15_triolargo.mid b/bach/bwv1079_the_musical_offering/musical_offering_n15_triolargo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..62baadfa41704145643a75a2e35a820868cd8d85
Binary files /dev/null and b/bach/bwv1079_the_musical_offering/musical_offering_n15_triolargo.mid differ
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n16_trio-allegro.mid b/bach/bwv1079_the_musical_offering/musical_offering_n16_trio_allegro.mid
similarity index 100%
rename from bach/bwv1079_the_musical_offering/musical_offering_n16_trio-allegro.mid
rename to bach/bwv1079_the_musical_offering/musical_offering_n16_trio_allegro.mid
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n16_trioallegro.mid b/bach/bwv1079_the_musical_offering/musical_offering_n16_trioallegro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..06c3ca9175984ea8cbc9bdbede9b4cee481e62a8
Binary files /dev/null and b/bach/bwv1079_the_musical_offering/musical_offering_n16_trioallegro.mid differ
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n17_trio-andante.mid b/bach/bwv1079_the_musical_offering/musical_offering_n17_trio_andante.mid
similarity index 100%
rename from bach/bwv1079_the_musical_offering/musical_offering_n17_trio-andante.mid
rename to bach/bwv1079_the_musical_offering/musical_offering_n17_trio_andante.mid
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n17_trioandante.mid b/bach/bwv1079_the_musical_offering/musical_offering_n17_trioandante.mid
new file mode 100644
index 0000000000000000000000000000000000000000..62d9965e4c6d81ca32f1423be56af6304e25bf1f
Binary files /dev/null and b/bach/bwv1079_the_musical_offering/musical_offering_n17_trioandante.mid differ
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n18_trio-allegro.mid b/bach/bwv1079_the_musical_offering/musical_offering_n18_trio_allegro.mid
similarity index 100%
rename from bach/bwv1079_the_musical_offering/musical_offering_n18_trio-allegro.mid
rename to bach/bwv1079_the_musical_offering/musical_offering_n18_trio_allegro.mid
diff --git a/bach/bwv1079_the_musical_offering/musical_offering_n18_trioallegro.mid b/bach/bwv1079_the_musical_offering/musical_offering_n18_trioallegro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..114ea7e2c66b7549378008508f8328bbf2880b97
Binary files /dev/null and b/bach/bwv1079_the_musical_offering/musical_offering_n18_trioallegro.mid differ
diff --git a/bach/bwv244_st._matthew_passion/10wir_setzen_uns_mit_tranen_nieder_chorus.mid b/bach/bwv244_st._matthew_passion/10_wir_setzen_uns_mit_tranen_nieder_chorus.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/10wir_setzen_uns_mit_tranen_nieder_chorus.mid
rename to bach/bwv244_st._matthew_passion/10_wir_setzen_uns_mit_tranen_nieder_chorus.mid
diff --git a/bach/bwv244_st._matthew_passion/1bass_aria.mid b/bach/bwv244_st._matthew_passion/1_bass_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/1bass_aria.mid
rename to bach/bwv244_st._matthew_passion/1_bass_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/2aus_liebe_will_mein_heiland_sterban_soprano_aria.mid b/bach/bwv244_st._matthew_passion/2_aus_liebe_will_mein_heiland_sterban_soprano_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/2aus_liebe_will_mein_heiland_sterban_soprano_aria.mid
rename to bach/bwv244_st._matthew_passion/2_aus_liebe_will_mein_heiland_sterban_soprano_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/3gebt_mir_meinen_jesum_weider_bass_aria.mid b/bach/bwv244_st._matthew_passion/3_gebt_mir_meinen_jesum_weider_bass_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/3gebt_mir_meinen_jesum_weider_bass_aria.mid
rename to bach/bwv244_st._matthew_passion/3_gebt_mir_meinen_jesum_weider_bass_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/4blute_nur_du_liebes_herz_soprano_aria.mid b/bach/bwv244_st._matthew_passion/4_blute_nur_du_liebes_herz_soprano_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/4blute_nur_du_liebes_herz_soprano_aria.mid
rename to bach/bwv244_st._matthew_passion/4_blute_nur_du_liebes_herz_soprano_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/5erbarme_dicht_mein_gott_alto_aria.mid b/bach/bwv244_st._matthew_passion/5_erbarme_dicht_mein_gott_alto_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/5erbarme_dicht_mein_gott_alto_aria.mid
rename to bach/bwv244_st._matthew_passion/5_erbarme_dicht_mein_gott_alto_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/6herzliebster_jesu_chorus.mid b/bach/bwv244_st._matthew_passion/6_herzliebster_jesu_chorus.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/6herzliebster_jesu_chorus.mid
rename to bach/bwv244_st._matthew_passion/6_herzliebster_jesu_chorus.mid
diff --git a/bach/bwv244_st._matthew_passion/7konnen_tranen_meiner_wangen_nichts_erlangen_alto_aria.mid b/bach/bwv244_st._matthew_passion/7_konnen_tranen_meiner_wangen_nichts_erlangen_alto_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/7konnen_tranen_meiner_wangen_nichts_erlangen_alto_aria.mid
rename to bach/bwv244_st._matthew_passion/7_konnen_tranen_meiner_wangen_nichts_erlangen_alto_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/8mache_dich_mein_herz_bass_aria.mid b/bach/bwv244_st._matthew_passion/8_mache_dich_mein_herz_bass_aria.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/8mache_dich_mein_herz_bass_aria.mid
rename to bach/bwv244_st._matthew_passion/8_mache_dich_mein_herz_bass_aria.mid
diff --git a/bach/bwv244_st._matthew_passion/9o_haupt_voll_blut_und_wunden_chorus.mid b/bach/bwv244_st._matthew_passion/9_o_haupt_voll_blut_und_wunden_chorus.mid
similarity index 100%
rename from bach/bwv244_st._matthew_passion/9o_haupt_voll_blut_und_wunden_chorus.mid
rename to bach/bwv244_st._matthew_passion/9_o_haupt_voll_blut_und_wunden_chorus.mid
diff --git a/bach/bwv802_four_inventions_duettos_clavier-ubung_iii_n1.mid b/bach/bwv802_four_inventions_duettos_clavier_ubung_iii_n1.mid
similarity index 100%
rename from bach/bwv802_four_inventions_duettos_clavier-ubung_iii_n1.mid
rename to bach/bwv802_four_inventions_duettos_clavier_ubung_iii_n1.mid
diff --git a/bach/bwv802_four_inventions_duettos_clavierubung_iii_n1.mid b/bach/bwv802_four_inventions_duettos_clavierubung_iii_n1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f43a21424d99e9d23705ebaf69f2312a71ce19ed
Binary files /dev/null and b/bach/bwv802_four_inventions_duettos_clavierubung_iii_n1.mid differ
diff --git a/bach/concertos/bwv1048_brandenburg_concert_n3_2-3movs.mid b/bach/concertos/bwv1048_brandenburg_concert_n3_23movs.mid
similarity index 100%
rename from bach/concertos/bwv1048_brandenburg_concert_n3_2-3movs.mid
rename to bach/concertos/bwv1048_brandenburg_concert_n3_23movs.mid
diff --git a/bach/concertos/bwv1048_brandenburg_concert_n3_2_3movs.mid b/bach/concertos/bwv1048_brandenburg_concert_n3_2_3movs.mid
new file mode 100644
index 0000000000000000000000000000000000000000..7e6aa7f5257e29b27fe4626fec9c1a1d2c97aae8
Binary files /dev/null and b/bach/concertos/bwv1048_brandenburg_concert_n3_2_3movs.mid differ
diff --git a/bach/concertos/bwv1050_brandenburg_concert_n5_1-2-3movs.mid b/bach/concertos/bwv1050_brandenburg_concert_n5_123movs.mid
similarity index 100%
rename from bach/concertos/bwv1050_brandenburg_concert_n5_1-2-3movs.mid
rename to bach/concertos/bwv1050_brandenburg_concert_n5_123movs.mid
diff --git a/bach/concertos/bwv1050_brandenburg_concert_n5_1_2_3movs.mid b/bach/concertos/bwv1050_brandenburg_concert_n5_1_2_3movs.mid
new file mode 100644
index 0000000000000000000000000000000000000000..8d9634bae704dcba0293ec9cd2fe5e6566f3a97f
Binary files /dev/null and b/bach/concertos/bwv1050_brandenburg_concert_n5_1_2_3movs.mid differ
diff --git a/bartok/ten_easy_piano_pieces_an_evening_at_the_village_mov5.mid b/bartok/ten_easy_piano_pieces_an_evening_at_the_village_mov_5.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_an_evening_at_the_village_mov5.mid
rename to bartok/ten_easy_piano_pieces_an_evening_at_the_village_mov_5.mid
diff --git a/bartok/ten_easy_piano_pieces_aurora_mov7.mid b/bartok/ten_easy_piano_pieces_aurora_mov_7.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_aurora_mov7.mid
rename to bartok/ten_easy_piano_pieces_aurora_mov_7.mid
diff --git a/bartok/ten_easy_piano_pieces_bear_dance_mov10.mid b/bartok/ten_easy_piano_pieces_bear_dance_mov_10.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_bear_dance_mov10.mid
rename to bartok/ten_easy_piano_pieces_bear_dance_mov_10.mid
diff --git a/bartok/ten_easy_piano_pieces_dedication_mov0.mid b/bartok/ten_easy_piano_pieces_dedication_mov_0.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_dedication_mov0.mid
rename to bartok/ten_easy_piano_pieces_dedication_mov_0.mid
diff --git a/bartok/ten_easy_piano_pieces_finger-exercise_mov9.mid b/bartok/ten_easy_piano_pieces_finger_exercise_mov9.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_finger-exercise_mov9.mid
rename to bartok/ten_easy_piano_pieces_finger_exercise_mov9.mid
diff --git a/bartok/ten_easy_piano_pieces_hungarian_folksong_mov6.mid b/bartok/ten_easy_piano_pieces_hungarian_folksong_mov_6.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_hungarian_folksong_mov6.mid
rename to bartok/ten_easy_piano_pieces_hungarian_folksong_mov_6.mid
diff --git a/bartok/ten_easy_piano_pieces_hungarian_folksong_mov8.mid b/bartok/ten_easy_piano_pieces_hungarian_folksong_mov_8.mid
similarity index 100%
rename from bartok/ten_easy_piano_pieces_hungarian_folksong_mov8.mid
rename to bartok/ten_easy_piano_pieces_hungarian_folksong_mov_8.mid
diff --git a/bartok/unknown_piano_sonata_mov3.mid b/bartok/unknown_piano_sonata_mov_3.mid
similarity index 100%
rename from bartok/unknown_piano_sonata_mov3.mid
rename to bartok/unknown_piano_sonata_mov_3.mid
diff --git a/beethoven/anhang_14-3.mid b/beethoven/anhang_14_3.mid
similarity index 100%
rename from beethoven/anhang_14-3.mid
rename to beethoven/anhang_14_3.mid
diff --git a/beethoven/piano_concerto_n5_op73_2-3mov_emperor.mid b/beethoven/piano_concerto_n5_op73_2_3mov_emperor.mid
similarity index 100%
rename from beethoven/piano_concerto_n5_op73_2-3mov_emperor.mid
rename to beethoven/piano_concerto_n5_op73_2_3mov_emperor.mid
diff --git a/beethoven/piano_concerto_no5mov1.mid b/beethoven/piano_concerto_no5_mov_1.mid
similarity index 100%
rename from beethoven/piano_concerto_no5mov1.mid
rename to beethoven/piano_concerto_no5_mov_1.mid
diff --git a/beethoven/piano_concerto_no5mov3.mid b/beethoven/piano_concerto_no5_mov_3.mid
similarity index 100%
rename from beethoven/piano_concerto_no5mov3.mid
rename to beethoven/piano_concerto_no5_mov_3.mid
diff --git a/beethoven/piano_sonata_no_28_in_b_flat-hammerklavier-op106_2nd_mov_scherzo.mid b/beethoven/piano_sonata_no_28_in_b_flat_hammerklavier_op106_2nd_mov_scherzo.mid
similarity index 100%
rename from beethoven/piano_sonata_no_28_in_b_flat-hammerklavier-op106_2nd_mov_scherzo.mid
rename to beethoven/piano_sonata_no_28_in_b_flat_hammerklavier_op106_2nd_mov_scherzo.mid
diff --git a/beethoven/sonata_opus81a-les_adieux-e_flat_no1.mid b/beethoven/sonata_opus81a_les_adieux_e_flat_no1.mid
similarity index 100%
rename from beethoven/sonata_opus81a-les_adieux-e_flat_no1.mid
rename to beethoven/sonata_opus81a_les_adieux_e_flat_no1.mid
diff --git a/beethoven/sonata_opus81a-les_adieux-e_flat_no2_3.mid b/beethoven/sonata_opus81a_les_adieux_e_flat_no2_3.mid
similarity index 100%
rename from beethoven/sonata_opus81a-les_adieux-e_flat_no2_3.mid
rename to beethoven/sonata_opus81a_les_adieux_e_flat_no2_3.mid
diff --git a/beethoven/symphonies/symphony_n5_op67_3-4mov.mid b/beethoven/symphonies/symphony_n5_op67_3_4mov.mid
similarity index 100%
rename from beethoven/symphonies/symphony_n5_op67_3-4mov.mid
rename to beethoven/symphonies/symphony_n5_op67_3_4mov.mid
diff --git a/beethoven/violin_concerto_op61_2-3movs.mid b/beethoven/violin_concerto_op61_2_3movs.mid
similarity index 100%
rename from beethoven/violin_concerto_op61_2-3movs.mid
rename to beethoven/violin_concerto_op61_2_3movs.mid
diff --git a/beethoven/woo051_sonatina_1-2_movs.mid b/beethoven/woo051_sonatina_1_2_movs.mid
similarity index 100%
rename from beethoven/woo051_sonatina_1-2_movs.mid
rename to beethoven/woo051_sonatina_1_2_movs.mid
diff --git a/busoni/sonatina_no_6_kammer-fantasie_lber_bizets_carmen.mid b/busoni/sonatina_no_6_kammer_fantasie_lber_bizets_carmen.mid
similarity index 100%
rename from busoni/sonatina_no_6_kammer-fantasie_lber_bizets_carmen.mid
rename to busoni/sonatina_no_6_kammer_fantasie_lber_bizets_carmen.mid
diff --git a/busoni/sonatina_no_6_kammerfantasie_lber_bizets_carmen.mid b/busoni/sonatina_no_6_kammerfantasie_lber_bizets_carmen.mid
new file mode 100644
index 0000000000000000000000000000000000000000..eaf0ee27c9835592a6c13e44a28595263feeb846
Binary files /dev/null and b/busoni/sonatina_no_6_kammerfantasie_lber_bizets_carmen.mid differ
diff --git a/chopin/etude_no7_in_c_major_opus10_no7.mid b/chopin/etude_no7_in_c_major_opus_10_no_7.mid
similarity index 100%
rename from chopin/etude_no7_in_c_major_opus10_no7.mid
rename to chopin/etude_no7_in_c_major_opus_10_no_7.mid
diff --git a/chopin/etude_op_10-5_black_keys.mid b/chopin/etude_op_10_5_black_keys.mid
similarity index 100%
rename from chopin/etude_op_10-5_black_keys.mid
rename to chopin/etude_op_10_5_black_keys.mid
diff --git a/chopin/nocturne_no15_in_f_minor_opus55-1.mid b/chopin/nocturne_no15_in_f_minor_opus55_1.mid
similarity index 100%
rename from chopin/nocturne_no15_in_f_minor_opus55-1.mid
rename to chopin/nocturne_no15_in_f_minor_opus55_1.mid
diff --git a/chopin/nocturne_no1_opus62.mid b/chopin/nocturne_no1_opus_62.mid
similarity index 100%
rename from chopin/nocturne_no1_opus62.mid
rename to chopin/nocturne_no1_opus_62.mid
diff --git a/chopin/polonaise_opus40_no1_military.mid b/chopin/polonaise_opus_40_no1_military.mid
similarity index 100%
rename from chopin/polonaise_opus40_no1_military.mid
rename to chopin/polonaise_opus_40_no1_military.mid
diff --git a/chopin/prelude_op28-15_raindrop.mid b/chopin/prelude_op28_15_raindrop.mid
similarity index 100%
rename from chopin/prelude_op28-15_raindrop.mid
rename to chopin/prelude_op28_15_raindrop.mid
diff --git a/chopin/scherzo_no2_opus31.mid b/chopin/scherzo_no2_opus_31.mid
similarity index 100%
rename from chopin/scherzo_no2_opus31.mid
rename to chopin/scherzo_no2_opus_31.mid
diff --git a/chopin/waltz_in_ab_opposth_brown21.mid b/chopin/waltz_in_ab_opposth_brown_21.mid
similarity index 100%
rename from chopin/waltz_in_ab_opposth_brown21.mid
rename to chopin/waltz_in_ab_opposth_brown_21.mid
diff --git a/clementi/duettino_in_c_no1-allegro.mid b/clementi/duettino_in_c_no1_allegro.mid
similarity index 100%
rename from clementi/duettino_in_c_no1-allegro.mid
rename to clementi/duettino_in_c_no1_allegro.mid
diff --git a/clementi/duettino_in_c_no1allegro.mid b/clementi/duettino_in_c_no1allegro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..182be72bbe7ee26790d8e8aab890601fb42831c1
Binary files /dev/null and b/clementi/duettino_in_c_no1allegro.mid differ
diff --git a/copland/symphony_no3_mov1.mid b/copland/symphony_no3_mov_1.mid
similarity index 100%
rename from copland/symphony_no3_mov1.mid
rename to copland/symphony_no3_mov_1.mid
diff --git a/copland/the_promise_of_living-from_the_tender_land.mid b/copland/the_promise_of_living_from_the_tender_land.mid
similarity index 100%
rename from copland/the_promise_of_living-from_the_tender_land.mid
rename to copland/the_promise_of_living_from_the_tender_land.mid
diff --git a/copland/the_promise_of_livingfrom_the_tender_land.mid b/copland/the_promise_of_livingfrom_the_tender_land.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c19dae3f4adb59f70532d558fb4217a53bcc792d
Binary files /dev/null and b/copland/the_promise_of_livingfrom_the_tender_land.mid differ
diff --git a/cpe_bach/cpe_bach-solfeggieto.mid b/cpe_bach/cpe_bach_solfeggieto.mid
similarity index 100%
rename from cpe_bach/cpe_bach-solfeggieto.mid
rename to cpe_bach/cpe_bach_solfeggieto.mid
diff --git a/cpe_bach/cpe_bachsolfeggieto.mid b/cpe_bach/cpe_bachsolfeggieto.mid
new file mode 100644
index 0000000000000000000000000000000000000000..586eb63722d307f8b3c51c6d556edad88a81ec69
Binary files /dev/null and b/cpe_bach/cpe_bachsolfeggieto.mid differ
diff --git a/dvorak/let_me_be_alone_at_the_brook_opus82.mid b/dvorak/let_me_be_alone_at_the_brook_opus_82.mid
similarity index 100%
rename from dvorak/let_me_be_alone_at_the_brook_opus82.mid
rename to dvorak/let_me_be_alone_at_the_brook_opus_82.mid
diff --git a/franck/sonata_in_a_major_mov4.mid b/franck/sonata_in_a_major_mov_4.mid
similarity index 100%
rename from franck/sonata_in_a_major_mov4.mid
rename to franck/sonata_in_a_major_mov_4.mid
diff --git a/frescobaldi/fr-md_w.mid b/frescobaldi/fr_md_w.mid
similarity index 100%
rename from frescobaldi/fr-md_w.mid
rename to frescobaldi/fr_md_w.mid
diff --git a/frescobaldi/frmd_w.mid b/frescobaldi/frmd_w.mid
new file mode 100644
index 0000000000000000000000000000000000000000..311164619b2cfe2fd0b2df66344d7a3dcc97fc70
Binary files /dev/null and b/frescobaldi/frmd_w.mid differ
diff --git a/ganne/la_czarine-mazurka.mid b/ganne/la_czarine_mazurka.mid
similarity index 100%
rename from ganne/la_czarine-mazurka.mid
rename to ganne/la_czarine_mazurka.mid
diff --git a/german/duet_joy-brook.mid b/german/duet_joy_brook.mid
similarity index 100%
rename from german/duet_joy-brook.mid
rename to german/duet_joy_brook.mid
diff --git a/german/duet_joybrook.mid b/german/duet_joybrook.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4ac8bcbfd0e7649883e56c188ebf5427cee89085
Binary files /dev/null and b/german/duet_joybrook.mid differ
diff --git a/german/trio-nell_puck_jelf.mid b/german/trio_nell_puck_jelf.mid
similarity index 100%
rename from german/trio-nell_puck_jelf.mid
rename to german/trio_nell_puck_jelf.mid
diff --git a/german/trionell_puck_jelf.mid b/german/trionell_puck_jelf.mid
new file mode 100644
index 0000000000000000000000000000000000000000..00fb7ed3fc7bbfc9f412d0962d80dee8b0dae001
Binary files /dev/null and b/german/trionell_puck_jelf.mid differ
diff --git a/ginastera/piano_sonata_no1_mov1.mid b/ginastera/piano_sonata_no1_mov_1.mid
similarity index 100%
rename from ginastera/piano_sonata_no1_mov1.mid
rename to ginastera/piano_sonata_no1_mov_1.mid
diff --git a/ginastera/piano_sonata_no1_mov2.mid b/ginastera/piano_sonata_no1_mov_2.mid
similarity index 100%
rename from ginastera/piano_sonata_no1_mov2.mid
rename to ginastera/piano_sonata_no1_mov_2.mid
diff --git a/ginastera/piano_sonata_no1_mov4.mid b/ginastera/piano_sonata_no1_mov_4.mid
similarity index 100%
rename from ginastera/piano_sonata_no1_mov4.mid
rename to ginastera/piano_sonata_no1_mov_4.mid
diff --git a/grieg/bell-ringing.mid b/grieg/bell_ringing.mid
similarity index 100%
rename from grieg/bell-ringing.mid
rename to grieg/bell_ringing.mid
diff --git a/grieg/piano_concerto_in_a_opus16mov2.mid b/grieg/piano_concerto_in_a_opus_16_mov_2.mid
similarity index 100%
rename from grieg/piano_concerto_in_a_opus16mov2.mid
rename to grieg/piano_concerto_in_a_opus_16_mov_2.mid
diff --git a/haendel/concerto_grosso_op_n8_1-2mov.mid b/haendel/concerto_grosso_op_n8_1_2mov.mid
similarity index 100%
rename from haendel/concerto_grosso_op_n8_1-2mov.mid
rename to haendel/concerto_grosso_op_n8_1_2mov.mid
diff --git a/haendel/harpsichord_suite_hwv434_2-3-4-5-6movs.mid b/haendel/harpsichord_suite_hwv434_2_3_4_5_6movs.mid
similarity index 100%
rename from haendel/harpsichord_suite_hwv434_2-3-4-5-6movs.mid
rename to haendel/harpsichord_suite_hwv434_2_3_4_5_6movs.mid
diff --git a/haendel/harpsichord_suite_in_g_hwv432_4-5movs.mid b/haendel/harpsichord_suite_in_g_hwv432_4_5movs.mid
similarity index 100%
rename from haendel/harpsichord_suite_in_g_hwv432_4-5movs.mid
rename to haendel/harpsichord_suite_in_g_hwv432_4_5movs.mid
diff --git a/haendel/hwv063_judas_maccabeus_09-10_aria_chorus.mid b/haendel/hwv063_judas_maccabeus_09_10_aria_chorus.mid
similarity index 100%
rename from haendel/hwv063_judas_maccabeus_09-10_aria_chorus.mid
rename to haendel/hwv063_judas_maccabeus_09_10_aria_chorus.mid
diff --git a/haendel/hwv063_judas_maccabeus_30-31_duet_chorus.mid b/haendel/hwv063_judas_maccabeus_30_31_duet_chorus.mid
similarity index 100%
rename from haendel/hwv063_judas_maccabeus_30-31_duet_chorus.mid
rename to haendel/hwv063_judas_maccabeus_30_31_duet_chorus.mid
diff --git a/haendel/hwv063_judas_maccabeus_38-39_aria_chorus.mid b/haendel/hwv063_judas_maccabeus_38_39_aria_chorus.mid
similarity index 100%
rename from haendel/hwv063_judas_maccabeus_38-39_aria_chorus.mid
rename to haendel/hwv063_judas_maccabeus_38_39_aria_chorus.mid
diff --git a/haendel/trio_sonata_2-3movs.mid b/haendel/trio_sonata_2_3movs.mid
similarity index 100%
rename from haendel/trio_sonata_2-3movs.mid
rename to haendel/trio_sonata_2_3movs.mid
diff --git a/heidrich/auf_der_see_fur_harmonium_und_klavier_op_212.mid b/heidrich/auf_der_see_fur_harmonium_und_klavier_op_21_2.mid
similarity index 100%
rename from heidrich/auf_der_see_fur_harmonium_und_klavier_op_212.mid
rename to heidrich/auf_der_see_fur_harmonium_und_klavier_op_21_2.mid
diff --git a/holst/song_without_words-ill_love_my_love.mid b/holst/song_without_words_ill_love_my_love.mid
similarity index 100%
rename from holst/song_without_words-ill_love_my_love.mid
rename to holst/song_without_words_ill_love_my_love.mid
diff --git a/holst/song_without_wordsill_love_my_love.mid b/holst/song_without_wordsill_love_my_love.mid
new file mode 100644
index 0000000000000000000000000000000000000000..afdda64207b3bb243bcd75fcf38e9dc4aab35cc1
Binary files /dev/null and b/holst/song_without_wordsill_love_my_love.mid differ
diff --git a/hummel/la_galante_rondo_brillant_opus120.mid b/hummel/la_galante_rondo_brillant_opus_120.mid
similarity index 100%
rename from hummel/la_galante_rondo_brillant_opus120.mid
rename to hummel/la_galante_rondo_brillant_opus_120.mid
diff --git a/hummel/piano_sonata_in_f_sharp_opus81_mov2.mid b/hummel/piano_sonata_in_f_sharp_opus_81_mov_2.mid
similarity index 100%
rename from hummel/piano_sonata_in_f_sharp_opus81_mov2.mid
rename to hummel/piano_sonata_in_f_sharp_opus_81_mov_2.mid
diff --git a/hummel/piano_sonata_opus1_mov1.mid b/hummel/piano_sonata_opus_1_mov_1.mid
similarity index 100%
rename from hummel/piano_sonata_opus1_mov1.mid
rename to hummel/piano_sonata_opus_1_mov_1.mid
diff --git a/hummel/piano_sonata_opus1_mov2.mid b/hummel/piano_sonata_opus_1_mov_2.mid
similarity index 100%
rename from hummel/piano_sonata_opus1_mov2.mid
rename to hummel/piano_sonata_opus_1_mov_2.mid
diff --git a/hummel/piano_sonata_opus1_mov3.mid b/hummel/piano_sonata_opus_1_mov_3.mid
similarity index 100%
rename from hummel/piano_sonata_opus1_mov3.mid
rename to hummel/piano_sonata_opus_1_mov_3.mid
diff --git a/hummel/piano_sonata_opus94.mid b/hummel/piano_sonata_opus_94.mid
similarity index 100%
rename from hummel/piano_sonata_opus94.mid
rename to hummel/piano_sonata_opus_94.mid
diff --git a/hummel/piano_sonata_opus95.mid b/hummel/piano_sonata_opus_95.mid
similarity index 100%
rename from hummel/piano_sonata_opus95.mid
rename to hummel/piano_sonata_opus_95.mid
diff --git a/hummel/rondo_opus11.mid b/hummel/rondo_opus_11.mid
similarity index 100%
rename from hummel/rondo_opus11.mid
rename to hummel/rondo_opus_11.mid
diff --git a/jensen/hungarian_melody_piano_pieces-songs_dances-opus_33_no13.mid b/jensen/hungarian_melody_piano_pieces_songs_dances_opus_33_no13.mid
similarity index 100%
rename from jensen/hungarian_melody_piano_pieces-songs_dances-opus_33_no13.mid
rename to jensen/hungarian_melody_piano_pieces_songs_dances_opus_33_no13.mid
diff --git a/jensen/hungarian_melody_piano_piecessongs_dancesopus_33_no13.mid b/jensen/hungarian_melody_piano_piecessongs_dancesopus_33_no13.mid
new file mode 100644
index 0000000000000000000000000000000000000000..554fa716a1f805c962e05e1448025ac109eaa853
Binary files /dev/null and b/jensen/hungarian_melody_piano_piecessongs_dancesopus_33_no13.mid differ
diff --git a/jensen/minuet_piano_pieces-songs_dances-opus_33_no11.mid b/jensen/minuet_piano_pieces_songs_dances_opus_33_no11.mid
similarity index 100%
rename from jensen/minuet_piano_pieces-songs_dances-opus_33_no11.mid
rename to jensen/minuet_piano_pieces_songs_dances_opus_33_no11.mid
diff --git a/jensen/minuet_piano_piecessongs_dancesopus_33_no11.mid b/jensen/minuet_piano_piecessongs_dancesopus_33_no11.mid
new file mode 100644
index 0000000000000000000000000000000000000000..7ab719f9592b600c30c50b76eae48abc460d295d
Binary files /dev/null and b/jensen/minuet_piano_piecessongs_dancesopus_33_no11.mid differ
diff --git a/joplin/cleopha_march_and_two-step.mid b/joplin/cleopha_march_and_two_step.mid
similarity index 100%
rename from joplin/cleopha_march_and_two-step.mid
rename to joplin/cleopha_march_and_two_step.mid
diff --git a/joplin/cleopha_march_and_twostep.mid b/joplin/cleopha_march_and_twostep.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a1e3c3023ac9e6aff42ddd2919882066902025df
Binary files /dev/null and b/joplin/cleopha_march_and_twostep.mid differ
diff --git a/joplin/the_chrysanthemum-an_afro-american_intermezzo.mid b/joplin/the_chrysanthemum_an_afro_american_intermezzo.mid
similarity index 100%
rename from joplin/the_chrysanthemum-an_afro-american_intermezzo.mid
rename to joplin/the_chrysanthemum_an_afro_american_intermezzo.mid
diff --git a/joplin/the_chrysanthemuman_afroamerican_intermezzo.mid b/joplin/the_chrysanthemuman_afroamerican_intermezzo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..bde423445aae2ddd1c03c820e3aad4f24126f8c8
Binary files /dev/null and b/joplin/the_chrysanthemuman_afroamerican_intermezzo.mid differ
diff --git a/kuhlau/sonatina_in_g_major-op_20_no_1.mid b/kuhlau/sonatina_in_g_major_op_20_no_1.mid
similarity index 100%
rename from kuhlau/sonatina_in_g_major-op_20_no_1.mid
rename to kuhlau/sonatina_in_g_major_op_20_no_1.mid
diff --git a/kuhlau/sonatina_in_g_major-op_20_no_2.mid b/kuhlau/sonatina_in_g_major_op_20_no_2.mid
similarity index 100%
rename from kuhlau/sonatina_in_g_major-op_20_no_2.mid
rename to kuhlau/sonatina_in_g_major_op_20_no_2.mid
diff --git a/kuhlau/sonatina-opus55-no1.mid b/kuhlau/sonatina_opus55_no1.mid
similarity index 100%
rename from kuhlau/sonatina-opus55-no1.mid
rename to kuhlau/sonatina_opus55_no1.mid
diff --git a/lange/blumenlied_opus39.mid b/lange/blumenlied_opus_39.mid
similarity index 100%
rename from lange/blumenlied_opus39.mid
rename to lange/blumenlied_opus_39.mid
diff --git a/laurent/granada-fandango.mid b/laurent/granada_fandango.mid
similarity index 100%
rename from laurent/granada-fandango.mid
rename to laurent/granada_fandango.mid
diff --git a/lemire/colmar-functioning.mid b/lemire/colmar_functioning.mid
similarity index 100%
rename from lemire/colmar-functioning.mid
rename to lemire/colmar_functioning.mid
diff --git a/lemire/riri-hammer.mid b/lemire/riri_hammer.mid
similarity index 100%
rename from lemire/riri-hammer.mid
rename to lemire/riri_hammer.mid
diff --git a/liszt/chubert-liszt_serenade.mid b/liszt/chubert_liszt_serenade.mid
similarity index 100%
rename from liszt/chubert-liszt_serenade.mid
rename to liszt/chubert_liszt_serenade.mid
diff --git a/liszt/chubertliszt_serenade.mid b/liszt/chubertliszt_serenade.mid
new file mode 100644
index 0000000000000000000000000000000000000000..1d867bd670e74464bf48fa1fdb555f9259fee603
Binary files /dev/null and b/liszt/chubertliszt_serenade.mid differ
diff --git a/liszt/erlkonig-the_witch_king_by_franz_schubert.mid b/liszt/erlkonig_the_witch_king_by_franz_schubert.mid
similarity index 100%
rename from liszt/erlkonig-the_witch_king_by_franz_schubert.mid
rename to liszt/erlkonig_the_witch_king_by_franz_schubert.mid
diff --git a/liszt/erlkonigthe_witch_king_by_franz_schubert.mid b/liszt/erlkonigthe_witch_king_by_franz_schubert.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e819d9ce3c86d7a7a16e141272f64fbb02ddb001
Binary files /dev/null and b/liszt/erlkonigthe_witch_king_by_franz_schubert.mid differ
diff --git a/liszt/liszt_ab_irato-the_perfect_etude-s143_r4b.mid b/liszt/liszt_ab_irato_the_perfect_etude_s143_r4b.mid
similarity index 100%
rename from liszt/liszt_ab_irato-the_perfect_etude-s143_r4b.mid
rename to liszt/liszt_ab_irato_the_perfect_etude_s143_r4b.mid
diff --git a/liszt/liszt_ab_iratothe_perfect_etudes143_r4b.mid b/liszt/liszt_ab_iratothe_perfect_etudes143_r4b.mid
new file mode 100644
index 0000000000000000000000000000000000000000..49914b44b6eeb244c0aca3198d22a3309bd4f06b
Binary files /dev/null and b/liszt/liszt_ab_iratothe_perfect_etudes143_r4b.mid differ
diff --git a/liszt/mephisto_waltz_mov1.mid b/liszt/mephisto_waltz_mov_1.mid
similarity index 100%
rename from liszt/mephisto_waltz_mov1.mid
rename to liszt/mephisto_waltz_mov_1.mid
diff --git a/liszt/mephisto_waltz_mov2.mid b/liszt/mephisto_waltz_mov_2.mid
similarity index 100%
rename from liszt/mephisto_waltz_mov2.mid
rename to liszt/mephisto_waltz_mov_2.mid
diff --git a/liszt/mephisto_waltz_mov3.mid b/liszt/mephisto_waltz_mov_3.mid
similarity index 100%
rename from liszt/mephisto_waltz_mov3.mid
rename to liszt/mephisto_waltz_mov_3.mid
diff --git a/mendelsonn/allegro_brillant_for_piano_4-hands_op92.mid b/mendelsonn/allegro_brillant_for_piano_4_hands_op92.mid
similarity index 100%
rename from mendelsonn/allegro_brillant_for_piano_4-hands_op92.mid
rename to mendelsonn/allegro_brillant_for_piano_4_hands_op92.mid
diff --git a/mendelsonn/allegro_brillant_for_piano_4hands_op92.mid b/mendelsonn/allegro_brillant_for_piano_4hands_op92.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4ccccea3d7c5c96b2b04eed482be228b55b47b2a
Binary files /dev/null and b/mendelsonn/allegro_brillant_for_piano_4hands_op92.mid differ
diff --git a/mendelssohn/kinderstuck_opus72_no1.mid b/mendelssohn/kinderstuck_opus_72_no_1.mid
similarity index 100%
rename from mendelssohn/kinderstuck_opus72_no1.mid
rename to mendelssohn/kinderstuck_opus_72_no_1.mid
diff --git a/mendelssohn/kinderstuck_opus72_no2.mid b/mendelssohn/kinderstuck_opus_72_no_2.mid
similarity index 100%
rename from mendelssohn/kinderstuck_opus72_no2.mid
rename to mendelssohn/kinderstuck_opus_72_no_2.mid
diff --git a/mendelssohn/kinderstuck_opus72_no6.mid b/mendelssohn/kinderstuck_opus_72_no_6.mid
similarity index 100%
rename from mendelssohn/kinderstuck_opus72_no6.mid
rename to mendelssohn/kinderstuck_opus_72_no_6.mid
diff --git a/mendelssohn/one_of_the_songs_without_words-the_bees_wedding.mid b/mendelssohn/one_of_the_songs_without_words_the_bees_wedding.mid
similarity index 100%
rename from mendelssohn/one_of_the_songs_without_words-the_bees_wedding.mid
rename to mendelssohn/one_of_the_songs_without_words_the_bees_wedding.mid
diff --git a/mendelssohn/one_of_the_songs_without_wordsthe_bees_wedding.mid b/mendelssohn/one_of_the_songs_without_wordsthe_bees_wedding.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0eab9a183020a750a80d782377810c92def6941d
Binary files /dev/null and b/mendelssohn/one_of_the_songs_without_wordsthe_bees_wedding.mid differ
diff --git a/mendelssohn/song_without_words_opus67_no2_and_no32.mid b/mendelssohn/song_without_words_opus_67_no_2_and_no_32.mid
similarity index 100%
rename from mendelssohn/song_without_words_opus67_no2_and_no32.mid
rename to mendelssohn/song_without_words_opus_67_no_2_and_no_32.mid
diff --git a/moszkowski/pres_du_berceau_opus58.mid b/moszkowski/pres_du_berceau_opus_58.mid
similarity index 100%
rename from moszkowski/pres_du_berceau_opus58.mid
rename to moszkowski/pres_du_berceau_opus_58.mid
diff --git a/mozart/a_piece_for_pianok176.mid b/mozart/a_piece_for_piano_k176.mid
similarity index 100%
rename from mozart/a_piece_for_pianok176.mid
rename to mozart/a_piece_for_piano_k176.mid
diff --git a/mozart/another_piece_for_pianok176.mid b/mozart/another_piece_for_piano_k176.mid
similarity index 100%
rename from mozart/another_piece_for_pianok176.mid
rename to mozart/another_piece_for_piano_k176.mid
diff --git a/mozart/piano_sonatas/piano_sonata_n15_k593-494.mid b/mozart/piano_sonatas/piano_sonata_n15_k593494.mid
similarity index 100%
rename from mozart/piano_sonatas/piano_sonata_n15_k593-494.mid
rename to mozart/piano_sonatas/piano_sonata_n15_k593494.mid
diff --git a/mozart/piano_sonatas/piano_sonata_n15_k593_494.mid b/mozart/piano_sonatas/piano_sonata_n15_k593_494.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2773c189dfaa1398de55bea2848f7c200a4dda8c
Binary files /dev/null and b/mozart/piano_sonatas/piano_sonata_n15_k593_494.mid differ
diff --git a/mussorgski/the_complete_piano_version_of-pictures_at_an_exhibition.mid b/mussorgski/the_complete_piano_version_of_pictures_at_an_exhibition.mid
similarity index 100%
rename from mussorgski/the_complete_piano_version_of-pictures_at_an_exhibition.mid
rename to mussorgski/the_complete_piano_version_of_pictures_at_an_exhibition.mid
diff --git a/poulenc/alerte-mouvments_perpetuels_iii.mid b/poulenc/alerte_mouvments_perpetuels_iii.mid
similarity index 100%
rename from poulenc/alerte-mouvments_perpetuels_iii.mid
rename to poulenc/alerte_mouvments_perpetuels_iii.mid
diff --git a/poulenc/alertemouvments_perpetuels_iii.mid b/poulenc/alertemouvments_perpetuels_iii.mid
new file mode 100644
index 0000000000000000000000000000000000000000..aa25c8b081a57eb5cf4c432bd616326257f4c089
Binary files /dev/null and b/poulenc/alertemouvments_perpetuels_iii.mid differ
diff --git a/poulenc/from-chansons_villegeoiges-le_retour_du_sergeant.mid b/poulenc/from_chansons_villegeoiges_le_retour_du_sergeant.mid
similarity index 100%
rename from poulenc/from-chansons_villegeoiges-le_retour_du_sergeant.mid
rename to poulenc/from_chansons_villegeoiges_le_retour_du_sergeant.mid
diff --git a/poulenc/fromchansons_villegeoigesle_retour_du_sergeant.mid b/poulenc/fromchansons_villegeoigesle_retour_du_sergeant.mid
new file mode 100644
index 0000000000000000000000000000000000000000..96fbf5f4a47743ed359b9859c423e5400902db94
Binary files /dev/null and b/poulenc/fromchansons_villegeoigesle_retour_du_sergeant.mid differ
diff --git a/poulenc/pastorale-trois_pieces_i.mid b/poulenc/pastorale_trois_pieces_i.mid
similarity index 100%
rename from poulenc/pastorale-trois_pieces_i.mid
rename to poulenc/pastorale_trois_pieces_i.mid
diff --git a/poulenc/pastoraletrois_pieces_i.mid b/poulenc/pastoraletrois_pieces_i.mid
new file mode 100644
index 0000000000000000000000000000000000000000..880755c4c514208fb052e7d7c6bf2a3a26d788c4
Binary files /dev/null and b/poulenc/pastoraletrois_pieces_i.mid differ
diff --git a/poulenc/tres_modere-mouvments_perpetuels_ii.mid b/poulenc/tres_modere_mouvments_perpetuels_ii.mid
similarity index 100%
rename from poulenc/tres_modere-mouvments_perpetuels_ii.mid
rename to poulenc/tres_modere_mouvments_perpetuels_ii.mid
diff --git a/poulenc/tres_moderemouvments_perpetuels_ii.mid b/poulenc/tres_moderemouvments_perpetuels_ii.mid
new file mode 100644
index 0000000000000000000000000000000000000000..73157edb053b28f6c1575b61c898e3d96057a195
Binary files /dev/null and b/poulenc/tres_moderemouvments_perpetuels_ii.mid differ
diff --git a/rachmaninov/prelude_in_c_sharp_minor-morceaux_de_fantasie.mid b/rachmaninov/prelude_in_c_sharp_minor_morceaux_de_fantasie.mid
similarity index 100%
rename from rachmaninov/prelude_in_c_sharp_minor-morceaux_de_fantasie.mid
rename to rachmaninov/prelude_in_c_sharp_minor_morceaux_de_fantasie.mid
diff --git a/rachmaninov/prelude_in_c_sharp_minormorceaux_de_fantasie.mid b/rachmaninov/prelude_in_c_sharp_minormorceaux_de_fantasie.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5b22daeed85e847552fd99d3ef1aad325a8b93d3
Binary files /dev/null and b/rachmaninov/prelude_in_c_sharp_minormorceaux_de_fantasie.mid differ
diff --git a/rachmaninov/prelude_opus32_no11_in_b.mid b/rachmaninov/prelude_opus_32_no_11_in_b.mid
similarity index 100%
rename from rachmaninov/prelude_opus32_no11_in_b.mid
rename to rachmaninov/prelude_opus_32_no_11_in_b.mid
diff --git a/rachmaninov/rach2-1.mid b/rachmaninov/rach21.mid
similarity index 100%
rename from rachmaninov/rach2-1.mid
rename to rachmaninov/rach21.mid
diff --git a/rachmaninov/rach2-2.mid b/rachmaninov/rach22.mid
similarity index 100%
rename from rachmaninov/rach2-2.mid
rename to rachmaninov/rach22.mid
diff --git a/rachmaninov/rach2-3.mid b/rachmaninov/rach23.mid
similarity index 100%
rename from rachmaninov/rach2-3.mid
rename to rachmaninov/rach23.mid
diff --git a/rachmaninov/rach2_1.mid b/rachmaninov/rach2_1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3384b52b661a24129658db5021b5b8164936aaa7
Binary files /dev/null and b/rachmaninov/rach2_1.mid differ
diff --git a/rachmaninov/rach2_2.mid b/rachmaninov/rach2_2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..89687e98e877f12b934dbc0d412b6c79d02d3377
Binary files /dev/null and b/rachmaninov/rach2_2.mid differ
diff --git a/rachmaninov/rach2_3.mid b/rachmaninov/rach2_3.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2d79d0f17ded3b6db2d7ea8af5a4571cf9762d59
Binary files /dev/null and b/rachmaninov/rach2_3.mid differ
diff --git a/rachmaninov/rachconc1-3.mid b/rachmaninov/rachconc13.mid
similarity index 100%
rename from rachmaninov/rachconc1-3.mid
rename to rachmaninov/rachconc13.mid
diff --git a/rachmaninov/rachconc1_3.mid b/rachmaninov/rachconc1_3.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5e09b5d6982529abab261eadefc36442e347a572
Binary files /dev/null and b/rachmaninov/rachconc1_3.mid differ
diff --git a/ravel/327la-1.mid b/ravel/327la_1.mid
similarity index 100%
rename from ravel/327la-1.mid
rename to ravel/327la_1.mid
diff --git a/schubert/49d960-4.mid b/schubert/49d9604.mid
similarity index 100%
rename from schubert/49d960-4.mid
rename to schubert/49d9604.mid
diff --git a/schubert/49d960_4.mid b/schubert/49d960_4.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6936b910df478c040df70908d301f256e05e90bb
Binary files /dev/null and b/schubert/49d960_4.mid differ
diff --git a/schubert/moments_musicaux_opus_94_mov1.mid b/schubert/moments_musicaux_opus_94_mov_1.mid
similarity index 100%
rename from schubert/moments_musicaux_opus_94_mov1.mid
rename to schubert/moments_musicaux_opus_94_mov_1.mid
diff --git a/schubert/moments_musicaux_opus_94_mov2.mid b/schubert/moments_musicaux_opus_94_mov_2.mid
similarity index 100%
rename from schubert/moments_musicaux_opus_94_mov2.mid
rename to schubert/moments_musicaux_opus_94_mov_2.mid
diff --git a/schubert/moments_musicaux_opus_94_mov3.mid b/schubert/moments_musicaux_opus_94_mov_3.mid
similarity index 100%
rename from schubert/moments_musicaux_opus_94_mov3.mid
rename to schubert/moments_musicaux_opus_94_mov_3.mid
diff --git a/schubert/moments_musicaux_opus_94_mov4.mid b/schubert/moments_musicaux_opus_94_mov_4.mid
similarity index 100%
rename from schubert/moments_musicaux_opus_94_mov4.mid
rename to schubert/moments_musicaux_opus_94_mov_4.mid
diff --git a/schubert/moments_musicaux_opus_94_mov5.mid b/schubert/moments_musicaux_opus_94_mov_5.mid
similarity index 100%
rename from schubert/moments_musicaux_opus_94_mov5.mid
rename to schubert/moments_musicaux_opus_94_mov_5.mid
diff --git a/schubert/piano_sonata_in_a_no1_d959-allegro.mid b/schubert/piano_sonata_in_a_no1_d959_allegro.mid
similarity index 100%
rename from schubert/piano_sonata_in_a_no1_d959-allegro.mid
rename to schubert/piano_sonata_in_a_no1_d959_allegro.mid
diff --git a/schubert/piano_sonata_in_a_no2_d959-andantinomid.mid b/schubert/piano_sonata_in_a_no2_d959_andantinomid.mid
similarity index 100%
rename from schubert/piano_sonata_in_a_no2_d959-andantinomid.mid
rename to schubert/piano_sonata_in_a_no2_d959_andantinomid.mid
diff --git a/schubert/piano_sonata_in_a_no4_d959-rondo-allegretto.mid b/schubert/piano_sonata_in_a_no4_d959_rondo_allegretto.mid
similarity index 100%
rename from schubert/piano_sonata_in_a_no4_d959-rondo-allegretto.mid
rename to schubert/piano_sonata_in_a_no4_d959_rondo_allegretto.mid
diff --git a/schubert/piano_sonata_in_b_flat_no1_d960-molto_moderato.mid b/schubert/piano_sonata_in_b_flat_no1_d960_molto_moderato.mid
similarity index 100%
rename from schubert/piano_sonata_in_b_flat_no1_d960-molto_moderato.mid
rename to schubert/piano_sonata_in_b_flat_no1_d960_molto_moderato.mid
diff --git a/schubert/piano_sonata_in_b_flat_no1_d960-scherzo-allegro_vivace_con.mid b/schubert/piano_sonata_in_b_flat_no1_d960_scherzo_allegro_vivace_con.mid
similarity index 100%
rename from schubert/piano_sonata_in_b_flat_no1_d960-scherzo-allegro_vivace_con.mid
rename to schubert/piano_sonata_in_b_flat_no1_d960_scherzo_allegro_vivace_con.mid
diff --git a/schubert/piano_sonata_in_b_flat_no1_d960molto_moderato.mid b/schubert/piano_sonata_in_b_flat_no1_d960molto_moderato.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e1421957780317b579f8a4931b66a59b75895e33
Binary files /dev/null and b/schubert/piano_sonata_in_b_flat_no1_d960molto_moderato.mid differ
diff --git a/schubert/piano_sonata_in_b_flat_no1_d960scherzoallegro_vivace_con.mid b/schubert/piano_sonata_in_b_flat_no1_d960scherzoallegro_vivace_con.mid
new file mode 100644
index 0000000000000000000000000000000000000000..879259a8ea26e4a209e6e093c6f498056156b538
Binary files /dev/null and b/schubert/piano_sonata_in_b_flat_no1_d960scherzoallegro_vivace_con.mid differ
diff --git a/schubert/piano_sonata_in_c_minor_no1_d958-allegro.mid b/schubert/piano_sonata_in_c_minor_no1_d958_allegro.mid
similarity index 100%
rename from schubert/piano_sonata_in_c_minor_no1_d958-allegro.mid
rename to schubert/piano_sonata_in_c_minor_no1_d958_allegro.mid
diff --git a/schubert/piano_sonata_in_c_minor_no1_d958allegro.mid b/schubert/piano_sonata_in_c_minor_no1_d958allegro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..295c013508a7b3b8177db016d6ef2140ce30eb4d
Binary files /dev/null and b/schubert/piano_sonata_in_c_minor_no1_d958allegro.mid differ
diff --git a/schubert/piano_sonata_in_c_minor_no2_d958-adagio.mid b/schubert/piano_sonata_in_c_minor_no2_d958_adagio.mid
similarity index 100%
rename from schubert/piano_sonata_in_c_minor_no2_d958-adagio.mid
rename to schubert/piano_sonata_in_c_minor_no2_d958_adagio.mid
diff --git a/schubert/piano_sonata_in_c_minor_no2_d958adagio.mid b/schubert/piano_sonata_in_c_minor_no2_d958adagio.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0c4c0907d2237e336f1b97810b6a1aaa8819f101
Binary files /dev/null and b/schubert/piano_sonata_in_c_minor_no2_d958adagio.mid differ
diff --git a/schubert/piano_sonata_in_c_minor_no4_d958-tarantella-allegro.mid b/schubert/piano_sonata_in_c_minor_no4_d958_tarantella_allegro.mid
similarity index 100%
rename from schubert/piano_sonata_in_c_minor_no4_d958-tarantella-allegro.mid
rename to schubert/piano_sonata_in_c_minor_no4_d958_tarantella_allegro.mid
diff --git a/schubert/piano_sonata_in_c_minor_no4_d958tarantellaallegro.mid b/schubert/piano_sonata_in_c_minor_no4_d958tarantellaallegro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3c2a8db6fe1ea1206ecad3a394e5bd54f2e6ccd8
Binary files /dev/null and b/schubert/piano_sonata_in_c_minor_no4_d958tarantellaallegro.mid differ
diff --git a/schubert/piano_sonata_in_sonata_in_g_no1_d894-molto_moderato_e_cantabile.mid b/schubert/piano_sonata_in_sonata_in_g_no1_d894_molto_moderato_e_cantabile.mid
similarity index 100%
rename from schubert/piano_sonata_in_sonata_in_g_no1_d894-molto_moderato_e_cantabile.mid
rename to schubert/piano_sonata_in_sonata_in_g_no1_d894_molto_moderato_e_cantabile.mid
diff --git a/schubert/piano_sonata_in_sonata_in_g_no1_d894molto_moderato_e_cantabile.mid b/schubert/piano_sonata_in_sonata_in_g_no1_d894molto_moderato_e_cantabile.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a8632ab0219bc5c4ad077abb39e0f4021edab8da
Binary files /dev/null and b/schubert/piano_sonata_in_sonata_in_g_no1_d894molto_moderato_e_cantabile.mid differ
diff --git a/schubert/piano_sonata_in_sonata_in_g_no2_d894-molto_moderato_e_cantabile.mid b/schubert/piano_sonata_in_sonata_in_g_no2_d894_molto_moderato_e_cantabile.mid
similarity index 100%
rename from schubert/piano_sonata_in_sonata_in_g_no2_d894-molto_moderato_e_cantabile.mid
rename to schubert/piano_sonata_in_sonata_in_g_no2_d894_molto_moderato_e_cantabile.mid
diff --git a/schubert/piano_sonata_in_sonata_in_g_no3_d894-menuetto_allegro_moderato.mid b/schubert/piano_sonata_in_sonata_in_g_no3_d894_menuetto_allegro_moderato.mid
similarity index 100%
rename from schubert/piano_sonata_in_sonata_in_g_no3_d894-menuetto_allegro_moderato.mid
rename to schubert/piano_sonata_in_sonata_in_g_no3_d894_menuetto_allegro_moderato.mid
diff --git a/schubert/piano_sonata_in_sonata_in_g_no3_d894-rondo_allegretto.mid b/schubert/piano_sonata_in_sonata_in_g_no3_d894_rondo_allegretto.mid
similarity index 100%
rename from schubert/piano_sonata_in_sonata_in_g_no3_d894-rondo_allegretto.mid
rename to schubert/piano_sonata_in_sonata_in_g_no3_d894_rondo_allegretto.mid
diff --git a/schubert/piano_sonata_in_sonata_in_g_no3_d894menuetto_allegro_moderato.mid b/schubert/piano_sonata_in_sonata_in_g_no3_d894menuetto_allegro_moderato.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a55452a5b865be31391be8dad6fec8c6f8cca2c5
Binary files /dev/null and b/schubert/piano_sonata_in_sonata_in_g_no3_d894menuetto_allegro_moderato.mid differ
diff --git a/schubert/piano_sonata_in_sonata_in_g_no3_d894rondo_allegretto.mid b/schubert/piano_sonata_in_sonata_in_g_no3_d894rondo_allegretto.mid
new file mode 100644
index 0000000000000000000000000000000000000000..27abdc45d365ad16833eceaf98c70705ec25f0d5
Binary files /dev/null and b/schubert/piano_sonata_in_sonata_in_g_no3_d894rondo_allegretto.mid differ
diff --git a/schubert/piano_sonatas/piano_sonata_d568_opposth122.mid b/schubert/piano_sonatas/piano_sonata_d568_opposth_122.mid
similarity index 100%
rename from schubert/piano_sonatas/piano_sonata_d568_opposth122.mid
rename to schubert/piano_sonatas/piano_sonata_d568_opposth_122.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n1.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n1.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n1.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n1.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n2.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n2.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n2.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n2.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n3.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n3.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n3.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n3.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n4.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n4.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n4.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n4.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n5.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n5.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n5.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n5.mid
diff --git a/schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n6.mid b/schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n6.mid
similarity index 100%
rename from schumann/6_impromptus_bilder_aus_osten_for_4-hands_op66_n6.mid
rename to schumann/6_impromptus_bilder_aus_osten_for_4_hands_op66_n6.mid
diff --git a/schumann/moment_musicau_no4_in_c-op_94-d_780.mid b/schumann/moment_musicau_no4_in_c_op_94_d_780.mid
similarity index 100%
rename from schumann/moment_musicau_no4_in_c-op_94-d_780.mid
rename to schumann/moment_musicau_no4_in_c_op_94_d_780.mid
diff --git a/schumann/moment_musicau_no5_in_f-op_94-d_780.mid b/schumann/moment_musicau_no5_in_f_op_94_d_780.mid
similarity index 100%
rename from schumann/moment_musicau_no5_in_f-op_94-d_780.mid
rename to schumann/moment_musicau_no5_in_f_op_94_d_780.mid
diff --git a/shostakovich/piano_concerto_no2_mov2.mid b/shostakovich/piano_concerto_no2_mov_2.mid
similarity index 100%
rename from shostakovich/piano_concerto_no2_mov2.mid
rename to shostakovich/piano_concerto_no2_mov_2.mid
diff --git a/sibelius/when_the_roan-tree_flowers.mid b/sibelius/when_the_roan_tree_flowers.mid
similarity index 100%
rename from sibelius/when_the_roan-tree_flowers.mid
rename to sibelius/when_the_roan_tree_flowers.mid
diff --git a/sibelius/when_the_roantree_flowers.mid b/sibelius/when_the_roantree_flowers.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e9e61be1ad7ab677ae9f9d23d0492292a23e1df1
Binary files /dev/null and b/sibelius/when_the_roantree_flowers.mid differ
diff --git a/skriabin/flammes_sombres_opus73_no1.mid b/skriabin/flammes_sombres_opus_73_no_1.mid
similarity index 100%
rename from skriabin/flammes_sombres_opus73_no1.mid
rename to skriabin/flammes_sombres_opus_73_no_1.mid
diff --git a/skriabin/flammes_sombres_opus73_no2.mid b/skriabin/flammes_sombres_opus_73_no_2.mid
similarity index 100%
rename from skriabin/flammes_sombres_opus73_no2.mid
rename to skriabin/flammes_sombres_opus_73_no_2.mid
diff --git a/strauss_j/tales_from_the_vienna_woods-waltz.mid b/strauss_j/tales_from_the_vienna_woods_waltz.mid
similarity index 100%
rename from strauss_j/tales_from_the_vienna_woods-waltz.mid
rename to strauss_j/tales_from_the_vienna_woods_waltz.mid
diff --git a/stravinsky/symphony_of_psalms_mov1.mid b/stravinsky/symphony_of_psalms_mov_1.mid
similarity index 100%
rename from stravinsky/symphony_of_psalms_mov1.mid
rename to stravinsky/symphony_of_psalms_mov_1.mid
diff --git a/stravinsky/symphony_of_psalms_mov2.mid b/stravinsky/symphony_of_psalms_mov_2.mid
similarity index 100%
rename from stravinsky/symphony_of_psalms_mov2.mid
rename to stravinsky/symphony_of_psalms_mov_2.mid
diff --git a/stravinsky/symphony_of_psalms_mov3.mid b/stravinsky/symphony_of_psalms_mov_3.mid
similarity index 100%
rename from stravinsky/symphony_of_psalms_mov3.mid
rename to stravinsky/symphony_of_psalms_mov_3.mid
diff --git a/stravinsky/the_rite_of_spring_mova.mid b/stravinsky/the_rite_of_spring_mov_a.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_mova.mid
rename to stravinsky/the_rite_of_spring_mov_a.mid
diff --git a/stravinsky/the_rite_of_spring_movb.mid b/stravinsky/the_rite_of_spring_mov_b.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movb.mid
rename to stravinsky/the_rite_of_spring_mov_b.mid
diff --git a/stravinsky/the_rite_of_spring_movc.mid b/stravinsky/the_rite_of_spring_mov_c.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movc.mid
rename to stravinsky/the_rite_of_spring_mov_c.mid
diff --git a/stravinsky/the_rite_of_spring_movd.mid b/stravinsky/the_rite_of_spring_mov_d.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movd.mid
rename to stravinsky/the_rite_of_spring_mov_d.mid
diff --git a/stravinsky/the_rite_of_spring_move.mid b/stravinsky/the_rite_of_spring_mov_e.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_move.mid
rename to stravinsky/the_rite_of_spring_mov_e.mid
diff --git a/stravinsky/the_rite_of_spring_movf.mid b/stravinsky/the_rite_of_spring_mov_f.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movf.mid
rename to stravinsky/the_rite_of_spring_mov_f.mid
diff --git a/stravinsky/the_rite_of_spring_movg.mid b/stravinsky/the_rite_of_spring_mov_g.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movg.mid
rename to stravinsky/the_rite_of_spring_mov_g.mid
diff --git a/stravinsky/the_rite_of_spring_movh.mid b/stravinsky/the_rite_of_spring_mov_h.mid
similarity index 100%
rename from stravinsky/the_rite_of_spring_movh.mid
rename to stravinsky/the_rite_of_spring_mov_h.mid
diff --git a/swinstead/humoresque_opus21.mid b/swinstead/humoresque_opus_21.mid
similarity index 100%
rename from swinstead/humoresque_opus21.mid
rename to swinstead/humoresque_opus_21.mid
diff --git a/tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_7-8movs.mid b/tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_78movs.mid
similarity index 100%
rename from tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_7-8movs.mid
rename to tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_78movs.mid
diff --git a/tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_7_8movs.mid b/tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_7_8movs.mid
new file mode 100644
index 0000000000000000000000000000000000000000..972dbe332b9ff488ec326e84389c6f68412cf20c
Binary files /dev/null and b/tchaikovsky/tchaikovsky_lake_of_the_swans_act_1_7_8movs.mid differ
diff --git a/vaughan/linden_lea-a_dorset_song.mid b/vaughan/linden_lea_a_dorset_song.mid
similarity index 100%
rename from vaughan/linden_lea-a_dorset_song.mid
rename to vaughan/linden_lea_a_dorset_song.mid
diff --git a/vaughan/linden_leaa_dorset_song.mid b/vaughan/linden_leaa_dorset_song.mid
new file mode 100644
index 0000000000000000000000000000000000000000..84d07d1eddffd53d7a2a550471c130c08bcc83bc
Binary files /dev/null and b/vaughan/linden_leaa_dorset_song.mid differ
diff --git a/vaughan/suite_of_six_pieces-prelude.mid b/vaughan/suite_of_six_pieces_prelude.mid
similarity index 100%
rename from vaughan/suite_of_six_pieces-prelude.mid
rename to vaughan/suite_of_six_pieces_prelude.mid
diff --git a/vaughan/suite_of_six_piecesprelude.mid b/vaughan/suite_of_six_piecesprelude.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5704bedfcd2eef6e6e22f375118d65fdcd2f0306
Binary files /dev/null and b/vaughan/suite_of_six_piecesprelude.mid differ
diff --git a/vivaldi/violin_concerto_op9_n6_rv348_1-2mov.mid b/vivaldi/violin_concerto_op9_n6_rv348_1_2mov.mid
similarity index 100%
rename from vivaldi/violin_concerto_op9_n6_rv348_1-2mov.mid
rename to vivaldi/violin_concerto_op9_n6_rv348_1_2mov.mid