diff --git a/doom1-music.cfg b/doom1-music.cfg
index 1db695e..a96b081 100644
--- a/doom1-music.cfg
+++ b/doom1-music.cfg
@@ -1,47 +1,47 @@
 # Config file for Doom 1 high quality MIDI pack.
 
 # SHA1 hash                              = filename
-b2e05b4e8dff8d76f8f4c3a724e7dbd365390536 = d_inter.flac
-0c0acce45130bab935d2f1e85664b29a3c724fcd = d_intro.flac
-fca4086939a68ae4ed84c96e6bf0bd5621ddbe3d = d_victor.flac
-5971e5e20554f47ca06568832abd37db5e5a94f7 = d_intro.flac
-99767e32769229897f7722848fb1ceccc2314d09 = d_e1m1.flac
-b5e7dfb4efe9e688bf2ae6163c9d734e89e643b1 = d_e1m2.flac
-fda8fa73e4d30a6b961cd46fe6e013395e87a682 = d_e1m3.flac
-3805f9bf3f1702f7e7f5483a609d7d3c4daa2323 = d_e1m4.flac
-f546ed823b234fe391653029159de7b67a15dbd4 = d_e1m5.flac
-4450811b5a6748cfd83e3ea241222f6b88be33f9 = d_e1m6.flac
-73edb50d96b0ac03be34a6134b33e4c8f00fc486 = d_e1m7.flac
-47d711a6fd32f5047879975027e5b152b52aa1dc = d_e1m8.flac
-62c631c2fdaa5ecd9a8d8f369917244f27128810 = d_e1m9.flac
-7702a6449585428e718558d8ecc387ef1a21d948 = d_e2m1.flac
-1cb1810989cbfae2b29ba8d6d0f8f1175de45f03 = d_e2m2.flac
-4a5badc4f10a7d4ed021e5d1cc470c1da728a741 = d_e2m3.flac
-7d740f3c881a22945e472c68754fd9485cb04750 = d_e2m4.flac
-ae9c3dc2f9aeea002327a5204d080ea82505a310 = d_e2m6.flac
-b26aad3caa420e9a2c76586cd59433b092fcba1c = d_e2m7.flac
-90f06251a2a90bfaefd47a526b28264ea64f4f83 = d_e2m8.flac
-b2fb439f23c08c8e2577d262e5ed910a6a62c735 = d_e3m1.flac
-b6c07bb249526b864208922d2d9ab655f4aade78 = d_e3m2.flac
-ce3587ee503ffe707b2d8b690396114fdae6b411 = d_e3m3.flac
-36b14bf165b3fdd3958ee83e4929063f051ada2f = d_e3m5.flac
-e77c3d42f2ea87f046074bd4e3ff1e535da1c653 = d_e3m6.flac
-3d85ec9c10b5ea46556899cfba701a556e27ca34 = d_e3m7.flac
-d746ea2aa16b3237422cb18ec66f26e12cb08d40 = d_e3m8.flac
-4d42e2ce1c1ff192500e7a08e72c85fe59741487 = d_e3m9.flac
-3da3b1335560a92912e6d1eb542ba8c65dcb1d2c = d_bunny.flac
+b2e05b4e8dff8d76f8f4c3a724e7dbd365390536 = doom1-music/d_inter.flac
+0c0acce45130bab935d2f1e85664b29a3c724fcd = doom1-music/d_intro.flac
+fca4086939a68ae4ed84c96e6bf0bd5621ddbe3d = doom1-music/d_victor.flac
+5971e5e20554f47ca06568832abd37db5e5a94f7 = doom1-music/d_intro.flac
+99767e32769229897f7722848fb1ceccc2314d09 = doom1-music/d_e1m1.flac
+b5e7dfb4efe9e688bf2ae6163c9d734e89e643b1 = doom1-music/d_e1m2.flac
+fda8fa73e4d30a6b961cd46fe6e013395e87a682 = doom1-music/d_e1m3.flac
+3805f9bf3f1702f7e7f5483a609d7d3c4daa2323 = doom1-music/d_e1m4.flac
+f546ed823b234fe391653029159de7b67a15dbd4 = doom1-music/d_e1m5.flac
+4450811b5a6748cfd83e3ea241222f6b88be33f9 = doom1-music/d_e1m6.flac
+73edb50d96b0ac03be34a6134b33e4c8f00fc486 = doom1-music/d_e1m7.flac
+47d711a6fd32f5047879975027e5b152b52aa1dc = doom1-music/d_e1m8.flac
+62c631c2fdaa5ecd9a8d8f369917244f27128810 = doom1-music/d_e1m9.flac
+7702a6449585428e718558d8ecc387ef1a21d948 = doom1-music/d_e2m1.flac
+1cb1810989cbfae2b29ba8d6d0f8f1175de45f03 = doom1-music/d_e2m2.flac
+4a5badc4f10a7d4ed021e5d1cc470c1da728a741 = doom1-music/d_e2m3.flac
+7d740f3c881a22945e472c68754fd9485cb04750 = doom1-music/d_e2m4.flac
+ae9c3dc2f9aeea002327a5204d080ea82505a310 = doom1-music/d_e2m6.flac
+b26aad3caa420e9a2c76586cd59433b092fcba1c = doom1-music/d_e2m7.flac
+90f06251a2a90bfaefd47a526b28264ea64f4f83 = doom1-music/d_e2m8.flac
+b2fb439f23c08c8e2577d262e5ed910a6a62c735 = doom1-music/d_e3m1.flac
+b6c07bb249526b864208922d2d9ab655f4aade78 = doom1-music/d_e3m2.flac
+ce3587ee503ffe707b2d8b690396114fdae6b411 = doom1-music/d_e3m3.flac
+36b14bf165b3fdd3958ee83e4929063f051ada2f = doom1-music/d_e3m5.flac
+e77c3d42f2ea87f046074bd4e3ff1e535da1c653 = doom1-music/d_e3m6.flac
+3d85ec9c10b5ea46556899cfba701a556e27ca34 = doom1-music/d_e3m7.flac
+d746ea2aa16b3237422cb18ec66f26e12cb08d40 = doom1-music/d_e3m8.flac
+4d42e2ce1c1ff192500e7a08e72c85fe59741487 = doom1-music/d_e3m9.flac
+3da3b1335560a92912e6d1eb542ba8c65dcb1d2c = doom1-music/d_bunny.flac
 
 # These tracks are reused in Alien Vendetta, but are MIDs:
-a05e45f67e1b64733fe31867ba759be0b9327a74 = d_e2m1.flac   # MAP02
-8024ae1616ddd97ce33079276458479c9e15ad5f = d_e1m4.flac   # MAP03
-3af8d79ddba49edaf9eba5e04d258d71b19b3782 = d_victor.flac # MAP05
-a55352c96c025b6bd08a6d9112bda72504be89ff = d_e2m3.flac   # MAP07
-76d1fc25ab7b1b4a58d6e6203b0bb0c50689ee71 = d_e1m8.flac   # MAP11
-497777f0863eca7cea8763316fe6d56d599b5f84 = d_e1m2.flac   # MAP12
-0228fd87f8762f112fb60c601a7b43ba3b85f97e = d_e2m2.flac   # MAP13
-db94e8e1d7c02092eab553859b45b00dcaed7471 = d_e1m6.flac   # MAP14
-5a8d7a307eebc952795c4438efacbb6d0d8e40ee = d_e2m7.flac   # MAP16
-1a36b692bf26d94a72ccf914087f3861b6baabff = d_e1m7.flac   # MAP23
-37c6cefa351b06995152558af4b866d581da945f = d_e1m5.flac   # MAP27
-36b97b87fe98348d44b6c2fdf76d49f8b123d277 = d_e2m6.flac   # MAP28
+a05e45f67e1b64733fe31867ba759be0b9327a74 = doom1-music/d_e2m1.flac   # MAP02
+8024ae1616ddd97ce33079276458479c9e15ad5f = doom1-music/d_e1m4.flac   # MAP03
+3af8d79ddba49edaf9eba5e04d258d71b19b3782 = doom1-music/d_victor.flac # MAP05
+a55352c96c025b6bd08a6d9112bda72504be89ff = doom1-music/d_e2m3.flac   # MAP07
+76d1fc25ab7b1b4a58d6e6203b0bb0c50689ee71 = doom1-music/d_e1m8.flac   # MAP11
+497777f0863eca7cea8763316fe6d56d599b5f84 = doom1-music/d_e1m2.flac   # MAP12
+0228fd87f8762f112fb60c601a7b43ba3b85f97e = doom1-music/d_e2m2.flac   # MAP13
+db94e8e1d7c02092eab553859b45b00dcaed7471 = doom1-music/d_e1m6.flac   # MAP14
+5a8d7a307eebc952795c4438efacbb6d0d8e40ee = doom1-music/d_e2m7.flac   # MAP16
+1a36b692bf26d94a72ccf914087f3861b6baabff = doom1-music/d_e1m7.flac   # MAP23
+37c6cefa351b06995152558af4b866d581da945f = doom1-music/d_e1m5.flac   # MAP27
+36b97b87fe98348d44b6c2fdf76d49f8b123d277 = doom1-music/d_e2m6.flac   # MAP28
 
diff --git a/doom2-music.cfg b/doom2-music.cfg
index 04ba07b..3b3f8f9 100644
--- a/doom2-music.cfg
+++ b/doom2-music.cfg
@@ -1,42 +1,42 @@
 # Config file for Doom 2 high quality MIDI pack.
 
 # SHA1 hash                              = filename
-79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = d_runnin.flac  # MAP01
-868b3aae73c7b12e92c0fd80431885097ff50487 = d_stalks.flac  # MAP02
-19237754d2eb85f41d846b34660dd52dd1a83ffd = d_countd.flac  # MAP03
-00abff3b61b25a6855d2413ac26894ec7c559dfb = d_betwee.flac  # MAP04
-954636c7ee09edf5d98f20000cfbb54d07d52204 = d_doom.flac    # MAP05
-8d32b2b7aa3b806474c1c237ef2b909478973c40 = d_the_da.flac  # MAP06
-41efc3c84bb321af2b6b6758364a06d34e96ee31 = d_shawn.flac   # MAP07
-51c0872fec9f43259318bde5ed65f8dbe003733f = d_ddtblu.flac  # MAP08
-4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = d_in_cit.flac  # MAP09
-1d1f4a9edba174584e115d4600dcafbf3413aa69 = d_dead.flac    # MAP10
-868b3aae73c7b12e92c0fd80431885097ff50487 = d_stlks2.flac  # MAP11
-8d32b2b7aa3b806474c1c237ef2b909478973c40 = d_theda2.flac  # MAP12
-954636c7ee09edf5d98f20000cfbb54d07d52204 = d_doom2.flac   # MAP13
-acb7ad85494d18235df83d3efb2c7c67df835a00 = d_ddtbl2.flac  # MAP14
-79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = d_runni2.flac  # MAP15
-1d1f4a9edba174584e115d4600dcafbf3413aa69 = d_dead2.flac   # MAP16
-868b3aae73c7b12e92c0fd80431885097ff50487 = d_stlks3.flac  # MAP17
-1736c81aac77f9bffd3d376d8a07b9a800105125 = d_romero.flac  # MAP18
-41efc3c84bb321af2b6b6758364a06d34e96ee31 = d_shawn2.flac  # MAP19
-a55d400570ad255a576bc39d5b3f32a7f96a2728 = d_messag.flac  # MAP20
-19237754d2eb85f41d846b34660dd52dd1a83ffd = d_count2.flac  # MAP21
-acb7ad85494d18235df83d3efb2c7c67df835a00 = d_ddtbl3.flac  # MAP22
-29d30c3fbd712016f2e574f8432b87b873d63187 = d_ampie.flac   # MAP23
-8d32b2b7aa3b806474c1c237ef2b909478973c40 = d_theda3.flac  # MAP24
-bcfe9786afdcfb704afa563f6f387c2c2cb63e51 = d_adrian.flac  # MAP25
-a55d400570ad255a576bc39d5b3f32a7f96a2728 = d_messg2.flac  # MAP26
-1736c81aac77f9bffd3d376d8a07b9a800105125 = d_romer2.flac  # MAP27
-e05c10389e71836834ae2919fe71dbca8930276a = d_tense.flac   # MAP28
-41efc3c84bb321af2b6b6758364a06d34e96ee31 = d_shawn3.flac  # MAP29
-b779022b1d0f0010b8f049e3fc705a89449c57eb = d_openin.flac  # MAP30
-a9a5f7b0ab3be0f4fc24e26236c565d9d7dcd6cc = d_evil.flac    # MAP31
-4503d155aafec0296689e4de4fc994125056c171 = d_ultima.flac  # MAP32
-e632318629869811f7dca9b15d1912495ae6953b = d_read_m.flac
-56f2363f01df38908c77cf4734f8dc3a3a820d7d = d_dm2ttl.flac
-71e58baf9e9dea4dd24ad8013c2f5a60134f117c = d_dm2int.flac
+79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = doom2-music/d_runnin.flac  # MAP01
+868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stalks.flac  # MAP02
+19237754d2eb85f41d846b34660dd52dd1a83ffd = doom2-music/d_countd.flac  # MAP03
+00abff3b61b25a6855d2413ac26894ec7c559dfb = doom2-music/d_betwee.flac  # MAP04
+954636c7ee09edf5d98f20000cfbb54d07d52204 = doom2-music/d_doom.flac    # MAP05
+8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_the_da.flac  # MAP06
+41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn.flac   # MAP07
+51c0872fec9f43259318bde5ed65f8dbe003733f = doom2-music/d_ddtblu.flac  # MAP08
+4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = doom2-music/d_in_cit.flac  # MAP09
+1d1f4a9edba174584e115d4600dcafbf3413aa69 = doom2-music/d_dead.flac    # MAP10
+868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stlks2.flac  # MAP11
+8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_theda2.flac  # MAP12
+954636c7ee09edf5d98f20000cfbb54d07d52204 = doom2-music/d_doom2.flac   # MAP13
+acb7ad85494d18235df83d3efb2c7c67df835a00 = doom2-music/d_ddtbl2.flac  # MAP14
+79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = doom2-music/d_runni2.flac  # MAP15
+1d1f4a9edba174584e115d4600dcafbf3413aa69 = doom2-music/d_dead2.flac   # MAP16
+868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stlks3.flac  # MAP17
+1736c81aac77f9bffd3d376d8a07b9a800105125 = doom2-music/d_romero.flac  # MAP18
+41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn2.flac  # MAP19
+a55d400570ad255a576bc39d5b3f32a7f96a2728 = doom2-music/d_messag.flac  # MAP20
+19237754d2eb85f41d846b34660dd52dd1a83ffd = doom2-music/d_count2.flac  # MAP21
+acb7ad85494d18235df83d3efb2c7c67df835a00 = doom2-music/d_ddtbl3.flac  # MAP22
+29d30c3fbd712016f2e574f8432b87b873d63187 = doom2-music/d_ampie.flac   # MAP23
+8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_theda3.flac  # MAP24
+bcfe9786afdcfb704afa563f6f387c2c2cb63e51 = doom2-music/d_adrian.flac  # MAP25
+a55d400570ad255a576bc39d5b3f32a7f96a2728 = doom2-music/d_messg2.flac  # MAP26
+1736c81aac77f9bffd3d376d8a07b9a800105125 = doom2-music/d_romer2.flac  # MAP27
+e05c10389e71836834ae2919fe71dbca8930276a = doom2-music/d_tense.flac   # MAP28
+41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn3.flac  # MAP29
+b779022b1d0f0010b8f049e3fc705a89449c57eb = doom2-music/d_openin.flac  # MAP30
+a9a5f7b0ab3be0f4fc24e26236c565d9d7dcd6cc = doom2-music/d_evil.flac    # MAP31
+4503d155aafec0296689e4de4fc994125056c171 = doom2-music/d_ultima.flac  # MAP32
+e632318629869811f7dca9b15d1912495ae6953b = doom2-music/d_read_m.flac
+56f2363f01df38908c77cf4734f8dc3a3a820d7d = doom2-music/d_dm2ttl.flac
+71e58baf9e9dea4dd24ad8013c2f5a60134f117c = doom2-music/d_dm2int.flac
 
 # These tracks are reused in Alien Vendetta, but are MIDs:
-9433604c098b7b1119a453dc33ee2b50fe60009a = d_in_cit.flac  # MAP26
+9433604c098b7b1119a453dc33ee2b50fe60009a = doom2-music/d_in_cit.flac  # MAP26
 
diff --git a/heretic-music.cfg b/heretic-music.cfg
index e398a83..a56a165 100644
--- a/heretic-music.cfg
+++ b/heretic-music.cfg
@@ -1,32 +1,32 @@
 # Config file for Heretic high quality MIDI pack.
 
 # SHA1 hash                              = filename
-12818ca0d3c957e7d57e86ecc557eb038551195a = htic_titl.flac
-5cb988538ce1b1857349092ed039761b43216c0b = htic_intr.flac
-6f126abe35a78b61b930ee4c3813bbdd33ea6867 = htic_cptd.flac
-62557250f0427c067dc92caa42e20342e5cfd22d = htic_e1m1.flac
-1e8d5fd814490b9ae1662332654eba4b5fccf249 = htic_e1m2.flac
-f0f31e8834e85035d4345c89ac047fd958041c39 = htic_e1m3.flac
-054d6997405cc5a32b469b268da51ff8aed623c1 = htic_e1m4.flac
-31950ab062cc1e5ca49d7782e6fd03aa1a0de623 = htic_e1m5.flac
-7389024fbab0dff47211abb1e77cf279b21f4a5e = htic_e1m6.flac
-f2aa312dddd0a294a095d3badfb4a889fc0613ff = htic_e1m7.flac
-cd6856731d1ae1f3aa4ed0a350084f4b20f73849 = htic_e1m8.flac
-d7fe793f266733d92e6156002aa7551d6af583b9 = htic_e1m9.flac
-933545b48fad8c66f042a03891e9a562020b3bc3 = htic_e2m1.flac
-bf88ecd4ae1621222592fd4e4e15ab1427b69d7b = htic_e2m2.flac
-4f619f87a828c2ca4801ee795cb3837c0b602df5 = htic_e2m3.flac
-13033a83c49424b2f2ab76dcbb757e7d9f1eb017 = htic_e2m4.flac
-b3851f9351ae411d9de32e9f3105f21adadcc8a2 = htic_e2m6.flac
-82539791159fbbc02a2313a5b028a2908faa681b = htic_e2m7.flac
-fd9e53a49cfa62c463a01c9c1256f0562492db02 = htic_e2m8.flac
-29503959324d2ca67958db51c85d527b9c7229d3 = htic_e2m9.flac
-3aa632257c5be375b97bc4cf0bdd9bca756042fc = htic_e3m2.flac
-69ba0dce7913d53b67a81a7aadfa6615ba25424c = htic_e3m3.flac
+12818ca0d3c957e7d57e86ecc557eb038551195a = heretic-music/mus_titl.flac
+5cb988538ce1b1857349092ed039761b43216c0b = heretic-music/mus_intr.flac
+6f126abe35a78b61b930ee4c3813bbdd33ea6867 = heretic-music/mus_cptd.flac
+62557250f0427c067dc92caa42e20342e5cfd22d = heretic-music/mus_e1m1.flac
+1e8d5fd814490b9ae1662332654eba4b5fccf249 = heretic-music/mus_e1m2.flac
+f0f31e8834e85035d4345c89ac047fd958041c39 = heretic-music/mus_e1m3.flac
+054d6997405cc5a32b469b268da51ff8aed623c1 = heretic-music/mus_e1m4.flac
+31950ab062cc1e5ca49d7782e6fd03aa1a0de623 = heretic-music/mus_e1m5.flac
+7389024fbab0dff47211abb1e77cf279b21f4a5e = heretic-music/mus_e1m6.flac
+f2aa312dddd0a294a095d3badfb4a889fc0613ff = heretic-music/mus_e1m7.flac
+cd6856731d1ae1f3aa4ed0a350084f4b20f73849 = heretic-music/mus_e1m8.flac
+d7fe793f266733d92e6156002aa7551d6af583b9 = heretic-music/mus_e1m9.flac
+933545b48fad8c66f042a03891e9a562020b3bc3 = heretic-music/mus_e2m1.flac
+bf88ecd4ae1621222592fd4e4e15ab1427b69d7b = heretic-music/mus_e2m2.flac
+4f619f87a828c2ca4801ee795cb3837c0b602df5 = heretic-music/mus_e2m3.flac
+13033a83c49424b2f2ab76dcbb757e7d9f1eb017 = heretic-music/mus_e2m4.flac
+b3851f9351ae411d9de32e9f3105f21adadcc8a2 = heretic-music/mus_e2m6.flac
+82539791159fbbc02a2313a5b028a2908faa681b = heretic-music/mus_e2m7.flac
+fd9e53a49cfa62c463a01c9c1256f0562492db02 = heretic-music/mus_e2m8.flac
+29503959324d2ca67958db51c85d527b9c7229d3 = heretic-music/mus_e2m9.flac
+3aa632257c5be375b97bc4cf0bdd9bca756042fc = heretic-music/mus_e3m2.flac
+69ba0dce7913d53b67a81a7aadfa6615ba25424c = heretic-music/mus_e3m3.flac
 
 # These tracks are reused in Alien Vendetta, but are MIDs:
-51344131e8d260753ce73ad13471b6b10e933430 = htic_e2m3.flac   # MAP15
-78b570b2397570440aff47d62c325e0a647bc26f = htic_e1m1.flac   # MAP19
-ee21ba9fad4de3dfaef033488d7714a34cd27af2 = htic_e1m4.flac   # MAP29
-d2bb643a60696ccbca034559c98ac9f9c54e40c4 = htic_e1m9.flac   # MAP32
+51344131e8d260753ce73ad13471b6b10e933430 = heretic-music/mus_e2m3.flac  # MAP15
+78b570b2397570440aff47d62c325e0a647bc26f = heretic-music/mus_e1m1.flac  # MAP19
+ee21ba9fad4de3dfaef033488d7714a34cd27af2 = heretic-music/mus_e1m4.flac  # MAP29
+d2bb643a60696ccbca034559c98ac9f9c54e40c4 = heretic-music/mus_e1m9.flac  # MAP32
 
diff --git a/hexen-music.cfg b/hexen-music.cfg
index 2e032c2..34aa0dd 100644
--- a/hexen-music.cfg
+++ b/hexen-music.cfg
@@ -1,41 +1,41 @@
 # Config file for Hexen high quality MIDI pack.
 
 # SHA1 hash                              = filename
-fbf55fc1ee26bd01266b428cf510a6337e547484 = hxen_winnowr.flac
-71776e2da2b7ba607d816c374e4e9bcc08f0fd72 = hxen_jachr.flac
-c5c8630608b8132b33cded9abc3ac01f15c7b675 = hxen_simonr.flac
-43683b3f55a031de88d47b0e58b28aba18c6566d = hxen_wutzitr.flac
-a6062883f29436ef73db6d03736f28a8f44b039f = hxen_falconr.flac
-512cb6cc9b558d5f0fef603c46692e68c4500f02 = hxen_levelr.flac
-d31226ae75fce6a24208ed74137c4a14bb08353b = hxen_chartr.flac
-bf1f1e561bbdba4e699f6823575d0cea2a0e6c04 = hxen_swampr.flac
-b303193f756ca0e2de0fe1370f425a5230077892 = hxen_deepr.flac
-f0635f0386d883b00186b17387e0939aef290f84 = hxen_fubasr.flac
-18f2a01f83df6e3abedcb7df36c0a83049204738 = hxen_grover.flac
-b2527eb0522f08b2cf5fa87a58832c49c68bc6ff = hxen_fortr.flac
-343addba8ba53a20a16049bd8306968e600ee3dc = hxen_foojar.flac
-c13109045b06b5a633862b8a2c86f30f77ca9d18 = hxen_sixater.flac
-693525aaf69eac5429ab6db6b1996f2ff724b020 = hxen_wobabyr.flac
-8f884223811c2bb8311d97e77fc9582d3d1f1eca = hxen_cryptr.flac
-de540e6826e62b32c01c4a96e01266cc6a4e2c26 = hxen_fantar.flac
-efdff548df918934f71fbd4aa9a2e5ebb5f4b2a4 = hxen_blechr.flac
-de91f150f6a127e72e35ea88975e6d9834a3c411 = hxen_voidr.flac
-e0497fe27289fe18515b70adf28b0293f9ba4f57 = hxen_chap_1r.flac
-f2ef1abdc3f672a3519abb95c78d61c31591ea8d = hxen_chap_2r.flac
-78cd9882f61cc441bef4126e84aeb60a2713d7c5 = hxen_chap_3r.flac
-97b2b575d9d096c1f89fd9bca9f20c9bac6f54d5 = hxen_chap_4r.flac
-ad0197a0f6c52ac3091599a5e92cc80c1714494f = hxen_chippyr.flac
-30506c62e9f0989ffe09903f69f901b40b07ee9a = hxen_percr.flac
-3542803beaa43bf1de1a8ebdb128c059b32e2af1 = hxen_secretr.flac
-81067721f40c611d09fb0b4d63831da9b0d23230 = hxen_bonesr.flac
-4822af2e1a2eb7faf660458a0804b4cee3c70edc = hxen_octor.flac
-26bb3cec902ed8008fc2a7f24b0ec5606bd15e8e = hxen_rithmr.flac
-94ab641c7aa93caac77a1f8e9f8437ab8c93f7e0 = hxen_stalkr.flac
-d0a3f337c54b0703b4d3bbadee1a5e57d8e6c925 = hxen_borkr.flac
-79e7781ec7eb9b9434b55e2aecebb456792b17ed = hxen_crucibr.flac
-c2786e5581a7f88019699b164a030584a54d62d4 = hxen_hexen.flac
-97fae9a084c0efda51511be0f5f1c03f412d6a8c = hxen_hub.flac
-c5da52d5c2ec4803ef8f84814b8c374f3389eccd = hxen_hall.flac
-1e71bc0e2feafb06214e587a2d083d53ed179921 = hxen_orb.flac
-bc9dcfa6632e847e03afcae2a2c53c9861d1fae2 = hxen_chess.flac
+fbf55fc1ee26bd01266b428cf510a6337e547484 = hexen-music/winnowr.flac
+71776e2da2b7ba607d816c374e4e9bcc08f0fd72 = hexen-music/jachr.flac
+c5c8630608b8132b33cded9abc3ac01f15c7b675 = hexen-music/simonr.flac
+43683b3f55a031de88d47b0e58b28aba18c6566d = hexen-music/wutzitr.flac
+a6062883f29436ef73db6d03736f28a8f44b039f = hexen-music/falconr.flac
+512cb6cc9b558d5f0fef603c46692e68c4500f02 = hexen-music/levelr.flac
+d31226ae75fce6a24208ed74137c4a14bb08353b = hexen-music/chartr.flac
+bf1f1e561bbdba4e699f6823575d0cea2a0e6c04 = hexen-music/swampr.flac
+b303193f756ca0e2de0fe1370f425a5230077892 = hexen-music/deepr.flac
+f0635f0386d883b00186b17387e0939aef290f84 = hexen-music/fubasr.flac
+18f2a01f83df6e3abedcb7df36c0a83049204738 = hexen-music/grover.flac
+b2527eb0522f08b2cf5fa87a58832c49c68bc6ff = hexen-music/fortr.flac
+343addba8ba53a20a16049bd8306968e600ee3dc = hexen-music/foojar.flac
+c13109045b06b5a633862b8a2c86f30f77ca9d18 = hexen-music/sixater.flac
+693525aaf69eac5429ab6db6b1996f2ff724b020 = hexen-music/wobabyr.flac
+8f884223811c2bb8311d97e77fc9582d3d1f1eca = hexen-music/cryptr.flac
+de540e6826e62b32c01c4a96e01266cc6a4e2c26 = hexen-music/fantar.flac
+efdff548df918934f71fbd4aa9a2e5ebb5f4b2a4 = hexen-music/blechr.flac
+de91f150f6a127e72e35ea88975e6d9834a3c411 = hexen-music/voidr.flac
+e0497fe27289fe18515b70adf28b0293f9ba4f57 = hexen-music/chap_1r.flac
+f2ef1abdc3f672a3519abb95c78d61c31591ea8d = hexen-music/chap_2r.flac
+78cd9882f61cc441bef4126e84aeb60a2713d7c5 = hexen-music/chap_3r.flac
+97b2b575d9d096c1f89fd9bca9f20c9bac6f54d5 = hexen-music/chap_4r.flac
+ad0197a0f6c52ac3091599a5e92cc80c1714494f = hexen-music/chippyr.flac
+30506c62e9f0989ffe09903f69f901b40b07ee9a = hexen-music/percr.flac
+3542803beaa43bf1de1a8ebdb128c059b32e2af1 = hexen-music/secretr.flac
+81067721f40c611d09fb0b4d63831da9b0d23230 = hexen-music/bonesr.flac
+4822af2e1a2eb7faf660458a0804b4cee3c70edc = hexen-music/octor.flac
+26bb3cec902ed8008fc2a7f24b0ec5606bd15e8e = hexen-music/rithmr.flac
+94ab641c7aa93caac77a1f8e9f8437ab8c93f7e0 = hexen-music/stalkr.flac
+d0a3f337c54b0703b4d3bbadee1a5e57d8e6c925 = hexen-music/borkr.flac
+79e7781ec7eb9b9434b55e2aecebb456792b17ed = hexen-music/crucibr.flac
+c2786e5581a7f88019699b164a030584a54d62d4 = hexen-music/hexen.flac
+97fae9a084c0efda51511be0f5f1c03f412d6a8c = hexen-music/hub.flac
+c5da52d5c2ec4803ef8f84814b8c374f3389eccd = hexen-music/hall.flac
+1e71bc0e2feafb06214e587a2d083d53ed179921 = hexen-music/orb.flac
+bc9dcfa6632e847e03afcae2a2c53c9861d1fae2 = hexen-music/chess.flac
 
diff --git a/strife-music.cfg b/strife-music.cfg
index 16e6bac..9972c58 100644
--- a/strife-music.cfg
+++ b/strife-music.cfg
@@ -1,38 +1,38 @@
 # Config file for Strife high quality MIDI pack.
 
 # SHA1 hash                              = filename
-8ac2b2b47707f0fdf8f67496ba3e27ff3cf38efa = strf_logo.flac
-62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strf_action.flac
-12fa000f3fa1edac5c4f7ed5d152183ecf78e661 = strf_tavern.flac
-695e56ab3251792d20e509bf4cb3e0b6932648ea = strf_danger.flac
-96fe30e8712217b60dd7ef40e49783aae06f358c = strf_fast.flac
-ec8fa484c4e85adbf70060eea82668a4bdfb09a2 = strf_intro.flac
-61345598a3de04aad5084c695521d46d17c7f94e = strf_darker.flac
-52353e9a435b7b1cb2687de5dd315df372342337 = strf_strike.flac
-061164504907bffc9c2267a4f320e23d700f0b55 = strf_slide.flac
-3dbb4b703ce69aafcdd59d748fb5a33f1a6381f0 = strf_tribal.flac
-393773688eba050c3548498a2a8640cc7b495227 = strf_march.flac
-695e56ab3251792d20e509bf4cb3e0b6932648ea = strf_danger.flac
-3cba3c627de065a667dd63da234c5a2055fb5ba8 = strf_mood.flac
-b1f65a333e5c70255784d702c30f9fdfedecf10c = strf_castle.flac
-61345598a3de04aad5084c695521d46d17c7f94e = strf_darker.flac
-62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strf_action.flac
-e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strf_fight.flac
-17f822b7374b1f069b891d651288c758bbe77d7c = strf_spense.flac
-061164504907bffc9c2267a4f320e23d700f0b55 = strf_slide.flac
-52353e9a435b7b1cb2687de5dd315df372342337 = strf_strike.flac
-e66c5a1a7d05f021f4ae531bff95c34176e6b121 = strf_dark.flac
-1c92bd0625026af30dadeb2e30a68252cae324aa = strf_tech.flac
-061164504907bffc9c2267a4f320e23d700f0b55 = strf_slide.flac
-7ae280713d078de7933a998479000b0205f1793a = strf_drone.flac
-4a664afd0d7eae79c97aaac42877e3f679618f8d = strf_panthr.flac
-4a7d62beeac5601ccf218bccfefee42b6028051e = strf_sad.flac
-e60e109779400f2855d72a77d37ffc547edb4729 = strf_instry.flac
-1c92bd0625026af30dadeb2e30a68252cae324aa = strf_tech.flac
-62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strf_action.flac
-e60e109779400f2855d72a77d37ffc547edb4729 = strf_instry.flac
-7ae280713d078de7933a998479000b0205f1793a = strf_drone.flac
-e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strf_fight.flac
-b7d36878faeb291d6df52b153da2dffdfe6999dc = strf_happy.flac
-ff4a342c8c5ec51b06c3e16247fb16d0f02d8b84 = strf_end.flac
+8ac2b2b47707f0fdf8f67496ba3e27ff3cf38efa = strife-music/d_logo.flac
+62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac
+12fa000f3fa1edac5c4f7ed5d152183ecf78e661 = strife-music/d_tavern.flac
+695e56ab3251792d20e509bf4cb3e0b6932648ea = strife-music/d_danger.flac
+96fe30e8712217b60dd7ef40e49783aae06f358c = strife-music/d_fast.flac
+ec8fa484c4e85adbf70060eea82668a4bdfb09a2 = strife-music/d_intro.flac
+61345598a3de04aad5084c695521d46d17c7f94e = strife-music/d_darker.flac
+52353e9a435b7b1cb2687de5dd315df372342337 = strife-music/d_strike.flac
+061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac
+3dbb4b703ce69aafcdd59d748fb5a33f1a6381f0 = strife-music/d_tribal.flac
+393773688eba050c3548498a2a8640cc7b495227 = strife-music/d_march.flac
+695e56ab3251792d20e509bf4cb3e0b6932648ea = strife-music/d_danger.flac
+3cba3c627de065a667dd63da234c5a2055fb5ba8 = strife-music/d_mood.flac
+b1f65a333e5c70255784d702c30f9fdfedecf10c = strife-music/d_castle.flac
+61345598a3de04aad5084c695521d46d17c7f94e = strife-music/d_darker.flac
+62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac
+e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strife-music/d_fight.flac
+17f822b7374b1f069b891d651288c758bbe77d7c = strife-music/d_spense.flac
+061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac
+52353e9a435b7b1cb2687de5dd315df372342337 = strife-music/d_strike.flac
+e66c5a1a7d05f021f4ae531bff95c34176e6b121 = strife-music/d_dark.flac
+1c92bd0625026af30dadeb2e30a68252cae324aa = strife-music/d_tech.flac
+061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac
+7ae280713d078de7933a998479000b0205f1793a = strife-music/d_drone.flac
+4a664afd0d7eae79c97aaac42877e3f679618f8d = strife-music/d_panthr.flac
+4a7d62beeac5601ccf218bccfefee42b6028051e = strife-music/d_sad.flac
+e60e109779400f2855d72a77d37ffc547edb4729 = strife-music/d_instry.flac
+1c92bd0625026af30dadeb2e30a68252cae324aa = strife-music/d_tech.flac
+62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac
+e60e109779400f2855d72a77d37ffc547edb4729 = strife-music/d_instry.flac
+7ae280713d078de7933a998479000b0205f1793a = strife-music/d_drone.flac
+e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strife-music/d_fight.flac
+b7d36878faeb291d6df52b153da2dffdfe6999dc = strife-music/d_happy.flac
+ff4a342c8c5ec51b06c3e16247fb16d0f02d8b84 = strife-music/d_end.flac
 
diff --git a/tnt-music.cfg b/tnt-music.cfg
index cd47a67..e762585 100644
--- a/tnt-music.cfg
+++ b/tnt-music.cfg
@@ -1,43 +1,43 @@
 # Config file for TNT high quality MIDI pack.
 
 # SHA1 hash                              = filename
-97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt_runnin.flac   # MAP01
-f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt_stalks.flac   # MAP02
-a55d400570ad255a576bc39d5b3f32a7f96a2728 = tnt_countd.flac   # MAP03
-59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt_betwee.flac   # MAP04
-16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt_doom.flac     # MAP05
-74f3e46aa433fae2a903efd6a8a7aff867b61096 = tnt_the_da.flac   # MAP06
-34cf5e4fcc9fbc0c6b6fa4944791002a0e661e86 = tnt_shawn.flac    # MAP07
-510f56db080f78275db948d88b4667fdef22eafa = tnt_ddtblu.flac   # MAP08
-97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt_in_cit.flac   # MAP09
-edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt_dead.flac     # MAP10
-019fce82f2942bf16c80499f1dd1449d6b77c4e9 = tnt_stlks2.flac   # MAP11
-51c0872fec9f43259318bde5ed65f8dbe003733f = tnt_theda2.flac   # MAP12
-59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt_doom2.flac    # MAP13
-186c92c1979e1c898a859955dc9c76be21a252b0 = tnt_ddtbl2.flac   # MAP14
-f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt_runni2.flac   # MAP15
-5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt_dead2.flac    # MAP16
-16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt_stlks3.flac   # MAP17
-edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt_romero.flac   # MAP18
-19237754d2eb85f41d846b34660dd52dd1a83ffd = tnt_shawn2.flac   # MAP19
-05cad8ca0cc0aca19ac350414674f9205c31893c = tnt_messag.flac   # MAP20
-4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt_count2.flac   # MAP21
-91ee43214e8caf392c03e5688d559643d6dcc30a = tnt_ddtbl3.flac   # MAP22
-29d30c3fbd712016f2e574f8432b87b873d63187 = tnt_ampie.flac    # MAP23
-00abff3b61b25a6855d2413ac26894ec7c559dfb = tnt_theda3.flac   # MAP24
-954636c7ee09edf5d98f20000cfbb54d07d52204 = tnt_adrian.flac   # MAP25
-5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt_messg2.flac   # MAP26
-510f56db080f78275db948d88b4667fdef22eafa = tnt_romer2.flac   # MAP27
-91ee43214e8caf392c03e5688d559643d6dcc30a = tnt_tense.flac    # MAP28
-59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt_shawn3.flac   # MAP29
-510f56db080f78275db948d88b4667fdef22eafa = tnt_openin.flac   # MAP30
-4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt_evil.flac     # MAP31
-4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt_ultima.flac   # MAP32
-7e804ab092a44a0f323abbd0e6f8072edae8ef5b = tnt_read_m.flac
-2b2fa62ea748a2549b681be0711942a2900ab46d = tnt_dm2ttl.flac
-4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt_dm2int.flac
+97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt-music/d_runnin.flac  # MAP01
+f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt-music/d_stalks.flac  # MAP02
+a55d400570ad255a576bc39d5b3f32a7f96a2728 = tnt-music/d_countd.flac  # MAP03
+59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_betwee.flac  # MAP04
+16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt-music/d_doom.flac    # MAP05
+74f3e46aa433fae2a903efd6a8a7aff867b61096 = tnt-music/d_the_da.flac  # MAP06
+34cf5e4fcc9fbc0c6b6fa4944791002a0e661e86 = tnt-music/d_shawn.flac   # MAP07
+510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_ddtblu.flac  # MAP08
+97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt-music/d_in_cit.flac  # MAP09
+edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt-music/d_dead.flac    # MAP10
+019fce82f2942bf16c80499f1dd1449d6b77c4e9 = tnt-music/d_stlks2.flac  # MAP11
+51c0872fec9f43259318bde5ed65f8dbe003733f = tnt-music/d_theda2.flac  # MAP12
+59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_doom2.flac   # MAP13
+186c92c1979e1c898a859955dc9c76be21a252b0 = tnt-music/d_ddtbl2.flac  # MAP14
+f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt-music/d_runni2.flac  # MAP15
+5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt-music/d_dead2.flac   # MAP16
+16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt-music/d_stlks3.flac  # MAP17
+edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt-music/d_romero.flac  # MAP18
+19237754d2eb85f41d846b34660dd52dd1a83ffd = tnt-music/d_shawn2.flac  # MAP19
+05cad8ca0cc0aca19ac350414674f9205c31893c = tnt-music/d_messag.flac  # MAP20
+4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt-music/d_count2.flac  # MAP21
+91ee43214e8caf392c03e5688d559643d6dcc30a = tnt-music/d_ddtbl3.flac  # MAP22
+29d30c3fbd712016f2e574f8432b87b873d63187 = tnt-music/d_ampie.flac   # MAP23
+00abff3b61b25a6855d2413ac26894ec7c559dfb = tnt-music/d_theda3.flac  # MAP24
+954636c7ee09edf5d98f20000cfbb54d07d52204 = tnt-music/d_adrian.flac  # MAP25
+5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt-music/d_messg2.flac  # MAP26
+510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_romer2.flac  # MAP27
+91ee43214e8caf392c03e5688d559643d6dcc30a = tnt-music/d_tense.flac   # MAP28
+59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_shawn3.flac  # MAP29
+510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_openin.flac  # MAP30
+4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt-music/d_evil.flac    # MAP31
+4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt-music/d_ultima.flac  # MAP32
+7e804ab092a44a0f323abbd0e6f8072edae8ef5b = tnt-music/d_read_m.flac
+2b2fa62ea748a2549b681be0711942a2900ab46d = tnt-music/d_dm2ttl.flac
+4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt-music/d_dm2int.flac
 
 # These tracks are reused in Alien Vendetta, but are MIDs:
-d397948e19d4a23cbb57a6f5e3d09ac1d22cea76 = tnt_openin.flac   # MAP17
-eb355cb43b8aae49cda17f9fa21c5ee3762d7f88 = tnt_betwee.flac   # MAP18
+d397948e19d4a23cbb57a6f5e3d09ac1d22cea76 = tnt-music/d_openin.flac  # MAP17
+eb355cb43b8aae49cda17f9fa21c5ee3762d7f88 = tnt-music/d_betwee.flac  # MAP18