diff --git a/SOUNDS/BURNZOB1.ogg b/SOUNDS/BURNZOB1.ogg
deleted file mode 100644
index fe5b56fb19..0000000000
Binary files a/SOUNDS/BURNZOB1.ogg and /dev/null differ
diff --git a/SOUNDS/BURNZOB2.ogg b/SOUNDS/BURNZOB2.ogg
deleted file mode 100644
index 09bcf74646..0000000000
Binary files a/SOUNDS/BURNZOB2.ogg and /dev/null differ
diff --git a/SOUNDS/BURNZOB3.ogg b/SOUNDS/BURNZOB3.ogg
deleted file mode 100644
index c5e2ea0b29..0000000000
Binary files a/SOUNDS/BURNZOB3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/CLIPIN.ogg b/SOUNDS/COMBAT/CASING/DMR/CLIPIN.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/CLIPIN.ogg
rename to SOUNDS/COMBAT/CASING/DMR/CLIPIN.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DRYFIRE.ogg b/SOUNDS/COMBAT/CASING/DMR/DRYFIRE.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DRYFIRE.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DRYFIRE.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSAOUNC1.ogg b/SOUNDS/COMBAT/CASING/DMR/DSAOUNC1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSAOUNC1.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSAOUNC1.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSAOUNC2.ogg b/SOUNDS/COMBAT/CASING/DMR/DSAOUNC2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSAOUNC2.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSAOUNC2.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSAOUNC3.ogg b/SOUNDS/COMBAT/CASING/DMR/DSAOUNC3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSAOUNC3.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSAOUNC3.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSAOUNC4.ogg b/SOUNDS/COMBAT/CASING/DMR/DSAOUNC4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSAOUNC4.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSAOUNC4.ogg
diff --git a/SOUNDS/DSCASIN1.ogg b/SOUNDS/COMBAT/CASING/DMR/DSCASIN1.ogg
similarity index 100%
rename from SOUNDS/DSCASIN1.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSCASIN1.ogg
diff --git a/SOUNDS/DSCASIN2.ogg b/SOUNDS/COMBAT/CASING/DMR/DSCASIN2.ogg
similarity index 100%
rename from SOUNDS/DSCASIN2.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSCASIN2.ogg
diff --git a/SOUNDS/DSCASIN3.ogg b/SOUNDS/COMBAT/CASING/DMR/DSCASIN3.ogg
similarity index 100%
rename from SOUNDS/DSCASIN3.ogg
rename to SOUNDS/COMBAT/CASING/DMR/DSCASIN3.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/F1stsup.ogg b/SOUNDS/COMBAT/CASING/F1stsup.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/F1stsup.ogg
rename to SOUNDS/COMBAT/CASING/F1stsup.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/IRONSIT1.ogg b/SOUNDS/COMBAT/CASING/Iron sights/IRONSIT1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/IRONSIT1.ogg
rename to SOUNDS/COMBAT/CASING/Iron sights/IRONSIT1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/IRONSIT2.ogg b/SOUNDS/COMBAT/CASING/Iron sights/IRONSIT2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/IRONSIT2.ogg
rename to SOUNDS/COMBAT/CASING/Iron sights/IRONSIT2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/IRONSIT3.ogg b/SOUNDS/COMBAT/CASING/Iron sights/IRONSIT3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/IRONSIT3.ogg
rename to SOUNDS/COMBAT/CASING/Iron sights/IRONSIT3.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/IRONSIT4.ogg b/SOUNDS/COMBAT/CASING/Iron sights/IRONSIT4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/IRONSIT4.ogg
rename to SOUNDS/COMBAT/CASING/Iron sights/IRONSIT4.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/MP40.ogg b/SOUNDS/COMBAT/CASING/Mp40/MP40.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/MP40.ogg
rename to SOUNDS/COMBAT/CASING/Mp40/MP40.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/RELOAD.ogg b/SOUNDS/COMBAT/CASING/Mp40/RELOAD.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/RELOAD.ogg
rename to SOUNDS/COMBAT/CASING/Mp40/RELOAD.ogg
diff --git a/SOUNDS/COMBAT/CLIP_P1.ogg b/SOUNDS/COMBAT/CASING/Pistol/CLIP_P1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CLIP_P1.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/CLIP_P1.ogg
diff --git a/SOUNDS/COMBAT/CLIP_P2.ogg b/SOUNDS/COMBAT/CASING/Pistol/CLIP_P2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CLIP_P2.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/CLIP_P2.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSBOUNC1.ogg b/SOUNDS/COMBAT/CASING/Pistol/DSBOUNC1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSBOUNC1.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/DSBOUNC1.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSBOUNC2.ogg b/SOUNDS/COMBAT/CASING/Pistol/DSBOUNC2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSBOUNC2.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/DSBOUNC2.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSBOUNC3.ogg b/SOUNDS/COMBAT/CASING/Pistol/DSBOUNC3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSBOUNC3.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/DSBOUNC3.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSBOUNC4.ogg b/SOUNDS/COMBAT/CASING/Pistol/DSBOUNC4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSBOUNC4.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/DSBOUNC4.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DSPISTOL.ogg b/SOUNDS/COMBAT/CASING/Pistol/DSPISTOL.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DSPISTOL.ogg
rename to SOUNDS/COMBAT/CASING/Pistol/DSPISTOL.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/CLIPINQS.ogg b/SOUNDS/COMBAT/CASING/QSG/CLIPINQS.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/CLIPINQS.ogg
rename to SOUNDS/COMBAT/CASING/QSG/CLIPINQS.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/CLIPINSS.ogg b/SOUNDS/COMBAT/CASING/QSG/CLIPINSS.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/CLIPINSS.ogg
rename to SOUNDS/COMBAT/CASING/QSG/CLIPINSS.ogg
diff --git a/SOUNDS/HD/DSDBCLS.ogg b/SOUNDS/COMBAT/CASING/QSG/DSDBCLS.ogg
similarity index 100%
rename from SOUNDS/HD/DSDBCLS.ogg
rename to SOUNDS/COMBAT/CASING/QSG/DSDBCLS.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/GLAUNCH.ogg b/SOUNDS/COMBAT/CASING/SGL/GLAUNCH.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/GLAUNCH.ogg
rename to SOUNDS/COMBAT/CASING/SGL/GLAUNCH.ogg
diff --git a/SOUNDS/HD/DSSGCOCK.ogg b/SOUNDS/COMBAT/CASING/Shotgun/DSSGCOCK.ogg
similarity index 100%
rename from SOUNDS/HD/DSSGCOCK.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/DSSGCOCK.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSSHELL1.ogg b/SOUNDS/COMBAT/CASING/Shotgun/DSSHELL1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSSHELL1.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/DSSHELL1.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSSHELL2.ogg b/SOUNDS/COMBAT/CASING/Shotgun/DSSHELL2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSSHELL2.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/DSSHELL2.ogg
diff --git a/SOUNDS/COMBAT/CASING/DSSHELL3.ogg b/SOUNDS/COMBAT/CASING/Shotgun/DSSHELL3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/CASING/DSSHELL3.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/DSSHELL3.ogg
diff --git a/SOUNDS/HD/DSWPNUP.ogg b/SOUNDS/COMBAT/CASING/Shotgun/DSWPNUP.ogg
similarity index 100%
rename from SOUNDS/HD/DSWPNUP.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/DSWPNUP.ogg
diff --git a/SOUNDS/SHELPKUP.ogg b/SOUNDS/COMBAT/CASING/Shotgun/SHELPKUP.ogg
similarity index 100%
rename from SOUNDS/SHELPKUP.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/SHELPKUP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/STGNPUMP.ogg b/SOUNDS/COMBAT/CASING/Shotgun/STGNPUMP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/STGNPUMP.ogg
rename to SOUNDS/COMBAT/CASING/Shotgun/STGNPUMP.ogg
diff --git a/SOUNDS/COMBAT/DSPLASMA.ogg b/SOUNDS/COMBAT/DSPLASMA.ogg
deleted file mode 100644
index 0fc030f949..0000000000
Binary files a/SOUNDS/COMBAT/DSPLASMA.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/DSRIFL1.ogg b/SOUNDS/COMBAT/DSRIFL1.ogg
deleted file mode 100644
index b024e67459..0000000000
Binary files a/SOUNDS/COMBAT/DSRIFL1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/DSRIFL2.ogg b/SOUNDS/COMBAT/DSRIFL2.ogg
deleted file mode 100644
index 3bd68ff619..0000000000
Binary files a/SOUNDS/COMBAT/DSRIFL2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX1.ogg b/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX1.ogg
deleted file mode 100644
index 54d08a073e..0000000000
Binary files a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX2.ogg b/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX2.ogg
deleted file mode 100644
index fa2af67467..0000000000
Binary files a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX3.ogg b/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX3.ogg
deleted file mode 100644
index db59a58832..0000000000
Binary files a/SOUNDS/COMBAT/EXPLOSIONS/DEEPEX3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/IMPACT.ogg b/SOUNDS/COMBAT/IMPACT.ogg
deleted file mode 100644
index 1b9a89328b..0000000000
Binary files a/SOUNDS/COMBAT/IMPACT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG Beam/BMCH5RG.ogg b/SOUNDS/COMBAT/WEAPONS/BFG Beam/BMCH5RG.ogg
deleted file mode 100644
index 7cb7e58217..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG Beam/BMCH5RG.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGELEC.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGELEC.ogg
deleted file mode 100644
index 6b85e2fa2b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGELEC.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGFIR.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGFIR.ogg
deleted file mode 100644
index e21e3e5d22..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGFIR.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT1.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT1.ogg
deleted file mode 100644
index 9fe2f43a2f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT2.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT2.ogg
deleted file mode 100644
index 0c0733f0e4..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT3.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT3.ogg
deleted file mode 100644
index 12279c283f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHIT3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHUM.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHUM.ogg
deleted file mode 100644
index 6b5e3f16f0..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/Arc/LGHUM.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGCHAR2.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGCHAR2.ogg
deleted file mode 100644
index 8f5f62b7aa..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGCHAR2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD1.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD1.ogg
deleted file mode 100644
index dc4cd2c91a..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD2.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD2.ogg
deleted file mode 100644
index 990ba65014..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD3.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD3.ogg
deleted file mode 100644
index f042dd1cd7..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD4.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD4.ogg
deleted file mode 100644
index 4e31bd51be..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD4.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD5.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD5.ogg
deleted file mode 100644
index a09b2abbb6..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD5.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD6.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD6.ogg
deleted file mode 100644
index 643e396769..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHADD6.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHDRY.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHDRY.ogg
deleted file mode 100644
index bcef44f5ee..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHDRY.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHFIRE.ogg
deleted file mode 100644
index 05867f8ee2..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHIN.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHIN.ogg
deleted file mode 100644
index d2bc3a2580..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHIN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHOUT.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHOUT.ogg
deleted file mode 100644
index 025b1a627f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHOUT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHUP.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHUP.ogg
deleted file mode 100644
index 8a9d9bf5ec..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGLaser/STCHUP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGOFF.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGOFF.ogg
deleted file mode 100644
index e4c1e14e9a..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGOFF.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGOUT.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/BFGOUT.ogg
deleted file mode 100644
index c17485165d..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/BFGOUT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/CNTCTBM.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/CNTCTBM.ogg
deleted file mode 100644
index 86dd363a7c..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BFG/CNTCTBM.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFFAR.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFFAR.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFFAR.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFFAR.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFFAR2.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFFAR2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFFAR2.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFFAR2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGALPP.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGALPP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGALPP.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGALPP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGCHAFF.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGCHAFF.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGCHAFF.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGCHAFF.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGCHARG.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGCHARG.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGCHARG.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGCHARG.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGEXPLO.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGEXPLO.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGEXPLO.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGEXPLO.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGFIRE.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGFIRE.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGFIRE.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGFly1.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGFly1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGFly1.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGFly1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGHUM.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGHUM.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGHUM.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGHUM.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGPICK.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGPICK.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGPICK.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGPICK.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGRA1S.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGRA1S.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGRA1S.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGRA1S.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGXTR1.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGXTR1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGXTR1.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGXTR1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFGXTR2.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGXTR2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFGXTR2.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFGXTR2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BFG_FIRE.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFG_FIRE.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BFG_FIRE.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/BFG_FIRE.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/GENREADY.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/GENREADY.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/GENREADY.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/GENREADY.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/mbfgsh.ogg b/SOUNDS/COMBAT/WEAPONS/BFG/Normal/mbfgsh.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/mbfgsh.ogg
rename to SOUNDS/COMBAT/WEAPONS/BFG/Normal/mbfgsh.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BlackHole/DSNUKPID.ogg b/SOUNDS/COMBAT/WEAPONS/BlackHole/DSNUKPID.ogg
deleted file mode 100644
index d929e6e09b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BlackHole/DSNUKPID.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap1.ogg b/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap1.ogg
deleted file mode 100644
index d371eb4e20..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap2.ogg b/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap2.ogg
deleted file mode 100644
index 46b4b9b12b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/BlackHole/bh_zap2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWDRAW.ogg b/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWDRAW.ogg
deleted file mode 100644
index f88250e9f3..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWDRAW.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFL1.ogg b/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFL1.ogg
deleted file mode 100644
index 92444809de..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFL1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSTOP.ogg b/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSTOP.ogg
deleted file mode 100644
index ec01822fa0..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSTOP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_UZ.ogg b/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_UZ.ogg
deleted file mode 100644
index 359a676dc1..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_UZ.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_ZM.ogg b/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_ZM.ogg
deleted file mode 100644
index adfbfff117..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DMR/RAIL_ZM.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSBFG.ogg b/SOUNDS/COMBAT/WEAPONS/DSBFG.ogg
deleted file mode 100644
index 6b52520afa..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSBFG.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSDBCLS.ogg b/SOUNDS/COMBAT/WEAPONS/DSDBCLS.ogg
deleted file mode 100644
index 266e2a1569..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSDBCLS.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSDBLOAD.ogg b/SOUNDS/COMBAT/WEAPONS/DSDBLOAD.ogg
deleted file mode 100644
index 2edaac0640..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSDBLOAD.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSDBOPN.ogg b/SOUNDS/COMBAT/WEAPONS/DSDBOPN.ogg
deleted file mode 100644
index 5690d68f58..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSDBOPN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSGRLOAD.ogg b/SOUNDS/COMBAT/WEAPONS/DSGRLOAD.ogg
deleted file mode 100644
index c4983e064f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSGRLOAD.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSRLAUN.ogg b/SOUNDS/COMBAT/WEAPONS/DSRLAUN.ogg
deleted file mode 100644
index 861a8bd36a..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/DSRLAUN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG Beam/8FGGFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/Demon Tech/8FGGFIRE.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG Beam/8FGGFIRE.ogg
rename to SOUNDS/COMBAT/WEAPONS/Demon Tech/8FGGFIRE.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Demon Tech/DHeal.ogg b/SOUNDS/COMBAT/WEAPONS/Demon Tech/DHeal.ogg
deleted file mode 100644
index 0c077296c0..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Demon Tech/DHeal.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLCLIP.ogg b/SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLCLIP.ogg
deleted file mode 100644
index 89bb267608..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLCLIP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRCHRG.ogg b/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRCHRG.ogg
deleted file mode 100644
index 981aae9e13..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRCHRG.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRFRE2.ogg b/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRFRE2.ogg
deleted file mode 100644
index 29d0008ae2..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HRFRE2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Excavator/EXCRLOAD.ogg b/SOUNDS/COMBAT/WEAPONS/Excavator/EXCRLOAD.ogg
deleted file mode 100644
index 57d2040482..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Excavator/EXCRLOAD.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET2.ogg b/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET2.ogg
deleted file mode 100644
index 536760b037..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET3.ogg b/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET3.ogg
deleted file mode 100644
index e97aff9c37..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Excavator/EXSWEET3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/BIOSHOOT.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/BIOSHOOT.ogg
deleted file mode 100644
index 9fada8c3d7..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/BIOSHOOT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/BREATHOF.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/BREATHOF.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BREATHOF.ogg
rename to SOUNDS/COMBAT/WEAPONS/Fatso Cannon/BREATHOF.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DSGRFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/DSGRFIRE.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DSGRFIRE.ogg
rename to SOUNDS/COMBAT/WEAPONS/Fatso Cannon/DSGRFIRE.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/FLAMER.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMER.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/FLAMER.ogg
rename to SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMER.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/FLAMER2.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMER2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/FLAMER2.ogg
rename to SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMER2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/FLAMSTOP.ogg b/SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMSTOP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/FLAMSTOP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Fatso Cannon/FLAMSTOP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Freezer/DSBOWREL.ogg b/SOUNDS/COMBAT/WEAPONS/Freezer/DSBOWREL.ogg
deleted file mode 100644
index eab8d95d1a..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Freezer/DSBOWREL.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Freezer/STNRFIRE2.ogg b/SOUNDS/COMBAT/WEAPONS/Freezer/STNRFIRE2.ogg
deleted file mode 100644
index 0c01b49e1b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Freezer/STNRFIRE2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/GRELOAD.ogg b/SOUNDS/COMBAT/WEAPONS/GRELOAD.ogg
deleted file mode 100644
index 6075ade51b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/GRELOAD.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/MINEJUMP.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/MINEJUMP.ogg
deleted file mode 100644
index 0c0f32fd2f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/MINEJUMP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/PDPRJXP.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/PDPRJXP.ogg
deleted file mode 100644
index 8766bd6fb2..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/PDPRJXP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/PODBIGXP.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/PODBIGXP.ogg
deleted file mode 100644
index 97f33db42e..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/PODBIGXP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/PODELECT.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/PODELECT.ogg
deleted file mode 100644
index 88947831cb..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/PODELECT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPDIE.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPDIE.ogg
deleted file mode 100644
index 436feef3ef..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPDIE.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPFLY.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPFLY.ogg
deleted file mode 100644
index 9c6c2fa8e7..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPFLY.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPHIT.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPHIT.ogg
deleted file mode 100644
index 7f5ca6a4a1..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHDPHIT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODEXP.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODEXP.ogg
deleted file mode 100644
index e59b039e83..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODEXP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODGET.ogg b/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODGET.ogg
deleted file mode 100644
index d7a57ff562..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Gadgets/SHPODGET.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/8HAINAM1.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/8HAINAM1.ogg
deleted file mode 100644
index 01b6deb8a9..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/8HAINAM1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/CG_MOTOR.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/CG_MOTOR.ogg
deleted file mode 100644
index b1a54f60ce..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/CG_MOTOR.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/CG_WINDD.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/CG_WINDD.ogg
deleted file mode 100644
index 373acfc411..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/CG_WINDD.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSPIN.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/DIBSPIN.ogg
deleted file mode 100644
index 18fd2afb8d..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSPIN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTART.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTART.ogg
deleted file mode 100644
index de7279414e..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTART.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTOP.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTOP.ogg
deleted file mode 100644
index fa2f968392..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/DIBSTOP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE.ogg
deleted file mode 100644
index 35de1099cc..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE123.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE123.ogg
deleted file mode 100644
index 34790c689f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/HMGFIRE123.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/HMGHEAT.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/HMGHEAT.ogg
deleted file mode 100644
index dcb84b8f85..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/HMGHEAT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/HMGSTCH.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/HMGSTCH.ogg
deleted file mode 100644
index 8b90631dbe..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/HMGSTCH.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/HMGUP.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/HMGUP.ogg
deleted file mode 100644
index 12163e8a38..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/HMGUP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/IMPKUP.ogg b/SOUNDS/COMBAT/WEAPONS/HMG/IMPKUP.ogg
deleted file mode 100644
index 2e7d4d58ce..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/HMG/IMPKUP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_1.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_1.ogg
deleted file mode 100644
index 37eb432d47..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_10.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_10.ogg
deleted file mode 100644
index fd0b8f71de..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_10.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_11.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_11.ogg
deleted file mode 100644
index 5cb4af3138..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_11.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_12.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_12.ogg
deleted file mode 100644
index 8f6e1e0558..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_12.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_13.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_13.ogg
deleted file mode 100644
index 312ac735ce..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_13.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_2.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_2.ogg
deleted file mode 100644
index a9a459bd83..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_3.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_3.ogg
deleted file mode 100644
index ac5e0f1f67..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_4.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_4.ogg
deleted file mode 100644
index 228eb9fab8..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_4.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_5.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_5.ogg
deleted file mode 100644
index 9ebc45788f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_5.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_6.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_6.ogg
deleted file mode 100644
index 774fdd7e69..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_6.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_7.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_7.ogg
deleted file mode 100644
index 7cda8e71a1..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_7.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_8.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_8.ogg
deleted file mode 100644
index 20bff4f87d..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_8.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_9.ogg b/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_9.ogg
deleted file mode 100644
index 8b87662fd7..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Hand Grenades/EXPL_9.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWNG.ogg b/SOUNDS/COMBAT/WEAPONS/Knife/KNIFSWNG.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWNG.ogg
rename to SOUNDS/COMBAT/WEAPONS/Knife/KNIFSWNG.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFUP.ogg b/SOUNDS/COMBAT/WEAPONS/Knife/KNIFUP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Slash/KNIFUP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Knife/KNIFUP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/LOUDPISTOL.ogg b/SOUNDS/COMBAT/WEAPONS/LOUDPISTOL.ogg
deleted file mode 100644
index 6ebb3f4ab0..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/LOUDPISTOL.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/CLEJECT.ogg b/SOUNDS/COMBAT/WEAPONS/M2 Plasma/CLEJECT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Plasma/CLEJECT.ogg
rename to SOUNDS/COMBAT/WEAPONS/M2 Plasma/CLEJECT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/CLKICKIN.ogg b/SOUNDS/COMBAT/WEAPONS/M2 Plasma/CLKICKIN.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Plasma/CLKICKIN.ogg
rename to SOUNDS/COMBAT/WEAPONS/M2 Plasma/CLKICKIN.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/M2 Plasma/M2SCRN.ogg b/SOUNDS/COMBAT/WEAPONS/M2 Plasma/M2SCRN.ogg
deleted file mode 100644
index efa18e9abc..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/M2 Plasma/M2SCRN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/M2 Plasma/PLCHM2.ogg b/SOUNDS/COMBAT/WEAPONS/M2 Plasma/PLCHM2.ogg
deleted file mode 100644
index 6b20b6a3a4..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/M2 Plasma/PLCHM2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Minigun/8HAINSW1.ogg b/SOUNDS/COMBAT/WEAPONS/Minigun/8HAINSW1.ogg
deleted file mode 100644
index 97c6d6382f..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Minigun/8HAINSW1.ogg and /dev/null differ
diff --git a/SOUNDS/CHGNPKUP.ogg b/SOUNDS/COMBAT/WEAPONS/Minigun/CHGNPKUP (2).ogg
similarity index 100%
rename from SOUNDS/CHGNPKUP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Minigun/CHGNPKUP (2).ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/CHGNSHOT.ogg b/SOUNDS/COMBAT/WEAPONS/Minigun/CHGNSHOT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/CHGNSHOT.ogg
rename to SOUNDS/COMBAT/WEAPONS/Minigun/CHGNSHOT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/8HAINAMO.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/8HAINAMO.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/8HAINAMO.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/8HAINAMO.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/NAILFLY.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/NAILFLY.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/NAILFLY.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/NAILFLY.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/NAILHIT.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/NAILHIT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/NAILHIT.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/NAILHIT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/NAILHTD.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/NAILHTD.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/NAILHTD.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/NAILHTD.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/Nailfr1.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/Nailfr1.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/Nailfr2.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/Nailfr2.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/Nailfr3.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/Nailfr3.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/Nailfr3.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/HMG/Nailup1.ogg b/SOUNDS/COMBAT/WEAPONS/Nailgun/Nailup1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/HMG/Nailup1.ogg
rename to SOUNDS/COMBAT/WEAPONS/Nailgun/Nailup1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/PLSCHARG.ogg b/SOUNDS/COMBAT/WEAPONS/PLSCHARG.ogg
deleted file mode 100644
index eb1833eb33..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/PLSCHARG.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCLICK.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCLICK.ogg
deleted file mode 100644
index d6728de7ce..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCLICK.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCOOL.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCOOL.ogg
deleted file mode 100644
index 1ef4100124..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/PLSCOOL.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt1.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt1.ogg
deleted file mode 100644
index 0c53630ad4..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt2.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt2.ogg
deleted file mode 100644
index 3fbbb0f1b2..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_gauss_reloadpt2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt2.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt2.ogg
deleted file mode 100644
index 7fc60adfb3..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt3.ogg b/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt3.ogg
deleted file mode 100644
index 4e1efca5cd..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Plasma/wpn_plasmarifle_reloadpt3.ogg and /dev/null differ
diff --git a/SOUNDS/BEEEP.ogg b/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/BEEEP.ogg
similarity index 100%
rename from SOUNDS/BEEEP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Pulse Cannon/BEEEP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PBLOOP.ogg b/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PBLOOP.ogg
deleted file mode 100644
index 34edc009bb..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PBLOOP.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/PLREADY.ogg b/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PLREADY.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Plasma/PLREADY.ogg
rename to SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PLREADY.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Plasma/PLSRD.ogg b/SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PLSRD.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Plasma/PLSRD.ogg
rename to SOUNDS/COMBAT/WEAPONS/Pulse Cannon/PLSRD.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/RIFCL_CLIK.ogg b/SOUNDS/COMBAT/WEAPONS/Pump Shotgun/RIFCL_CLIK.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DMR/RIFCL_CLIK.ogg
rename to SOUNDS/COMBAT/WEAPONS/Pump Shotgun/RIFCL_CLIK.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Pump Shotgun/SGSPEC1.ogg b/SOUNDS/COMBAT/WEAPONS/Pump Shotgun/SGSPEC1.ogg
deleted file mode 100644
index 6d27e93a28..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Pump Shotgun/SGSPEC1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/RFGLLCH.ogg b/SOUNDS/COMBAT/WEAPONS/RFGLLCH.ogg
deleted file mode 100644
index 5933db8586..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/RFGLLCH.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/RLANSHOT.ogg b/SOUNDS/COMBAT/WEAPONS/RLANSHOT.ogg
deleted file mode 100644
index 0a47d31930..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/RLANSHOT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/RLFIRE.ogg b/SOUNDS/COMBAT/WEAPONS/RLFIRE.ogg
deleted file mode 100644
index 99da7abb7b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/RLFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/RLREADY.ogg b/SOUNDS/COMBAT/WEAPONS/RLREADY.ogg
deleted file mode 100644
index 914756034a..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/RLREADY.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Traditional Rocket/0SRFIRE1.ogg b/SOUNDS/COMBAT/WEAPONS/Railgun/0SRFIRE1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Traditional Rocket/0SRFIRE1.ogg
rename to SOUNDS/COMBAT/WEAPONS/Railgun/0SRFIRE1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Traditional Rocket/0SRFIRE2.ogg b/SOUNDS/COMBAT/WEAPONS/Railgun/0SRFIRE2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Traditional Rocket/0SRFIRE2.ogg
rename to SOUNDS/COMBAT/WEAPONS/Railgun/0SRFIRE2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Railgun/misc/Railgun_Inspect_3.ogg b/SOUNDS/COMBAT/WEAPONS/Railgun/misc/Railgun_Inspect_3.ogg
deleted file mode 100644
index e238604587..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Railgun/misc/Railgun_Inspect_3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Rev Gun/revgun.ogg b/SOUNDS/COMBAT/WEAPONS/Rev Gun/revgun.ogg
deleted file mode 100644
index 2427ec1a74..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rev Gun/revgun.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTBOOM.ogg b/SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTBOOM.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTBOOM.ogg
rename to SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTBOOM.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTSTOP.ogg b/SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTSTOP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTSTOP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTSTOP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTWHIZ.ogg b/SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTWHIZ.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Rev Gun/REVTWHIZ.ogg
rename to SOUNDS/COMBAT/WEAPONS/Revenant Rune/REVTWHIZ.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/ASDFASDFRL_LoadingMechanism2.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/ASDFASDFRL_LoadingMechanism2.ogg
deleted file mode 100644
index 91a96e6281..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/ASDFASDFRL_LoadingMechanism2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RELOADRL.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RELOADRL.ogg
deleted file mode 100644
index 12c80c9a28..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RELOADRL.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/RLANDRAW.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLANDRAW.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/RLANDRAW.ogg
rename to SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLANDRAW.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSHOT2.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSHOT2.ogg
deleted file mode 100644
index da047d542e..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSHOT2.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSPCL1.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSPCL1.ogg
deleted file mode 100644
index ad440d91ff..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/RLSPCL1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ROCKPKUP.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/ROCKPKUP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ROCKPKUP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Rocket Launcher/ROCKPKUP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/SEEKER.ogg b/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/SEEKER.ogg
deleted file mode 100644
index 80b6e9ec31..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Rocket Launcher/SEEKER.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLCYCL.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLCYCL.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLCYCL.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLCYCL.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC1.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLINC1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC1.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLINC1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC2.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLINC2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC2.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLINC2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC3.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLINC3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC3.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLINC3.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC4.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLINC4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLINC4.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLINC4.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLRSP1.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLRSP1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLRSP1.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLRSP1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLRSP2.ogg b/SOUNDS/COMBAT/WEAPONS/SGL/SGLRSP2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Grenade Launchers/SGLRSP2.ogg
rename to SOUNDS/COMBAT/WEAPONS/SGL/SGLRSP2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/SSG/SSGIN.ogg b/SOUNDS/COMBAT/WEAPONS/SSG/SSGIN.ogg
deleted file mode 100644
index 7e66a55fa1..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/SSG/SSGIN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/SSG/SSGOPEN.ogg b/SOUNDS/COMBAT/WEAPONS/SSG/SSGOPEN.ogg
deleted file mode 100644
index 64f9d2ba50..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/SSG/SSGOPEN.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWCUT.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWCUT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWCUT.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWCUT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFL2.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWFL2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFL2.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWFL2.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFUL.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWFUL.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWFUL.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWFUL.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWREDY.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWREDY.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWREDY.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWREDY.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/CSAWSTAT.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWSTAT.ogg
deleted file mode 100644
index 01f23fbddb..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/CSAWSTAT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSTRT.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWSTRT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSTRT.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWSTRT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSW1.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/CSAWSW1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/ChainsawV2/CSAWSW1.ogg
rename to SOUNDS/COMBAT/WEAPONS/Saw/CSAWSW1.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWDIE.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWDIE.ogg
deleted file mode 100644
index c628fcc8bc..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWDIE.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL.ogg
deleted file mode 100644
index 9228f829c9..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL333.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL333.ogg
deleted file mode 100644
index e7725fe72d..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWFUL333.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWHIT.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWHIT.ogg
deleted file mode 100644
index ab174768f1..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWHIT.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWUP.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWUP.ogg
index bc40953be5..f4e77e3b4e 100644
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWUP.ogg and b/SOUNDS/COMBAT/WEAPONS/Saw/DSSAWUP.ogg differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Saw/sawswing.ogg b/SOUNDS/COMBAT/WEAPONS/Saw/sawswing.ogg
deleted file mode 100644
index 2f16e296ec..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Saw/sawswing.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN1.ogg b/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN1.ogg
deleted file mode 100644
index 530c33f255..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN1.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN2.ogg b/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN2.ogg
deleted file mode 100644
index a8db1eb80b..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/Slash/KNIFSWN2.ogg and /dev/null differ
diff --git a/SOUNDS/BATTERY.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BATTERY.ogg
similarity index 100%
rename from SOUNDS/BATTERY.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BATTERY.ogg
diff --git a/SOUNDS/BEP.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BEP.ogg
similarity index 100%
rename from SOUNDS/BEP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BEP.ogg
diff --git a/SOUNDS/BEPBEP.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BEPBEP.ogg
similarity index 100%
rename from SOUNDS/BEPBEP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/BEPBEP.ogg
diff --git a/SOUNDS/CELLPKUP.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/CELLPKUP.ogg
similarity index 100%
rename from SOUNDS/CELLPKUP.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/CELLPKUP.ogg
diff --git a/SOUNDS/CELL_PAK.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/CELL_PAK.ogg
similarity index 100%
rename from SOUNDS/CELL_PAK.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/CELL_PAK.ogg
diff --git a/SOUNDS/PLSCOOL.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSCOOL.ogg
similarity index 100%
rename from SOUNDS/PLSCOOL.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSCOOL.ogg
diff --git a/SOUNDS/PLSDRAW.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSDRAW.ogg
similarity index 100%
rename from SOUNDS/PLSDRAW.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSDRAW.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/PLSFULL.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSFULL.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/PLSFULL.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSFULL.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/PLSM9.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSM9.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/PLSM9.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSM9.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/PLSTHRW.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSTHRW.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/PLSTHRW.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSTHRW.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/PLSULT.ogg b/SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSULT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/PLSULT.ogg
rename to SOUNDS/COMBAT/WEAPONS/Various plasma sounds/PLSULT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/plsm4.ogg b/SOUNDS/COMBAT/WEAPONS/plsm4.ogg
deleted file mode 100644
index 2682ac82db..0000000000
Binary files a/SOUNDS/COMBAT/WEAPONS/plsm4.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/dsbfgfir.ogg b/SOUNDS/COMBAT/dsbfgfir.ogg
deleted file mode 100644
index 74a077a2a6..0000000000
Binary files a/SOUNDS/COMBAT/dsbfgfir.ogg and /dev/null differ
diff --git a/SOUNDS/D2SSECRET.ogg b/SOUNDS/D2SSECRET.ogg
deleted file mode 100644
index 0ecb7810d8..0000000000
Binary files a/SOUNDS/D2SSECRET.ogg and /dev/null differ
diff --git a/SOUNDS/DSGETPOW.ogg b/SOUNDS/DSGETPOW.ogg
deleted file mode 100644
index 9879e52ff0..0000000000
Binary files a/SOUNDS/DSGETPOW.ogg and /dev/null differ
diff --git a/SOUNDS/DSONFIRE.ogg b/SOUNDS/DSONFIRE.ogg
deleted file mode 100644
index 5ade2a2725..0000000000
Binary files a/SOUNDS/DSONFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/DSPLPAIN.ogg b/SOUNDS/DSPLPAIN.ogg
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/SOUNDS/DSRADIO.ogg b/SOUNDS/DSRADIO.ogg
deleted file mode 100644
index a02169a34d..0000000000
Binary files a/SOUNDS/DSRADIO.ogg and /dev/null differ
diff --git a/SOUNDS/CLIMB_1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/CLIMB_1.ogg
similarity index 100%
rename from SOUNDS/CLIMB_1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/CLIMB_1.ogg
diff --git a/SOUNDS/CLIMB_2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/CLIMB_2.ogg
similarity index 100%
rename from SOUNDS/CLIMB_2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/CLIMB_2.ogg
diff --git a/SOUNDS/WORLD/DSSIZLS.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/DSSIZLS.ogg
similarity index 100%
rename from SOUNDS/WORLD/DSSIZLS.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Climb/DSSIZLS.ogg
diff --git a/SOUNDS/HD/DSPUNCH.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSPUNCH.ogg
similarity index 100%
rename from SOUNDS/HD/DSPUNCH.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSPUNCH.ogg
diff --git a/SOUNDS/COMBAT/DSPUNCH2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSPUNCH2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/DSPUNCH2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSPUNCH2.ogg
diff --git a/SOUNDS/HD/DSSKEPCH.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSSKEPCH.ogg
similarity index 100%
rename from SOUNDS/HD/DSSKEPCH.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSSKEPCH.ogg
diff --git a/SOUNDS/COMBAT/DSSWING.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSSWING.ogg
similarity index 100%
rename from SOUNDS/COMBAT/DSSWING.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/DSSWING.ogg
diff --git a/SOUNDS/KNUCKLED.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/KNUCKLED.ogg
similarity index 100%
rename from SOUNDS/KNUCKLED.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/KNUCKLED.ogg
diff --git a/SOUNDS/COMBAT/fstatk1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/fstatk1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk1.ogg
diff --git a/SOUNDS/COMBAT/fstatk2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/fstatk2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk2.ogg
diff --git a/SOUNDS/COMBAT/fstatk3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/fstatk3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/fstatk3.ogg
diff --git a/SOUNDS/COMBAT/plspnch1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch1.ogg
diff --git a/SOUNDS/COMBAT/plspnch2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch2.ogg
diff --git a/SOUNDS/COMBAT/plspnch3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch3.ogg
diff --git a/SOUNDS/COMBAT/plspnch4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch4.ogg
diff --git a/SOUNDS/COMBAT/plspnch5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch5.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch5.ogg
diff --git a/SOUNDS/COMBAT/plspnch6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch6.ogg
similarity index 100%
rename from SOUNDS/COMBAT/plspnch6.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Fists/plspnch6.ogg
diff --git a/SOUNDS/Misc/DSKNIFE.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP1.ogg
similarity index 57%
rename from SOUNDS/Misc/DSKNIFE.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP1.ogg
index bc3f8a2680..cedbc88ff7 100644
Binary files a/SOUNDS/Misc/DSKNIFE.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP1.ogg differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSGRCLOS.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP2.ogg
similarity index 65%
rename from SOUNDS/COMBAT/WEAPONS/DSGRCLOS.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP2.ogg
index 0de75cb59e..6543a835b2 100644
Binary files a/SOUNDS/COMBAT/WEAPONS/DSGRCLOS.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP3.ogg
new file mode 100644
index 0000000000..61f04f87a6
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSCARP3.ogg differ
diff --git a/SOUNDS/DSGRBNCE.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT1.ogg
similarity index 60%
rename from SOUNDS/DSGRBNCE.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT1.ogg
index 6e606bdfd2..0ad568f0c5 100644
Binary files a/SOUNDS/DSGRBNCE.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT1.ogg differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DSGROPEN.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT2.ogg
similarity index 57%
rename from SOUNDS/COMBAT/WEAPONS/DSGROPEN.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT2.ogg
index ae7b9b3cc5..8e1bbbbcea 100644
Binary files a/SOUNDS/COMBAT/WEAPONS/DSGROPEN.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT3.ogg
new file mode 100644
index 0000000000..ae0cd14455
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT3.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT4.ogg
new file mode 100644
index 0000000000..33fb80b6d5
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT4.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT5.ogg
new file mode 100644
index 0000000000..b5e7eb1b57
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT5.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT6.ogg
new file mode 100644
index 0000000000..b25a74c195
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSDIRT6.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV1.ogg
new file mode 100644
index 0000000000..6ece010fb8
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV1.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV2.ogg
new file mode 100644
index 0000000000..6a517cc4e4
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV3.ogg
new file mode 100644
index 0000000000..5b3bdbf487
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV3.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV4.ogg
new file mode 100644
index 0000000000..e113ccd268
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSGRAV4.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD1.ogg
new file mode 100644
index 0000000000..fca80b0a96
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD1.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD2.ogg
new file mode 100644
index 0000000000..5101f610cc
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD3.ogg
new file mode 100644
index 0000000000..ff1dfb1636
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD3.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD4.ogg
new file mode 100644
index 0000000000..f8e967e256
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD4.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD5.ogg
new file mode 100644
index 0000000000..41cff11d33
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD5.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD6.ogg
new file mode 100644
index 0000000000..4845cefb80
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSHARD6.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET01.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET01.ogg
new file mode 100644
index 0000000000..b8de7f91f9
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET01.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET02.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET02.ogg
new file mode 100644
index 0000000000..941cfcc169
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET02.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET03.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET03.ogg
new file mode 100644
index 0000000000..26bd63b110
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET03.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET04.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET04.ogg
new file mode 100644
index 0000000000..417f1ba62a
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET04.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET05.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET05.ogg
new file mode 100644
index 0000000000..0aaef707fc
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET05.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET06.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET06.ogg
new file mode 100644
index 0000000000..3fa06d7803
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET06.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET201.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET201.ogg
new file mode 100644
index 0000000000..0d5aa3e255
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET201.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET202.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET202.ogg
new file mode 100644
index 0000000000..209e463c87
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET202.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET203.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET203.ogg
new file mode 100644
index 0000000000..8720c6d69f
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET203.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET204.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET204.ogg
new file mode 100644
index 0000000000..42b4566229
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSMET204.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK1.ogg
new file mode 100644
index 0000000000..75edf7e56b
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK1.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK2.ogg
new file mode 100644
index 0000000000..2789df23e5
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK2.ogg differ
diff --git a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLPK.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK3.ogg
similarity index 53%
rename from SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLPK.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK3.ogg
index da9a90d374..e82640c252 100644
Binary files a/SOUNDS/COMBAT/WEAPONS/Demon Tech/HELLPK.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK3.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK4.ogg
new file mode 100644
index 0000000000..ce55052b4c
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK4.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK5.ogg
new file mode 100644
index 0000000000..ceccbcd728
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK5.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK6.ogg
new file mode 100644
index 0000000000..f317e46408
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK6.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK7.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK7.ogg
new file mode 100644
index 0000000000..95c9e68742
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK7.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK8.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK8.ogg
new file mode 100644
index 0000000000..734bfe02b1
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSROCK8.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW1.ogg
new file mode 100644
index 0000000000..a3c9202eb2
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW1.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW2.ogg
new file mode 100644
index 0000000000..1cb2207d3a
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW3.ogg
new file mode 100644
index 0000000000..5599abc3e4
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW3.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW4.ogg
new file mode 100644
index 0000000000..d9bc31c970
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW4.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW5.ogg
new file mode 100644
index 0000000000..d772547096
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW5.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW6.ogg
new file mode 100644
index 0000000000..76234c1516
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSSNOW6.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE01.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE01.ogg
new file mode 100644
index 0000000000..bde72b4142
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE01.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE02.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE02.ogg
new file mode 100644
index 0000000000..8fe6ec0f53
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE02.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE03.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE03.ogg
new file mode 100644
index 0000000000..143901681a
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE03.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE04.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE04.ogg
new file mode 100644
index 0000000000..14a567a0dd
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE04.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE05.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE05.ogg
new file mode 100644
index 0000000000..5ed0af4250
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE05.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE06.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE06.ogg
new file mode 100644
index 0000000000..1f3687af50
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE06.ogg differ
diff --git a/SOUNDS/DSASHTBT.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE21.ogg
similarity index 52%
rename from SOUNDS/DSASHTBT.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE21.ogg
index 576ad8ccf6..36b5215667 100644
Binary files a/SOUNDS/DSASHTBT.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE21.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE22.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE22.ogg
new file mode 100644
index 0000000000..0c9b3124d3
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE22.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE23.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE23.ogg
new file mode 100644
index 0000000000..a6111a82b4
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE23.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE24.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE24.ogg
new file mode 100644
index 0000000000..c313e0068a
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE24.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE25.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE25.ogg
new file mode 100644
index 0000000000..f7a97de5fa
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE25.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE26.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE26.ogg
new file mode 100644
index 0000000000..7c59402640
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE26.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE27.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE27.ogg
new file mode 100644
index 0000000000..9155c2b57f
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE27.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE28.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE28.ogg
new file mode 100644
index 0000000000..3b30e5d232
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSTILE28.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD1.ogg
new file mode 100644
index 0000000000..4c5998c064
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD1.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD2.ogg
new file mode 100644
index 0000000000..e77835e0bc
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD2.ogg differ
diff --git a/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD3.ogg
new file mode 100644
index 0000000000..b950cc58dd
Binary files /dev/null and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD3.ogg differ
diff --git a/SOUNDS/MARINES/DSMAPAIN.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD4.ogg
similarity index 56%
rename from SOUNDS/MARINES/DSMAPAIN.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD4.ogg
index 6ff8111b9d..039a4e233d 100644
Binary files a/SOUNDS/MARINES/DSMAPAIN.ogg and b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Footsteps sounds/DSWOOD4.ogg differ
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/HLMTBEP.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTBEP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DMR/HLMTBEP.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTBEP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/HLMTBPP.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTBPP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DMR/HLMTBPP.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTBPP.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DMR/HLMTPUT.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTPUT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DMR/HLMTPUT.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Helmet/HLMTPUT.ogg
diff --git a/SOUNDS/WORLD/jmpland1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland1.ogg
similarity index 100%
rename from SOUNDS/WORLD/jmpland1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland1.ogg
diff --git a/SOUNDS/WORLD/jmpland2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland2.ogg
similarity index 100%
rename from SOUNDS/WORLD/jmpland2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland2.ogg
diff --git a/SOUNDS/WORLD/jmpland3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland3.ogg
similarity index 100%
rename from SOUNDS/WORLD/jmpland3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland3.ogg
diff --git a/SOUNDS/WORLD/jmpland4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland4.ogg
similarity index 100%
rename from SOUNDS/WORLD/jmpland4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland4.ogg
diff --git a/SOUNDS/WORLD/jmpland5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland5.ogg
similarity index 100%
rename from SOUNDS/WORLD/jmpland5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Jump/jmpland5.ogg
diff --git a/SOUNDS/COMBAT/FOOTWALL.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/FOOTWALL.ogg
similarity index 100%
rename from SOUNDS/COMBAT/FOOTWALL.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/FOOTWALL.ogg
diff --git a/SOUNDS/COMBAT/KICK.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/KICK.ogg
similarity index 100%
rename from SOUNDS/COMBAT/KICK.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/KICK.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDEND1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDEND1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDEND1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDEND1.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDEND2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDEND2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDEND2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDEND2.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP1.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP2.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP3.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDLUP4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDLUP4.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR1.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR2.ogg
diff --git a/SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/SLIDEKICKS/SLIDSTR3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Sounds/Kick/SLIDSTR3.ogg
diff --git a/SOUNDS/DOOMGUY/BIGSCREA.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/BIGSCREA.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/BIGSCREA.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/BIGSCREA.ogg
diff --git a/SOUNDS/DOOMGUY/DBLJUMP.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DBLJUMP.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DBLJUMP.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DBLJUMP.ogg
diff --git a/SOUNDS/DOOMGUY/DSFDTHE.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSFDTHE.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSFDTHE.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSFDTHE.ogg
diff --git a/SOUNDS/DOOMGUY/DSFDTHG.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSFDTHG.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSFDTHG.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSFDTHG.ogg
diff --git a/SOUNDS/DSGRNT.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSGRNT.ogg
similarity index 100%
rename from SOUNDS/DSGRNT.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSGRNT.ogg
diff --git a/SOUNDS/DOOMGUY/DSJUMP1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSJUMP1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP1.ogg
diff --git a/SOUNDS/DOOMGUY/DSJUMP2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSJUMP2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP2.ogg
diff --git a/SOUNDS/DOOMGUY/DSJUMP3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP3.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSJUMP3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP3.ogg
diff --git a/SOUNDS/DOOMGUY/DSJUMP4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP4.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSJUMP4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSJUMP4.ogg
diff --git a/SOUNDS/DOOMGUY/DSNOWAY.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSNOWAY.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSNOWAY.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSNOWAY.ogg
diff --git a/SOUNDS/DOOMGUY/DSOOF.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSOOF.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/DSOOF.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSOOF.ogg
diff --git a/SOUNDS/HD/DSPDIEHI.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPDIEHI.ogg
similarity index 100%
rename from SOUNDS/HD/DSPDIEHI.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPDIEHI.ogg
diff --git a/SOUNDS/HD/DSPLDETH.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPLDETH.ogg
similarity index 100%
rename from SOUNDS/HD/DSPLDETH.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPLDETH.ogg
diff --git a/SOUNDS/HD/DSPLPAIN.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPLPAIN.ogg
similarity index 100%
rename from SOUNDS/HD/DSPLPAIN.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSPLPAIN.ogg
diff --git a/SOUNDS/DSSALUTE.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSSALUTE.ogg
similarity index 100%
rename from SOUNDS/DSSALUTE.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSSALUTE.ogg
diff --git a/SOUNDS/DSTAUNT.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSTAUNT.ogg
similarity index 100%
rename from SOUNDS/DSTAUNT.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/DSTAUNT.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK1.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK2.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK3.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK3.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK4.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK4.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK5.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK5.ogg
diff --git a/SOUNDS/DOOMGUY/FUCK6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK6.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/FUCK6.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/FUCK6.ogg
diff --git a/SOUNDS/DOOMGUY/IGOTSAW.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/IGOTSAW.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/IGOTSAW.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/IGOTSAW.ogg
diff --git a/SOUNDS/DOOMGUY/JMPBOT1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/JMPBOT1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/JMPBOT1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/JMPBOT1.ogg
diff --git a/SOUNDS/DOOMGUY/JMPBOT2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/JMPBOT2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/JMPBOT2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/JMPBOT2.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN01.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN01.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN01.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN01.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN02.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN02.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN02.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN02.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN03.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN03.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN03.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN03.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN04.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN04.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN04.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN04.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN05.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN05.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN05.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN05.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN06.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN06.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN06.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN06.ogg
diff --git a/SOUNDS/DOOMGUY/MTAUN07.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN07.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/MTAUN07.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/MTAUN07.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN01.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN01.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN01.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN01.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN02.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN02.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN02.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN02.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN03.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN03.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN03.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN03.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN04.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN04.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN04.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN04.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN05.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN05.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN05.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN05.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN06.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN06.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN06.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN06.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN07.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN07.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN07.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN07.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN08.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN08.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN08.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN08.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN09.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN09.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN09.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN09.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN10.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN10.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN10.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN10.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN11.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN11.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN11.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN11.ogg
diff --git a/SOUNDS/DOOMGUY/ONELIN12.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN12.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/ONELIN12.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/ONELIN12.ogg
diff --git a/SOUNDS/DOOMGUY/PA1N2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PA1N2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N2.ogg
diff --git a/SOUNDS/DOOMGUY/PA1N5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N5.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PA1N5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N5.ogg
diff --git a/SOUNDS/DOOMGUY/PA1N6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N6.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PA1N6.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PA1N6.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN1.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN2.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN3.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN3.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN4.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN4.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN5.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN5.ogg
diff --git a/SOUNDS/DOOMGUY/PAIN6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN6.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PAIN6.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PAIN6.ogg
diff --git a/SOUNDS/DOOMGUY/PIKUPTALK1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PIKUPTALK1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PIKUPTALK1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PIKUPTALK1.ogg
diff --git a/SOUNDS/DOOMGUY/PIKUPTALK2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PIKUPTALK2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/PIKUPTALK2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/PIKUPTALK2.ogg
diff --git a/SOUNDS/DOOMGUY/SMASH.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/SMASH.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/SMASH.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/SMASH.ogg
diff --git a/SOUNDS/TAUNT.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT.ogg
similarity index 100%
rename from SOUNDS/TAUNT.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT01.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT01.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT01.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT01.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT02.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT02.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT02.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT02.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT03.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT03.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT03.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT03.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT04.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT04.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT04.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT04.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT05.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT05.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT05.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT05.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT06.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT06.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT06.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT06.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT07.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT07.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT07.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT07.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT08.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT08.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT08.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT08.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT09.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT09.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT09.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT09.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT10.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT10.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT10.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT10.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT11.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT11.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT11.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT11.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT12.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT12.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT12.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT12.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT13.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT13.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT13.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT13.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT14.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT14.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT14.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT14.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT15.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT15.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT15.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT15.ogg
diff --git a/SOUNDS/DOOMGUY/TAUNT16.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT16.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/TAUNT16.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/TAUNT16.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland1.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland1.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland1.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland1.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland2.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland2.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland2.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland2.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland3.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland3.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland3.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland3.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland4.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland4.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland4.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland4.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland5.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland5.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland5.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland5.ogg
diff --git a/SOUNDS/DOOMGUY/jmpland6.ogg b/SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland6.ogg
similarity index 100%
rename from SOUNDS/DOOMGUY/jmpland6.ogg
rename to SOUNDS/Doomguy and Marines/DOOMGUY/Voice/jmpland6.ogg
diff --git a/SOUNDS/DSTINK.ogg b/SOUNDS/Doomguy and Marines/MARINES/DSTINK.ogg
similarity index 100%
rename from SOUNDS/DSTINK.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/DSTINK.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRP1.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP1.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRP1.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP1.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRP2.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP2.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRP2.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP2.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRP3.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP3.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRP3.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRP3.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT01.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT01.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT01.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT01.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT02.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT02.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT02.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT02.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT03.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT03.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT03.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT03.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT04.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT04.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT04.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT04.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT05.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT05.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT05.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT05.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT06.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT06.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT06.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT06.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT07.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT07.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT07.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT07.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT08.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT08.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT08.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT08.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT09.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT09.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT09.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT09.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT10.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT10.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT10.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT10.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT11.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT11.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT11.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT11.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT12.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT12.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT12.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT12.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT13.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT13.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT13.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT13.ogg
diff --git a/SOUNDS/MARINES/TORTURE/CPTRT14.ogg b/SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT14.ogg
similarity index 100%
rename from SOUNDS/MARINES/TORTURE/CPTRT14.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Torment/CPTRT14.ogg
diff --git a/SOUNDS/MARINES/DSMADTH1.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH1.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH1.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH1.ogg
diff --git a/SOUNDS/MARINES/DSMADTH2.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH2.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH2.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH2.ogg
diff --git a/SOUNDS/MARINES/DSMADTH3.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH3.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH3.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH3.ogg
diff --git a/SOUNDS/MARINES/DSMADTH4.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH4.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH4.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH4.ogg
diff --git a/SOUNDS/MARINES/DSMADTH5.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH5.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH5.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH5.ogg
diff --git a/SOUNDS/MARINES/DSMADTH6.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH6.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH6.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH6.ogg
diff --git a/SOUNDS/MARINES/DSMADTH7.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH7.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH7.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH7.ogg
diff --git a/SOUNDS/MARINES/DSMADTH8.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH8.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH8.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH8.ogg
diff --git a/SOUNDS/MARINES/DSMADTH9.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH9.ogg
similarity index 100%
rename from SOUNDS/MARINES/DSMADTH9.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/DSMADTH9.ogg
diff --git a/SOUNDS/MARINES/MRNAT1.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT1.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT1.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT1.ogg
diff --git a/SOUNDS/MARINES/MRNAT2.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT2.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT2.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT2.ogg
diff --git a/SOUNDS/MARINES/MRNAT3.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT3.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT3.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT3.ogg
diff --git a/SOUNDS/MARINES/MRNAT4.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT4.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT4.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT4.ogg
diff --git a/SOUNDS/MARINES/MRNAT5.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT5.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT5.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT5.ogg
diff --git a/SOUNDS/MARINES/MRNAT6.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT6.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNAT6.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNAT6.ogg
diff --git a/SOUNDS/MARINES/MRNWC1.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC1.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC1.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC1.ogg
diff --git a/SOUNDS/MARINES/MRNWC2.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC2.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC2.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC2.ogg
diff --git a/SOUNDS/MARINES/MRNWC3.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC3.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC3.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC3.ogg
diff --git a/SOUNDS/MARINES/MRNWC4.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC4.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC4.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC4.ogg
diff --git a/SOUNDS/MARINES/MRNWC5.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC5.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC5.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC5.ogg
diff --git a/SOUNDS/MARINES/MRNWC6.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC6.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWC6.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWC6.ogg
diff --git a/SOUNDS/MARINES/MRNWT1.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT1.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWT1.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT1.ogg
diff --git a/SOUNDS/MARINES/MRNWT2.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT2.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWT2.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT2.ogg
diff --git a/SOUNDS/MARINES/MRNWT3.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT3.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWT3.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT3.ogg
diff --git a/SOUNDS/MARINES/MRNWT4.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT4.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWT4.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT4.ogg
diff --git a/SOUNDS/MARINES/MRNWT5.ogg b/SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT5.ogg
similarity index 100%
rename from SOUNDS/MARINES/MRNWT5.ogg
rename to SOUNDS/Doomguy and Marines/MARINES/Voice/MRNWT5.ogg
diff --git a/SOUNDS/GORE/BHIT1.ogg b/SOUNDS/GORE/Gore/BHIT1.ogg
similarity index 100%
rename from SOUNDS/GORE/BHIT1.ogg
rename to SOUNDS/GORE/Gore/BHIT1.ogg
diff --git a/SOUNDS/GORE/BHIT2.ogg b/SOUNDS/GORE/Gore/BHIT2.ogg
similarity index 100%
rename from SOUNDS/GORE/BHIT2.ogg
rename to SOUNDS/GORE/Gore/BHIT2.ogg
diff --git a/SOUNDS/GORE/BHIT3.ogg b/SOUNDS/GORE/Gore/BHIT3.ogg
similarity index 100%
rename from SOUNDS/GORE/BHIT3.ogg
rename to SOUNDS/GORE/Gore/BHIT3.ogg
diff --git a/SOUNDS/GORE/BHIT4.ogg b/SOUNDS/GORE/Gore/BHIT4.ogg
similarity index 100%
rename from SOUNDS/GORE/BHIT4.ogg
rename to SOUNDS/GORE/Gore/BHIT4.ogg
diff --git a/SOUNDS/GORE/BHIT5.ogg b/SOUNDS/GORE/Gore/BHIT5.ogg
similarity index 100%
rename from SOUNDS/GORE/BHIT5.ogg
rename to SOUNDS/GORE/Gore/BHIT5.ogg
diff --git a/SOUNDS/GORE/BLODDROP.ogg b/SOUNDS/GORE/Gore/BLODDROP.ogg
similarity index 100%
rename from SOUNDS/GORE/BLODDROP.ogg
rename to SOUNDS/GORE/Gore/BLODDROP.ogg
diff --git a/SOUNDS/GORE/BLT_FLS1.ogg b/SOUNDS/GORE/Gore/BLT_FLS1.ogg
similarity index 100%
rename from SOUNDS/GORE/BLT_FLS1.ogg
rename to SOUNDS/GORE/Gore/BLT_FLS1.ogg
diff --git a/SOUNDS/GORE/BLT_FLS2.ogg b/SOUNDS/GORE/Gore/BLT_FLS2.ogg
similarity index 100%
rename from SOUNDS/GORE/BLT_FLS2.ogg
rename to SOUNDS/GORE/Gore/BLT_FLS2.ogg
diff --git a/SOUNDS/GORE/BLT_FLS3.ogg b/SOUNDS/GORE/Gore/BLT_FLS3.ogg
similarity index 100%
rename from SOUNDS/GORE/BLT_FLS3.ogg
rename to SOUNDS/GORE/Gore/BLT_FLS3.ogg
diff --git a/SOUNDS/GORE/BMHESHT.ogg b/SOUNDS/GORE/Gore/BMHESHT.ogg
similarity index 100%
rename from SOUNDS/GORE/BMHESHT.ogg
rename to SOUNDS/GORE/Gore/BMHESHT.ogg
diff --git a/SOUNDS/GORE/BODYF1.ogg b/SOUNDS/GORE/Gore/BODYF1.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF1.ogg
rename to SOUNDS/GORE/Gore/BODYF1.ogg
diff --git a/SOUNDS/GORE/BODYF2.ogg b/SOUNDS/GORE/Gore/BODYF2.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF2.ogg
rename to SOUNDS/GORE/Gore/BODYF2.ogg
diff --git a/SOUNDS/GORE/BODYF3.ogg b/SOUNDS/GORE/Gore/BODYF3.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF3.ogg
rename to SOUNDS/GORE/Gore/BODYF3.ogg
diff --git a/SOUNDS/GORE/BODYF4.ogg b/SOUNDS/GORE/Gore/BODYF4.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF4.ogg
rename to SOUNDS/GORE/Gore/BODYF4.ogg
diff --git a/SOUNDS/GORE/BODYF5.ogg b/SOUNDS/GORE/Gore/BODYF5.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF5.ogg
rename to SOUNDS/GORE/Gore/BODYF5.ogg
diff --git a/SOUNDS/GORE/BODYF6.ogg b/SOUNDS/GORE/Gore/BODYF6.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF6.ogg
rename to SOUNDS/GORE/Gore/BODYF6.ogg
diff --git a/SOUNDS/GORE/BODYF7.ogg b/SOUNDS/GORE/Gore/BODYF7.ogg
similarity index 100%
rename from SOUNDS/GORE/BODYF7.ogg
rename to SOUNDS/GORE/Gore/BODYF7.ogg
diff --git a/SOUNDS/GORE/BONEBRK1.ogg b/SOUNDS/GORE/Gore/BONEBRK1.ogg
similarity index 100%
rename from SOUNDS/GORE/BONEBRK1.ogg
rename to SOUNDS/GORE/Gore/BONEBRK1.ogg
diff --git a/SOUNDS/GORE/BONEBRK2.ogg b/SOUNDS/GORE/Gore/BONEBRK2.ogg
similarity index 100%
rename from SOUNDS/GORE/BONEBRK2.ogg
rename to SOUNDS/GORE/Gore/BONEBRK2.ogg
diff --git a/SOUNDS/GORE/BONEBRK3.ogg b/SOUNDS/GORE/Gore/BONEBRK3.ogg
similarity index 100%
rename from SOUNDS/GORE/BONEBRK3.ogg
rename to SOUNDS/GORE/Gore/BONEBRK3.ogg
diff --git a/SOUNDS/GORE/DEMONSMOKE.ogg b/SOUNDS/GORE/Gore/DEMONSMOKE.ogg
similarity index 100%
rename from SOUNDS/GORE/DEMONSMOKE.ogg
rename to SOUNDS/GORE/Gore/DEMONSMOKE.ogg
diff --git a/SOUNDS/DSBLUD01.ogg b/SOUNDS/GORE/Gore/DSBLUD01.ogg
similarity index 100%
rename from SOUNDS/DSBLUD01.ogg
rename to SOUNDS/GORE/Gore/DSBLUD01.ogg
diff --git a/SOUNDS/DSBLUD02.ogg b/SOUNDS/GORE/Gore/DSBLUD02.ogg
similarity index 100%
rename from SOUNDS/DSBLUD02.ogg
rename to SOUNDS/GORE/Gore/DSBLUD02.ogg
diff --git a/SOUNDS/DSBLUD03.ogg b/SOUNDS/GORE/Gore/DSBLUD03.ogg
similarity index 100%
rename from SOUNDS/DSBLUD03.ogg
rename to SOUNDS/GORE/Gore/DSBLUD03.ogg
diff --git a/SOUNDS/GORE/DSDRIP1.ogg b/SOUNDS/GORE/Gore/DSDRIP1.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP1.ogg
rename to SOUNDS/GORE/Gore/DSDRIP1.ogg
diff --git a/SOUNDS/GORE/DSDRIP10.ogg b/SOUNDS/GORE/Gore/DSDRIP10.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP10.ogg
rename to SOUNDS/GORE/Gore/DSDRIP10.ogg
diff --git a/SOUNDS/GORE/DSDRIP2.ogg b/SOUNDS/GORE/Gore/DSDRIP2.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP2.ogg
rename to SOUNDS/GORE/Gore/DSDRIP2.ogg
diff --git a/SOUNDS/GORE/DSDRIP3.ogg b/SOUNDS/GORE/Gore/DSDRIP3.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP3.ogg
rename to SOUNDS/GORE/Gore/DSDRIP3.ogg
diff --git a/SOUNDS/GORE/DSDRIP4.ogg b/SOUNDS/GORE/Gore/DSDRIP4.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP4.ogg
rename to SOUNDS/GORE/Gore/DSDRIP4.ogg
diff --git a/SOUNDS/GORE/DSDRIP5.ogg b/SOUNDS/GORE/Gore/DSDRIP5.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP5.ogg
rename to SOUNDS/GORE/Gore/DSDRIP5.ogg
diff --git a/SOUNDS/GORE/DSDRIP6.ogg b/SOUNDS/GORE/Gore/DSDRIP6.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP6.ogg
rename to SOUNDS/GORE/Gore/DSDRIP6.ogg
diff --git a/SOUNDS/GORE/DSDRIP7.ogg b/SOUNDS/GORE/Gore/DSDRIP7.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP7.ogg
rename to SOUNDS/GORE/Gore/DSDRIP7.ogg
diff --git a/SOUNDS/GORE/DSDRIP8.ogg b/SOUNDS/GORE/Gore/DSDRIP8.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP8.ogg
rename to SOUNDS/GORE/Gore/DSDRIP8.ogg
diff --git a/SOUNDS/GORE/DSDRIP9.ogg b/SOUNDS/GORE/Gore/DSDRIP9.ogg
similarity index 100%
rename from SOUNDS/GORE/DSDRIP9.ogg
rename to SOUNDS/GORE/Gore/DSDRIP9.ogg
diff --git a/SOUNDS/GORE/DSINTG1.ogg b/SOUNDS/GORE/Gore/DSINTG1.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG1.ogg
rename to SOUNDS/GORE/Gore/DSINTG1.ogg
diff --git a/SOUNDS/GORE/DSINTG2ogg.ogg b/SOUNDS/GORE/Gore/DSINTG2.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG2ogg.ogg
rename to SOUNDS/GORE/Gore/DSINTG2.ogg
diff --git a/SOUNDS/GORE/DSINTG3.ogg b/SOUNDS/GORE/Gore/DSINTG3.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG3.ogg
rename to SOUNDS/GORE/Gore/DSINTG3.ogg
diff --git a/SOUNDS/GORE/DSINTG4.ogg b/SOUNDS/GORE/Gore/DSINTG4.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG4.ogg
rename to SOUNDS/GORE/Gore/DSINTG4.ogg
diff --git a/SOUNDS/GORE/DSINTG5.ogg b/SOUNDS/GORE/Gore/DSINTG5.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG5.ogg
rename to SOUNDS/GORE/Gore/DSINTG5.ogg
diff --git a/SOUNDS/GORE/DSINTG6.ogg b/SOUNDS/GORE/Gore/DSINTG6.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG6.ogg
rename to SOUNDS/GORE/Gore/DSINTG6.ogg
diff --git a/SOUNDS/GORE/DSINTG7.ogg b/SOUNDS/GORE/Gore/DSINTG7.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG7.ogg
rename to SOUNDS/GORE/Gore/DSINTG7.ogg
diff --git a/SOUNDS/GORE/DSINTG8.ogg b/SOUNDS/GORE/Gore/DSINTG8.ogg
similarity index 100%
rename from SOUNDS/GORE/DSINTG8.ogg
rename to SOUNDS/GORE/Gore/DSINTG8.ogg
diff --git a/SOUNDS/GORE/DSSLOP.ogg b/SOUNDS/GORE/Gore/DSSLOP.ogg
similarity index 100%
rename from SOUNDS/GORE/DSSLOP.ogg
rename to SOUNDS/GORE/Gore/DSSLOP.ogg
diff --git a/SOUNDS/GORE/DSSLOP1.ogg b/SOUNDS/GORE/Gore/DSSLOP1.ogg
similarity index 100%
rename from SOUNDS/GORE/DSSLOP1.ogg
rename to SOUNDS/GORE/Gore/DSSLOP1.ogg
diff --git a/SOUNDS/GORE/DSSLOP2.ogg b/SOUNDS/GORE/Gore/DSSLOP2.ogg
similarity index 100%
rename from SOUNDS/GORE/DSSLOP2.ogg
rename to SOUNDS/GORE/Gore/DSSLOP2.ogg
diff --git a/SOUNDS/GORE/DSSLOP3.ogg b/SOUNDS/GORE/Gore/DSSLOP3.ogg
similarity index 100%
rename from SOUNDS/GORE/DSSLOP3.ogg
rename to SOUNDS/GORE/Gore/DSSLOP3.ogg
diff --git a/SOUNDS/GORE/DSXDTH1A.ogg b/SOUNDS/GORE/Gore/DSXDTH1A.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1A.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1A.ogg
diff --git a/SOUNDS/GORE/DSXDTH1B.ogg b/SOUNDS/GORE/Gore/DSXDTH1B.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1B.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1B.ogg
diff --git a/SOUNDS/GORE/DSXDTH1C.ogg b/SOUNDS/GORE/Gore/DSXDTH1C.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1C.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1C.ogg
diff --git a/SOUNDS/GORE/DSXDTH1D.ogg b/SOUNDS/GORE/Gore/DSXDTH1D.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1D.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1D.ogg
diff --git a/SOUNDS/GORE/DSXDTH1E.ogg b/SOUNDS/GORE/Gore/DSXDTH1E.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1E.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1E.ogg
diff --git a/SOUNDS/GORE/DSXDTH1F.ogg b/SOUNDS/GORE/Gore/DSXDTH1F.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1F.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1F.ogg
diff --git a/SOUNDS/GORE/DSXDTH1G.ogg b/SOUNDS/GORE/Gore/DSXDTH1G.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1G.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1G.ogg
diff --git a/SOUNDS/GORE/DSXDTH1H.ogg b/SOUNDS/GORE/Gore/DSXDTH1H.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH1H.ogg
rename to SOUNDS/GORE/Gore/DSXDTH1H.ogg
diff --git a/SOUNDS/GORE/DSXDTH2A.ogg b/SOUNDS/GORE/Gore/DSXDTH2A.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2A.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2A.ogg
diff --git a/SOUNDS/GORE/DSXDTH2B.ogg b/SOUNDS/GORE/Gore/DSXDTH2B.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2B.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2B.ogg
diff --git a/SOUNDS/GORE/DSXDTH2C.ogg b/SOUNDS/GORE/Gore/DSXDTH2C.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2C.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2C.ogg
diff --git a/SOUNDS/GORE/DSXDTH2D.ogg b/SOUNDS/GORE/Gore/DSXDTH2D.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2D.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2D.ogg
diff --git a/SOUNDS/GORE/DSXDTH2E.ogg b/SOUNDS/GORE/Gore/DSXDTH2E.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2E.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2E.ogg
diff --git a/SOUNDS/GORE/DSXDTH2F.ogg b/SOUNDS/GORE/Gore/DSXDTH2F.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2F.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2F.ogg
diff --git a/SOUNDS/GORE/DSXDTH2G.ogg b/SOUNDS/GORE/Gore/DSXDTH2G.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2G.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2G.ogg
diff --git a/SOUNDS/GORE/DSXDTH2H.ogg b/SOUNDS/GORE/Gore/DSXDTH2H.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2H.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2H.ogg
diff --git a/SOUNDS/GORE/DSXDTH2I.ogg b/SOUNDS/GORE/Gore/DSXDTH2I.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2I.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2I.ogg
diff --git a/SOUNDS/GORE/DSXDTH2J.ogg b/SOUNDS/GORE/Gore/DSXDTH2J.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2J.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2J.ogg
diff --git a/SOUNDS/GORE/DSXDTH2K.ogg b/SOUNDS/GORE/Gore/DSXDTH2K.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2K.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2K.ogg
diff --git a/SOUNDS/GORE/DSXDTH2L.ogg b/SOUNDS/GORE/Gore/DSXDTH2L.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2L.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2L.ogg
diff --git a/SOUNDS/GORE/DSXDTH2M.ogg b/SOUNDS/GORE/Gore/DSXDTH2M.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2M.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2M.ogg
diff --git a/SOUNDS/GORE/DSXDTH2N.ogg b/SOUNDS/GORE/Gore/DSXDTH2N.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2N.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2N.ogg
diff --git a/SOUNDS/GORE/DSXDTH2O.ogg b/SOUNDS/GORE/Gore/DSXDTH2O.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH2O.ogg
rename to SOUNDS/GORE/Gore/DSXDTH2O.ogg
diff --git a/SOUNDS/GORE/DSXDTH3A.ogg b/SOUNDS/GORE/Gore/DSXDTH3A.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH3A.ogg
rename to SOUNDS/GORE/Gore/DSXDTH3A.ogg
diff --git a/SOUNDS/GORE/DSXDTH3B.ogg b/SOUNDS/GORE/Gore/DSXDTH3B.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH3B.ogg
rename to SOUNDS/GORE/Gore/DSXDTH3B.ogg
diff --git a/SOUNDS/GORE/DSXDTH3C.ogg b/SOUNDS/GORE/Gore/DSXDTH3C.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH3C.ogg
rename to SOUNDS/GORE/Gore/DSXDTH3C.ogg
diff --git a/SOUNDS/GORE/DSXDTH3D.ogg b/SOUNDS/GORE/Gore/DSXDTH3D.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH3D.ogg
rename to SOUNDS/GORE/Gore/DSXDTH3D.ogg
diff --git a/SOUNDS/GORE/DSXDTH3E.ogg b/SOUNDS/GORE/Gore/DSXDTH3E.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH3E.ogg
rename to SOUNDS/GORE/Gore/DSXDTH3E.ogg
diff --git a/SOUNDS/GORE/DSXDTH4A.ogg b/SOUNDS/GORE/Gore/DSXDTH4A.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4A.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4A.ogg
diff --git a/SOUNDS/GORE/DSXDTH4B.ogg b/SOUNDS/GORE/Gore/DSXDTH4B.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4B.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4B.ogg
diff --git a/SOUNDS/GORE/DSXDTH4C.ogg b/SOUNDS/GORE/Gore/DSXDTH4C.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4C.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4C.ogg
diff --git a/SOUNDS/GORE/DSXDTH4D.ogg b/SOUNDS/GORE/Gore/DSXDTH4D.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4D.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4D.ogg
diff --git a/SOUNDS/GORE/DSXDTH4E.ogg b/SOUNDS/GORE/Gore/DSXDTH4E.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4E.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4E.ogg
diff --git a/SOUNDS/GORE/DSXDTH4F.ogg b/SOUNDS/GORE/Gore/DSXDTH4F.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4F.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4F.ogg
diff --git a/SOUNDS/GORE/DSXDTH4G.ogg b/SOUNDS/GORE/Gore/DSXDTH4G.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4G.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4G.ogg
diff --git a/SOUNDS/GORE/DSXDTH4H.ogg b/SOUNDS/GORE/Gore/DSXDTH4H.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4H.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4H.ogg
diff --git a/SOUNDS/GORE/DSXDTH4I.ogg b/SOUNDS/GORE/Gore/DSXDTH4I.ogg
similarity index 100%
rename from SOUNDS/GORE/DSXDTH4I.ogg
rename to SOUNDS/GORE/Gore/DSXDTH4I.ogg
diff --git a/SOUNDS/GORE/EYEPULL1.ogg b/SOUNDS/GORE/Gore/EYEPULL1.ogg
similarity index 100%
rename from SOUNDS/GORE/EYEPULL1.ogg
rename to SOUNDS/GORE/Gore/EYEPULL1.ogg
diff --git a/SOUNDS/GORE/EYEPULL2.ogg b/SOUNDS/GORE/Gore/EYEPULL2.ogg
similarity index 100%
rename from SOUNDS/GORE/EYEPULL2.ogg
rename to SOUNDS/GORE/Gore/EYEPULL2.ogg
diff --git a/SOUNDS/GORE/HEDBON1.ogg b/SOUNDS/GORE/Gore/HEDBON1.ogg
similarity index 100%
rename from SOUNDS/GORE/HEDBON1.ogg
rename to SOUNDS/GORE/Gore/HEDBON1.ogg
diff --git a/SOUNDS/GORE/HEDBON2.ogg b/SOUNDS/GORE/Gore/HEDBON2.ogg
similarity index 100%
rename from SOUNDS/GORE/HEDBON2.ogg
rename to SOUNDS/GORE/Gore/HEDBON2.ogg
diff --git a/SOUNDS/GORE/HEDBON3.ogg b/SOUNDS/GORE/Gore/HEDBON3.ogg
similarity index 100%
rename from SOUNDS/GORE/HEDBON3.ogg
rename to SOUNDS/GORE/Gore/HEDBON3.ogg
diff --git a/SOUNDS/GORE/LQDRIP1.ogg b/SOUNDS/GORE/Gore/LQDRIP1.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP1.ogg
rename to SOUNDS/GORE/Gore/LQDRIP1.ogg
diff --git a/SOUNDS/GORE/LQDRIP10.ogg b/SOUNDS/GORE/Gore/LQDRIP10.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP10.ogg
rename to SOUNDS/GORE/Gore/LQDRIP10.ogg
diff --git a/SOUNDS/GORE/LQDRIP11.ogg b/SOUNDS/GORE/Gore/LQDRIP11.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP11.ogg
rename to SOUNDS/GORE/Gore/LQDRIP11.ogg
diff --git a/SOUNDS/GORE/LQDRIP12.ogg b/SOUNDS/GORE/Gore/LQDRIP12.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP12.ogg
rename to SOUNDS/GORE/Gore/LQDRIP12.ogg
diff --git a/SOUNDS/GORE/LQDRIP13.ogg b/SOUNDS/GORE/Gore/LQDRIP13.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP13.ogg
rename to SOUNDS/GORE/Gore/LQDRIP13.ogg
diff --git a/SOUNDS/GORE/LQDRIP14.ogg b/SOUNDS/GORE/Gore/LQDRIP14.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP14.ogg
rename to SOUNDS/GORE/Gore/LQDRIP14.ogg
diff --git a/SOUNDS/GORE/LQDRIP2.ogg b/SOUNDS/GORE/Gore/LQDRIP2.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP2.ogg
rename to SOUNDS/GORE/Gore/LQDRIP2.ogg
diff --git a/SOUNDS/GORE/LQDRIP3.ogg b/SOUNDS/GORE/Gore/LQDRIP3.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP3.ogg
rename to SOUNDS/GORE/Gore/LQDRIP3.ogg
diff --git a/SOUNDS/GORE/LQDRIP4.ogg b/SOUNDS/GORE/Gore/LQDRIP4.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP4.ogg
rename to SOUNDS/GORE/Gore/LQDRIP4.ogg
diff --git a/SOUNDS/GORE/LQDRIP5.ogg b/SOUNDS/GORE/Gore/LQDRIP5.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP5.ogg
rename to SOUNDS/GORE/Gore/LQDRIP5.ogg
diff --git a/SOUNDS/GORE/LQDRIP6.ogg b/SOUNDS/GORE/Gore/LQDRIP6.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP6.ogg
rename to SOUNDS/GORE/Gore/LQDRIP6.ogg
diff --git a/SOUNDS/GORE/LQDRIP7.ogg b/SOUNDS/GORE/Gore/LQDRIP7.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP7.ogg
rename to SOUNDS/GORE/Gore/LQDRIP7.ogg
diff --git a/SOUNDS/GORE/LQDRIP8.ogg b/SOUNDS/GORE/Gore/LQDRIP8.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP8.ogg
rename to SOUNDS/GORE/Gore/LQDRIP8.ogg
diff --git a/SOUNDS/GORE/LQDRIP9.ogg b/SOUNDS/GORE/Gore/LQDRIP9.ogg
similarity index 100%
rename from SOUNDS/GORE/LQDRIP9.ogg
rename to SOUNDS/GORE/Gore/LQDRIP9.ogg
diff --git a/SOUNDS/GORE/MELTIN.ogg b/SOUNDS/GORE/Gore/MELTIN.ogg
similarity index 100%
rename from SOUNDS/GORE/MELTIN.ogg
rename to SOUNDS/GORE/Gore/MELTIN.ogg
diff --git a/SOUNDS/GORE/OHSNAP1.ogg b/SOUNDS/GORE/Gore/OHSNAP1.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP1.ogg
rename to SOUNDS/GORE/Gore/OHSNAP1.ogg
diff --git a/SOUNDS/GORE/OHSNAP2.ogg b/SOUNDS/GORE/Gore/OHSNAP2.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP2.ogg
rename to SOUNDS/GORE/Gore/OHSNAP2.ogg
diff --git a/SOUNDS/GORE/OHSNAP3.ogg b/SOUNDS/GORE/Gore/OHSNAP3.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP3.ogg
rename to SOUNDS/GORE/Gore/OHSNAP3.ogg
diff --git a/SOUNDS/GORE/OHSNAP4.ogg b/SOUNDS/GORE/Gore/OHSNAP4.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP4.ogg
rename to SOUNDS/GORE/Gore/OHSNAP4.ogg
diff --git a/SOUNDS/GORE/OHSNAP5.ogg b/SOUNDS/GORE/Gore/OHSNAP5.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP5.ogg
rename to SOUNDS/GORE/Gore/OHSNAP5.ogg
diff --git a/SOUNDS/GORE/OHSNAP6.ogg b/SOUNDS/GORE/Gore/OHSNAP6.ogg
similarity index 100%
rename from SOUNDS/GORE/OHSNAP6.ogg
rename to SOUNDS/GORE/Gore/OHSNAP6.ogg
diff --git a/SOUNDS/GORE/SFLY.ogg b/SOUNDS/GORE/Gore/SFLY.ogg
similarity index 100%
rename from SOUNDS/GORE/SFLY.ogg
rename to SOUNDS/GORE/Gore/SFLY.ogg
diff --git a/SOUNDS/GORE/SZZLL.ogg b/SOUNDS/GORE/Gore/SZZLL.ogg
similarity index 100%
rename from SOUNDS/GORE/SZZLL.ogg
rename to SOUNDS/GORE/Gore/SZZLL.ogg
diff --git a/SOUNDS/GORE/redburn.ogg b/SOUNDS/GORE/Gore/redburn.ogg
similarity index 100%
rename from SOUNDS/GORE/redburn.ogg
rename to SOUNDS/GORE/Gore/redburn.ogg
diff --git a/SOUNDS/HD/DSBAREXP.ogg b/SOUNDS/HD/DSBAREXP.ogg
deleted file mode 100644
index 36276e75cc..0000000000
Binary files a/SOUNDS/HD/DSBAREXP.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBGACT.ogg b/SOUNDS/HD/DSBGACT.ogg
deleted file mode 100644
index 7cbbd9c2bb..0000000000
Binary files a/SOUNDS/HD/DSBGACT.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBGDTH1.ogg b/SOUNDS/HD/DSBGDTH1.ogg
deleted file mode 100644
index 53d757ca58..0000000000
Binary files a/SOUNDS/HD/DSBGDTH1.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBGDTH2.ogg b/SOUNDS/HD/DSBGDTH2.ogg
deleted file mode 100644
index 1951de71dc..0000000000
Binary files a/SOUNDS/HD/DSBGDTH2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBGSIT1.ogg b/SOUNDS/HD/DSBGSIT1.ogg
deleted file mode 100644
index b80b45a88d..0000000000
Binary files a/SOUNDS/HD/DSBGSIT1.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBGSIT2.ogg b/SOUNDS/HD/DSBGSIT2.ogg
deleted file mode 100644
index 5b26ec5a40..0000000000
Binary files a/SOUNDS/HD/DSBGSIT2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSDBLOAD.ogg b/SOUNDS/HD/DSDBLOAD.ogg
deleted file mode 100644
index 240aa75709..0000000000
Binary files a/SOUNDS/HD/DSDBLOAD.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSDBOPN.ogg b/SOUNDS/HD/DSDBOPN.ogg
deleted file mode 100644
index c89c9bd913..0000000000
Binary files a/SOUNDS/HD/DSDBOPN.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSGETPOW.ogg b/SOUNDS/HD/DSGETPOW.ogg
deleted file mode 100644
index 3212cbaa3f..0000000000
Binary files a/SOUNDS/HD/DSGETPOW.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPODTH1.ogg b/SOUNDS/HD/DSPODTH1.ogg
deleted file mode 100644
index 710e0232ae..0000000000
Binary files a/SOUNDS/HD/DSPODTH1.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPODTH2.ogg b/SOUNDS/HD/DSPODTH2.ogg
deleted file mode 100644
index b774634af5..0000000000
Binary files a/SOUNDS/HD/DSPODTH2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPODTH3.ogg b/SOUNDS/HD/DSPODTH3.ogg
deleted file mode 100644
index 5b75133457..0000000000
Binary files a/SOUNDS/HD/DSPODTH3.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPOPAIN.ogg b/SOUNDS/HD/DSPOPAIN.ogg
deleted file mode 100644
index 0c435ab185..0000000000
Binary files a/SOUNDS/HD/DSPOPAIN.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPOSACT.ogg b/SOUNDS/HD/DSPOSACT.ogg
deleted file mode 100644
index c9c1d8f448..0000000000
Binary files a/SOUNDS/HD/DSPOSACT.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPOSIT1.ogg b/SOUNDS/HD/DSPOSIT1.ogg
deleted file mode 100644
index fc7641a988..0000000000
Binary files a/SOUNDS/HD/DSPOSIT1.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPOSIT2.ogg b/SOUNDS/HD/DSPOSIT2.ogg
deleted file mode 100644
index c074b3342a..0000000000
Binary files a/SOUNDS/HD/DSPOSIT2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPOSIT3.ogg b/SOUNDS/HD/DSPOSIT3.ogg
deleted file mode 100644
index 0ab40963c1..0000000000
Binary files a/SOUNDS/HD/DSPOSIT3.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSAWFUL.ogg b/SOUNDS/HD/DSSAWFUL.ogg
deleted file mode 100644
index cd06b7b9eb..0000000000
Binary files a/SOUNDS/HD/DSSAWFUL.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSAWHIT.ogg b/SOUNDS/HD/DSSAWHIT.ogg
deleted file mode 100644
index 7240c7af48..0000000000
Binary files a/SOUNDS/HD/DSSAWHIT.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSAWIDL.ogg b/SOUNDS/HD/DSSAWIDL.ogg
deleted file mode 100644
index 3f52c344da..0000000000
Binary files a/SOUNDS/HD/DSSAWIDL.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSAWUP.ogg b/SOUNDS/HD/DSSAWUP.ogg
deleted file mode 100644
index f4e77e3b4e..0000000000
Binary files a/SOUNDS/HD/DSSAWUP.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSGTDTH.ogg b/SOUNDS/HD/DSSGTDTH.ogg
deleted file mode 100644
index 2ea88bc30a..0000000000
Binary files a/SOUNDS/HD/DSSGTDTH.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSGTSIT.ogg b/SOUNDS/HD/DSSGTSIT.ogg
deleted file mode 100644
index 08817fcf1d..0000000000
Binary files a/SOUNDS/HD/DSSGTSIT.ogg and /dev/null differ
diff --git a/SOUNDS/ICEBRK2.ogg b/SOUNDS/ICEBRK2.ogg
deleted file mode 100644
index a4bd4322d2..0000000000
Binary files a/SOUNDS/ICEBRK2.ogg and /dev/null differ
diff --git a/SOUNDS/ARMOR.ogg b/SOUNDS/Items/ARMOR.ogg
similarity index 100%
rename from SOUNDS/ARMOR.ogg
rename to SOUNDS/Items/ARMOR.ogg
diff --git a/SOUNDS/BACKPCK.ogg b/SOUNDS/Items/BACKPCK.ogg
similarity index 100%
rename from SOUNDS/BACKPCK.ogg
rename to SOUNDS/Items/BACKPCK.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/BFG/BERSPKUP.ogg b/SOUNDS/Items/BERSPKUP.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/BFG/BERSPKUP.ogg
rename to SOUNDS/Items/BERSPKUP.ogg
diff --git a/SOUNDS/DSITEMUP.ogg b/SOUNDS/Items/DSITEMUP.ogg
similarity index 100%
rename from SOUNDS/DSITEMUP.ogg
rename to SOUNDS/Items/DSITEMUP.ogg
diff --git a/SOUNDS/MARINES/MRNAG1.ogg b/SOUNDS/MARINES/MRNAG1.ogg
deleted file mode 100644
index a14c7d956b..0000000000
Binary files a/SOUNDS/MARINES/MRNAG1.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/MRNAG2.ogg b/SOUNDS/MARINES/MRNAG2.ogg
deleted file mode 100644
index 5b99e25e4c..0000000000
Binary files a/SOUNDS/MARINES/MRNAG2.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/MRNAR1.ogg b/SOUNDS/MARINES/MRNAR1.ogg
deleted file mode 100644
index 6713309f80..0000000000
Binary files a/SOUNDS/MARINES/MRNAR1.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/MRNAR2.ogg b/SOUNDS/MARINES/MRNAR2.ogg
deleted file mode 100644
index 5e61fc13fd..0000000000
Binary files a/SOUNDS/MARINES/MRNAR2.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/MRNGI1.ogg b/SOUNDS/MARINES/MRNGI1.ogg
deleted file mode 100644
index b5cf08a1be..0000000000
Binary files a/SOUNDS/MARINES/MRNGI1.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/MRNGI2.ogg b/SOUNDS/MARINES/MRNGI2.ogg
deleted file mode 100644
index 2eae9afdc7..0000000000
Binary files a/SOUNDS/MARINES/MRNGI2.ogg and /dev/null differ
diff --git a/SOUNDS/MARINES/PLATA12.ogg b/SOUNDS/MARINES/PLATA12.ogg
deleted file mode 100644
index 1111794ea4..0000000000
Binary files a/SOUNDS/MARINES/PLATA12.ogg and /dev/null differ
diff --git a/SOUNDS/MEGAPKUP.ogg b/SOUNDS/MEGAPKUP.ogg
deleted file mode 100644
index 593d7cbfc1..0000000000
Binary files a/SOUNDS/MEGAPKUP.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/SMLFRBL.ogg b/SOUNDS/MONSTERS/Ambient Sounds/SMLFRBL.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SMLFRBL.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/SMLFRBL.ogg
diff --git a/SOUNDS/MONSTERS/SPST1.ogg b/SOUNDS/MONSTERS/Ambient Sounds/SPST1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SPST1.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/SPST1.ogg
diff --git a/SOUNDS/MONSTERS/SPST2.ogg b/SOUNDS/MONSTERS/Ambient Sounds/SPST2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SPST2.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/SPST2.ogg
diff --git a/SOUNDS/MONSTERS/SPST3.ogg b/SOUNDS/MONSTERS/Ambient Sounds/SPST3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SPST3.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/SPST3.ogg
diff --git a/SOUNDS/MONSTERS/SPST4.ogg b/SOUNDS/MONSTERS/Ambient Sounds/SPST4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SPST4.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/SPST4.ogg
diff --git a/SOUNDS/MONSTERS/boot1.ogg b/SOUNDS/MONSTERS/Ambient Sounds/boot1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/boot1.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/boot1.ogg
diff --git a/SOUNDS/MONSTERS/boot2.ogg b/SOUNDS/MONSTERS/Ambient Sounds/boot2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/boot2.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/boot2.ogg
diff --git a/SOUNDS/MONSTERS/boot3.ogg b/SOUNDS/MONSTERS/Ambient Sounds/boot3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/boot3.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/boot3.ogg
diff --git a/SOUNDS/MONSTERS/boot4.ogg b/SOUNDS/MONSTERS/Ambient Sounds/boot4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/boot4.ogg
rename to SOUNDS/MONSTERS/Ambient Sounds/boot4.ogg
diff --git a/SOUNDS/MONSTERS/SP_CRAWL.ogg b/SOUNDS/MONSTERS/Arachnophyte/SP_CRAWL.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/SP_CRAWL.ogg
rename to SOUNDS/MONSTERS/Arachnophyte/SP_CRAWL.ogg
diff --git a/SOUNDS/HD/DSBSPACT.ogg b/SOUNDS/MONSTERS/Arachnotron/DSBSPACT.ogg
similarity index 100%
rename from SOUNDS/HD/DSBSPACT.ogg
rename to SOUNDS/MONSTERS/Arachnotron/DSBSPACT.ogg
diff --git a/SOUNDS/HD/DSBSPSIT.ogg b/SOUNDS/MONSTERS/Arachnotron/DSBSPSIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSBSPSIT.ogg
rename to SOUNDS/MONSTERS/Arachnotron/DSBSPSIT.ogg
diff --git a/SOUNDS/HD/DSBSPWLK.ogg b/SOUNDS/MONSTERS/Arachnotron/DSBSPWLK.ogg
similarity index 100%
rename from SOUNDS/HD/DSBSPWLK.ogg
rename to SOUNDS/MONSTERS/Arachnotron/DSBSPWLK.ogg
diff --git a/SOUNDS/HD/DSMETAL.ogg b/SOUNDS/MONSTERS/Arachnotron/DSMETAL.ogg
similarity index 100%
rename from SOUNDS/HD/DSMETAL.ogg
rename to SOUNDS/MONSTERS/Arachnotron/DSMETAL.ogg
diff --git a/SOUNDS/MONSTERS/Arachnotron2/PAILGD3.ogg b/SOUNDS/MONSTERS/Arachnotron/PAILGD3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Arachnotron2/PAILGD3.ogg
rename to SOUNDS/MONSTERS/Arachnotron/PAILGD3.ogg
diff --git a/SOUNDS/MONSTERS/Arachnotron2/PAILGF2.ogg b/SOUNDS/MONSTERS/Arachnotron/PAILGF2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Arachnotron2/PAILGF2.ogg
rename to SOUNDS/MONSTERS/Arachnotron/PAILGF2.ogg
diff --git a/SOUNDS/MONSTERS/Arachnotron2/PAILGF3.ogg b/SOUNDS/MONSTERS/Arachnotron/PAILGF3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Arachnotron2/PAILGF3.ogg
rename to SOUNDS/MONSTERS/Arachnotron/PAILGF3.ogg
diff --git a/SOUNDS/MONSTERS/Arachnotron/SP_CRAWL.ogg b/SOUNDS/MONSTERS/Arachnotron/SP_CRAWL.ogg
new file mode 100644
index 0000000000..026cad3cd2
Binary files /dev/null and b/SOUNDS/MONSTERS/Arachnotron/SP_CRAWL.ogg differ
diff --git a/SOUNDS/MONSTERS/BARO_F.ogg b/SOUNDS/MONSTERS/Baron/BARO_F.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARO_F.ogg
rename to SOUNDS/MONSTERS/Baron/BARO_F.ogg
diff --git a/SOUNDS/MONSTERS/BARSTEP1.ogg b/SOUNDS/MONSTERS/Baron/BARSTEP1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARSTEP1.ogg
rename to SOUNDS/MONSTERS/Baron/BARSTEP1.ogg
diff --git a/SOUNDS/MONSTERS/BARSTEP2.ogg b/SOUNDS/MONSTERS/Baron/BARSTEP2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARSTEP2.ogg
rename to SOUNDS/MONSTERS/Baron/BARSTEP2.ogg
diff --git a/SOUNDS/MONSTERS/BARSTEP3.ogg b/SOUNDS/MONSTERS/Baron/BARSTEP3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARSTEP3.ogg
rename to SOUNDS/MONSTERS/Baron/BARSTEP3.ogg
diff --git a/SOUNDS/MONSTERS/BARSTEP4.ogg b/SOUNDS/MONSTERS/Baron/BARSTEP4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARSTEP4.ogg
rename to SOUNDS/MONSTERS/Baron/BARSTEP4.ogg
diff --git a/SOUNDS/MONSTERS/BARSTEP5.ogg b/SOUNDS/MONSTERS/Baron/BARSTEP5.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BARSTEP5.ogg
rename to SOUNDS/MONSTERS/Baron/BARSTEP5.ogg
diff --git a/SOUNDS/MONSTERS/PSXDPN.ogg b/SOUNDS/MONSTERS/Baron/PSXDPN.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/PSXDPN.ogg
rename to SOUNDS/MONSTERS/Baron/PSXDPN.ogg
diff --git a/SOUNDS/MONSTERS/Caco/CACO_D1.ogg b/SOUNDS/MONSTERS/Caco/CACO_D1.ogg
deleted file mode 100644
index 9106f6610d..0000000000
Binary files a/SOUNDS/MONSTERS/Caco/CACO_D1.ogg and /dev/null differ
diff --git a/SOUNDS/CLAP.ogg b/SOUNDS/MONSTERS/Cyber Demon/CLAP.ogg
similarity index 100%
rename from SOUNDS/CLAP.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CLAP.ogg
diff --git a/SOUNDS/MONSTERS/CMETAL1.ogg b/SOUNDS/MONSTERS/Cyber Demon/CMETAL1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/CMETAL1.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CMETAL1.ogg
diff --git a/SOUNDS/MONSTERS/CMETAL2.ogg b/SOUNDS/MONSTERS/Cyber Demon/CMETAL2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/CMETAL2.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CMETAL2.ogg
diff --git a/SOUNDS/MONSTERS/CMETAL3.ogg b/SOUNDS/MONSTERS/Cyber Demon/CMETAL3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/CMETAL3.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CMETAL3.ogg
diff --git a/SOUNDS/MONSTERS/CMETAL4.ogg b/SOUNDS/MONSTERS/Cyber Demon/CMETAL4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/CMETAL4.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CMETAL4.ogg
diff --git a/SOUNDS/MONSTERS/CYBTAT.ogg b/SOUNDS/MONSTERS/Cyber Demon/CYBTAT.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/CYBTAT.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/CYBTAT.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/DSCANFIR.ogg b/SOUNDS/MONSTERS/Cyber Demon/DSCANFIR.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/DSCANFIR.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/DSCANFIR.ogg
diff --git a/SOUNDS/HD/DSCYBDTH.ogg b/SOUNDS/MONSTERS/Cyber Demon/DSCYBDTH.ogg
similarity index 100%
rename from SOUNDS/HD/DSCYBDTH.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/DSCYBDTH.ogg
diff --git a/SOUNDS/HD/DSCYBSIT.ogg b/SOUNDS/MONSTERS/Cyber Demon/DSCYBSIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSCYBSIT.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/DSCYBSIT.ogg
diff --git a/SOUNDS/HD/DSFLAMST.ogg b/SOUNDS/MONSTERS/Cyber Demon/DSFLAMST.ogg
similarity index 100%
rename from SOUNDS/HD/DSFLAMST.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/DSFLAMST.ogg
diff --git a/SOUNDS/HD/DSHOOF.ogg b/SOUNDS/MONSTERS/Cyber Demon/DSHOOF.ogg
similarity index 100%
rename from SOUNDS/HD/DSHOOF.ogg
rename to SOUNDS/MONSTERS/Cyber Demon/DSHOOF.ogg
diff --git a/SOUNDS/MONSTERS/Cybernobles/CBARNACT.ogg b/SOUNDS/MONSTERS/Cybernobles/CBARNACT.ogg
deleted file mode 100644
index a888822904..0000000000
Binary files a/SOUNDS/MONSTERS/Cybernobles/CBARNACT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Cybernobles/CBARNDTH.ogg b/SOUNDS/MONSTERS/Cybernobles/CBARNDTH.ogg
deleted file mode 100644
index c2cd775038..0000000000
Binary files a/SOUNDS/MONSTERS/Cybernobles/CBARNDTH.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Cybernobles/CBARNPAI.ogg b/SOUNDS/MONSTERS/Cybernobles/CBARNPAI.ogg
deleted file mode 100644
index b0feffae58..0000000000
Binary files a/SOUNDS/MONSTERS/Cybernobles/CBARNPAI.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Cybernobles/CBARNSIT.ogg b/SOUNDS/MONSTERS/Cybernobles/CBARNSIT.ogg
deleted file mode 100644
index 0b5ac405d2..0000000000
Binary files a/SOUNDS/MONSTERS/Cybernobles/CBARNSIT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Cybernobles/CMETAL.ogg b/SOUNDS/MONSTERS/Cybernobles/CMETAL.ogg
deleted file mode 100644
index 18ea2d4f48..0000000000
Binary files a/SOUNDS/MONSTERS/Cybernobles/CMETAL.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Demontech/6ECHCLIK.ogg b/SOUNDS/MONSTERS/Demontech/6ECHCLIK.ogg
deleted file mode 100644
index e500aa4226..0000000000
Binary files a/SOUNDS/MONSTERS/Demontech/6ECHCLIK.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Demontech/6ECHEJCT.ogg b/SOUNDS/MONSTERS/Demontech/6ECHEJCT.ogg
deleted file mode 100644
index 2a899ac141..0000000000
Binary files a/SOUNDS/MONSTERS/Demontech/6ECHEJCT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Demontech/6ECHFIRE.ogg b/SOUNDS/MONSTERS/Demontech/6ECHFIRE.ogg
deleted file mode 100644
index f1ec56ee99..0000000000
Binary files a/SOUNDS/MONSTERS/Demontech/6ECHFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Demontech/6ECHLOAD.ogg b/SOUNDS/MONSTERS/Demontech/6ECHLOAD.ogg
deleted file mode 100644
index 216332fe24..0000000000
Binary files a/SOUNDS/MONSTERS/Demontech/6ECHLOAD.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Demontech/6ECHMODE.ogg b/SOUNDS/MONSTERS/Demontech/6ECHMODE.ogg
deleted file mode 100644
index 436f4e8ab1..0000000000
Binary files a/SOUNDS/MONSTERS/Demontech/6ECHMODE.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Evil Marines/EVMRACT1.ogg b/SOUNDS/MONSTERS/Evil Marines/EVMRACT1.ogg
deleted file mode 100644
index 5b92367e3c..0000000000
Binary files a/SOUNDS/MONSTERS/Evil Marines/EVMRACT1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND1.ogg b/SOUNDS/MONSTERS/Fleshwizard/DSDAMND1.ogg
deleted file mode 100644
index 362a6a6456..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND2.ogg b/SOUNDS/MONSTERS/Fleshwizard/DSDAMND2.ogg
deleted file mode 100644
index 151b8257a6..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND2.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND3.ogg b/SOUNDS/MONSTERS/Fleshwizard/DSDAMND3.ogg
deleted file mode 100644
index a065d90ce0..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND3.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND4.ogg b/SOUNDS/MONSTERS/Fleshwizard/DSDAMND4.ogg
deleted file mode 100644
index 8f403b8bdf..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DSDAMND4.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL1.ogg b/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL1.ogg
deleted file mode 100644
index bdc4416b33..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL2.ogg b/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL2.ogg
deleted file mode 100644
index 5cb42bf870..0000000000
Binary files a/SOUNDS/MONSTERS/Fleshwizard/DWIZTEL2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSKNTDTH.ogg b/SOUNDS/MONSTERS/Hell Knight/DSKNTDTH.ogg
similarity index 100%
rename from SOUNDS/HD/DSKNTDTH.ogg
rename to SOUNDS/MONSTERS/Hell Knight/DSKNTDTH.ogg
diff --git a/SOUNDS/MONSTERS/HKSTEP1.ogg b/SOUNDS/MONSTERS/Hell Knight/HKSTEP1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/HKSTEP1.ogg
rename to SOUNDS/MONSTERS/Hell Knight/HKSTEP1.ogg
diff --git a/SOUNDS/MONSTERS/HKSTEP2.ogg b/SOUNDS/MONSTERS/Hell Knight/HKSTEP2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/HKSTEP2.ogg
rename to SOUNDS/MONSTERS/Hell Knight/HKSTEP2.ogg
diff --git a/SOUNDS/MONSTERS/HKSTEP3.ogg b/SOUNDS/MONSTERS/Hell Knight/HKSTEP3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/HKSTEP3.ogg
rename to SOUNDS/MONSTERS/Hell Knight/HKSTEP3.ogg
diff --git a/SOUNDS/MONSTERS/HKSTEP4.ogg b/SOUNDS/MONSTERS/Hell Knight/HKSTEP4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/HKSTEP4.ogg
rename to SOUNDS/MONSTERS/Hell Knight/HKSTEP4.ogg
diff --git a/SOUNDS/MONSTERS/VISTEP1.ogg b/SOUNDS/MONSTERS/Hellion/VISTEP1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/VISTEP1.ogg
rename to SOUNDS/MONSTERS/Hellion/VISTEP1.ogg
diff --git a/SOUNDS/MONSTERS/VISTEP2.ogg b/SOUNDS/MONSTERS/Hellion/VISTEP2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/VISTEP2.ogg
rename to SOUNDS/MONSTERS/Hellion/VISTEP2.ogg
diff --git a/SOUNDS/MONSTERS/VISTEP3.ogg b/SOUNDS/MONSTERS/Hellion/VISTEP3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/VISTEP3.ogg
rename to SOUNDS/MONSTERS/Hellion/VISTEP3.ogg
diff --git a/SOUNDS/MONSTERS/VISTEP4.ogg b/SOUNDS/MONSTERS/Hellion/VISTEP4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/VISTEP4.ogg
rename to SOUNDS/MONSTERS/Hellion/VISTEP4.ogg
diff --git a/SOUNDS/MONSTERS/IceVile/HLWIND.ogg b/SOUNDS/MONSTERS/IceVile/HLWIND.ogg
deleted file mode 100644
index 1daa7653d6..0000000000
Binary files a/SOUNDS/MONSTERS/IceVile/HLWIND.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/IceVile/Q2WIND.ogg b/SOUNDS/MONSTERS/IceVile/Q2WIND.ogg
deleted file mode 100644
index a7b66d7e61..0000000000
Binary files a/SOUNDS/MONSTERS/IceVile/Q2WIND.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSBOSPIT.ogg b/SOUNDS/MONSTERS/Icon/DSBOSPIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSBOSPIT.ogg
rename to SOUNDS/MONSTERS/Icon/DSBOSPIT.ogg
diff --git a/SOUNDS/HD/DSBOSSIT.ogg b/SOUNDS/MONSTERS/Icon/DSBOSSIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSBOSSIT.ogg
rename to SOUNDS/MONSTERS/Icon/DSBOSSIT.ogg
diff --git a/SOUNDS/MONSTERS/Icon/ICOBREAT.ogg b/SOUNDS/MONSTERS/Icon/ICOBREAT.ogg
deleted file mode 100644
index 4a36a4d532..0000000000
Binary files a/SOUNDS/MONSTERS/Icon/ICOBREAT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Icon/ICOFIRE.ogg b/SOUNDS/MONSTERS/Icon/ICOFIRE.ogg
deleted file mode 100644
index 15b7dca529..0000000000
Binary files a/SOUNDS/MONSTERS/Icon/ICOFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Icon/ICOLAUG.ogg b/SOUNDS/MONSTERS/Icon/ICOLAUG.ogg
deleted file mode 100644
index 2f75f8afeb..0000000000
Binary files a/SOUNDS/MONSTERS/Icon/ICOLAUG.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Icon/ICOSCRE.ogg b/SOUNDS/MONSTERS/Icon/ICOSCRE.ogg
deleted file mode 100644
index 2abcc3db93..0000000000
Binary files a/SOUNDS/MONSTERS/Icon/ICOSCRE.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Icon/ICOTHUND.ogg b/SOUNDS/MONSTERS/Icon/ICOTHUND.ogg
deleted file mode 100644
index 9391fa5b0e..0000000000
Binary files a/SOUNDS/MONSTERS/Icon/ICOTHUND.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/flesh1.ogg b/SOUNDS/MONSTERS/Imp/flesh1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/flesh1.ogg
rename to SOUNDS/MONSTERS/Imp/flesh1.ogg
diff --git a/SOUNDS/MONSTERS/flesh2.ogg b/SOUNDS/MONSTERS/Imp/flesh2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/flesh2.ogg
rename to SOUNDS/MONSTERS/Imp/flesh2.ogg
diff --git a/SOUNDS/MONSTERS/flesh3.ogg b/SOUNDS/MONSTERS/Imp/flesh3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/flesh3.ogg
rename to SOUNDS/MONSTERS/Imp/flesh3.ogg
diff --git a/SOUNDS/MONSTERS/flesh4.ogg b/SOUNDS/MONSTERS/Imp/flesh4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/flesh4.ogg
rename to SOUNDS/MONSTERS/Imp/flesh4.ogg
diff --git a/SOUNDS/MONSTERS/Watcher/DSINFACT.ogg b/SOUNDS/MONSTERS/Infernal Cacodemon/DSINFACT.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Watcher/DSINFACT.ogg
rename to SOUNDS/MONSTERS/Infernal Cacodemon/DSINFACT.ogg
diff --git a/SOUNDS/MONSTERS/Watcher/DSINFPAI.ogg b/SOUNDS/MONSTERS/Infernal Cacodemon/DSINFPAI.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Watcher/DSINFPAI.ogg
rename to SOUNDS/MONSTERS/Infernal Cacodemon/DSINFPAI.ogg
diff --git a/SOUNDS/MONSTERS/Watcher/DSINFSIT.ogg b/SOUNDS/MONSTERS/Infernal Cacodemon/DSINFSIT.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/Watcher/DSINFSIT.ogg
rename to SOUNDS/MONSTERS/Infernal Cacodemon/DSINFSIT.ogg
diff --git a/SOUNDS/MONSTERS/BTKDETH1.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKDETH1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKDETH1.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKDETH1.ogg
diff --git a/SOUNDS/MONSTERS/BTKENGN1.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKENGN1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKENGN1.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKENGN1.ogg
diff --git a/SOUNDS/MONSTERS/BTKPAIN1.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKPAIN1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKPAIN1.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKPAIN1.ogg
diff --git a/SOUNDS/MONSTERS/BTKPAIN2.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKPAIN2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKPAIN2.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKPAIN2.ogg
diff --git a/SOUNDS/MONSTERS/BTKPAIN3.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKPAIN3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKPAIN3.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKPAIN3.ogg
diff --git a/SOUNDS/MONSTERS/BTKUNQV1.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKUNQV1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKUNQV1.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKUNQV1.ogg
diff --git a/SOUNDS/MONSTERS/BTKUNQV2.ogg b/SOUNDS/MONSTERS/Juggernaut/BTKUNQV2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/BTKUNQV2.ogg
rename to SOUNDS/MONSTERS/Juggernaut/BTKUNQV2.ogg
diff --git a/SOUNDS/HD/DSSKLATK.ogg b/SOUNDS/MONSTERS/Lost Soul/DSSKLATK.ogg
similarity index 100%
rename from SOUNDS/HD/DSSKLATK.ogg
rename to SOUNDS/MONSTERS/Lost Soul/DSSKLATK.ogg
diff --git a/SOUNDS/MONSTERS/LSOD1.ogg b/SOUNDS/MONSTERS/Lost Soul/LSOD1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSOD1.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSOD1.ogg
diff --git a/SOUNDS/MONSTERS/LSOD2.ogg b/SOUNDS/MONSTERS/Lost Soul/LSOD2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSOD2.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSOD2.ogg
diff --git a/SOUNDS/MONSTERS/LSOD3.ogg b/SOUNDS/MONSTERS/Lost Soul/LSOD3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSOD3.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSOD3.ogg
diff --git a/SOUNDS/MONSTERS/LSOD4.ogg b/SOUNDS/MONSTERS/Lost Soul/LSOD4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSOD4.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSOD4.ogg
diff --git a/SOUNDS/MONSTERS/LSPAIN1.ogg b/SOUNDS/MONSTERS/Lost Soul/LSPAIN1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSPAIN1.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSPAIN1.ogg
diff --git a/SOUNDS/MONSTERS/LSPAIN2.ogg b/SOUNDS/MONSTERS/Lost Soul/LSPAIN2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/LSPAIN2.ogg
rename to SOUNDS/MONSTERS/Lost Soul/LSPAIN2.ogg
diff --git a/SOUNDS/HD/DSMANATK.ogg b/SOUNDS/MONSTERS/Mancubus/DSMANATK.ogg
similarity index 100%
rename from SOUNDS/HD/DSMANATK.ogg
rename to SOUNDS/MONSTERS/Mancubus/DSMANATK.ogg
diff --git a/SOUNDS/HD/DSMANDTH.ogg b/SOUNDS/MONSTERS/Mancubus/DSMANDTH.ogg
similarity index 100%
rename from SOUNDS/HD/DSMANDTH.ogg
rename to SOUNDS/MONSTERS/Mancubus/DSMANDTH.ogg
diff --git a/SOUNDS/HD/DSMANSIT.ogg b/SOUNDS/MONSTERS/Mancubus/DSMANSIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSMANSIT.ogg
rename to SOUNDS/MONSTERS/Mancubus/DSMANSIT.ogg
diff --git a/SOUNDS/HD/DSSPISIT.ogg b/SOUNDS/MONSTERS/Mastermaind/DSSPISIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSSPISIT.ogg
rename to SOUNDS/MONSTERS/Mastermaind/DSSPISIT.ogg
diff --git a/SOUNDS/MONSTERS/MASTCGUN.ogg b/SOUNDS/MONSTERS/Mastermaind/MASTCGUN.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/MASTCGUN.ogg
rename to SOUNDS/MONSTERS/Mastermaind/MASTCGUN.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH1.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH1.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH1.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH2.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH2.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH2.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH3.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH3.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH3.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH4.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH4.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH4.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH5.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH5.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH5.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH5.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH6.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH6.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH6.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH6.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH7.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH7.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH7.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH7.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH8.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH8.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH8.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH8.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTH9.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTH9.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTH9.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTH9.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTHA.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTHA.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTHA.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTHA.ogg
diff --git a/SOUNDS/MONSTERS/NAZIDTHB.ogg b/SOUNDS/MONSTERS/Nazi/NAZIDTHB.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIDTHB.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIDTHB.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN1.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN1.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN1.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN2.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN2.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN2.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN3.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN3.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN3.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN4.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN4.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN4.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN5.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN5.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN5.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN5.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN6.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN6.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN6.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN6.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN7.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN7.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN7.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN7.ogg
diff --git a/SOUNDS/MONSTERS/NAZIPN8.ogg b/SOUNDS/MONSTERS/Nazi/NAZIPN8.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZIPN8.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZIPN8.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT1.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT1.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT1.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT1.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT2.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT2.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT2.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT2.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT3.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT3.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT3.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT3.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT4.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT4.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT4.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT4.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT5.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT5.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT5.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT5.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT6.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT6.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT6.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT6.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT7.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT7.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT7.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT7.ogg
diff --git a/SOUNDS/MONSTERS/NAZISIT8.ogg b/SOUNDS/MONSTERS/Nazi/NAZISIT8.ogg
similarity index 100%
rename from SOUNDS/MONSTERS/NAZISIT8.ogg
rename to SOUNDS/MONSTERS/Nazi/NAZISIT8.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Axe/AXEHIT.ogg b/SOUNDS/MONSTERS/Other/AXEHIT.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Axe/AXEHIT.ogg
rename to SOUNDS/MONSTERS/Other/AXEHIT.ogg
diff --git a/SOUNDS/HD/DSCLAW.ogg b/SOUNDS/MONSTERS/Other/DSCLAW.ogg
similarity index 100%
rename from SOUNDS/HD/DSCLAW.ogg
rename to SOUNDS/MONSTERS/Other/DSCLAW.ogg
diff --git a/SOUNDS/HD/DSDMPAIN.ogg b/SOUNDS/MONSTERS/Other/DSDMPAIN.ogg
similarity index 100%
rename from SOUNDS/HD/DSDMPAIN.ogg
rename to SOUNDS/MONSTERS/Other/DSDMPAIN.ogg
diff --git a/SOUNDS/HD/DSFIRSHT.ogg b/SOUNDS/MONSTERS/Other/DSFIRSHT.ogg
similarity index 100%
rename from SOUNDS/HD/DSFIRSHT.ogg
rename to SOUNDS/MONSTERS/Other/DSFIRSHT.ogg
diff --git a/SOUNDS/Misc/FRITCMFR.ogg b/SOUNDS/MONSTERS/Other/FRITCMFR.ogg
similarity index 100%
rename from SOUNDS/Misc/FRITCMFR.ogg
rename to SOUNDS/MONSTERS/Other/FRITCMFR.ogg
diff --git a/SOUNDS/MONSTERS/Overlord/DSCHAOFI.ogg b/SOUNDS/MONSTERS/Overlord/DSCHAOFI.ogg
deleted file mode 100644
index b9477aa5c1..0000000000
Binary files a/SOUNDS/MONSTERS/Overlord/DSCHAOFI.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSPEDTH.ogg b/SOUNDS/MONSTERS/Pain Elemental/DSPEDTH.ogg
similarity index 100%
rename from SOUNDS/HD/DSPEDTH.ogg
rename to SOUNDS/MONSTERS/Pain Elemental/DSPEDTH.ogg
diff --git a/SOUNDS/HD/DSPEPAIN.ogg b/SOUNDS/MONSTERS/Pain Elemental/DSPEPAIN.ogg
similarity index 100%
rename from SOUNDS/HD/DSPEPAIN.ogg
rename to SOUNDS/MONSTERS/Pain Elemental/DSPEPAIN.ogg
diff --git a/SOUNDS/HD/DSPESIT.ogg b/SOUNDS/MONSTERS/Pain Elemental/DSPESIT.ogg
similarity index 100%
rename from SOUNDS/HD/DSPESIT.ogg
rename to SOUNDS/MONSTERS/Pain Elemental/DSPESIT.ogg
diff --git a/SOUNDS/MONSTERS/Paladin/HPALEXPL.ogg b/SOUNDS/MONSTERS/Paladin/HPALEXPL.ogg
deleted file mode 100644
index bd17ae76fe..0000000000
Binary files a/SOUNDS/MONSTERS/Paladin/HPALEXPL.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Paladin/HPALGREN.ogg b/SOUNDS/MONSTERS/Paladin/HPALGREN.ogg
deleted file mode 100644
index a0907e1c5c..0000000000
Binary files a/SOUNDS/MONSTERS/Paladin/HPALGREN.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Phantasm/BAREXP2.ogg b/SOUNDS/MONSTERS/Phantasm/BAREXP2.ogg
deleted file mode 100644
index ec732c5230..0000000000
Binary files a/SOUNDS/MONSTERS/Phantasm/BAREXP2.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Phantasm/DM2PAIN.ogg b/SOUNDS/MONSTERS/Phantasm/DM2PAIN.ogg
deleted file mode 100644
index 05dfa977a6..0000000000
Binary files a/SOUNDS/MONSTERS/Phantasm/DM2PAIN.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Phantasm/FIRXPL2.ogg b/SOUNDS/MONSTERS/Phantasm/FIRXPL2.ogg
deleted file mode 100644
index 9a73839127..0000000000
Binary files a/SOUNDS/MONSTERS/Phantasm/FIRXPL2.ogg and /dev/null differ
diff --git a/SOUNDS/HD/DSSKEATK.ogg b/SOUNDS/MONSTERS/Revenant/DSSKEATK.ogg
similarity index 100%
rename from SOUNDS/HD/DSSKEATK.ogg
rename to SOUNDS/MONSTERS/Revenant/DSSKEATK.ogg
diff --git a/SOUNDS/HD/DSSKEDTH.ogg b/SOUNDS/MONSTERS/Revenant/DSSKEDTH.ogg
similarity index 100%
rename from SOUNDS/HD/DSSKEDTH.ogg
rename to SOUNDS/MONSTERS/Revenant/DSSKEDTH.ogg
diff --git a/SOUNDS/HD/DSSKESWG.ogg b/SOUNDS/MONSTERS/Revenant/DSSKESWG.ogg
similarity index 100%
rename from SOUNDS/HD/DSSKESWG.ogg
rename to SOUNDS/MONSTERS/Revenant/DSSKESWG.ogg
diff --git a/SOUNDS/HD/DSVILATK.ogg b/SOUNDS/MONSTERS/VileStuff/DSVILATK.ogg
similarity index 100%
rename from SOUNDS/HD/DSVILATK.ogg
rename to SOUNDS/MONSTERS/VileStuff/DSVILATK.ogg
diff --git a/SOUNDS/MONSTERS/Volcabus/VOLCBRN.ogg b/SOUNDS/MONSTERS/Volcabus/VOLCBRN.ogg
deleted file mode 100644
index cfd91176ed..0000000000
Binary files a/SOUNDS/MONSTERS/Volcabus/VOLCBRN.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Watcher/DSDEMBIT.ogg b/SOUNDS/MONSTERS/Watcher/DSDEMBIT.ogg
deleted file mode 100644
index 98745d4269..0000000000
Binary files a/SOUNDS/MONSTERS/Watcher/DSDEMBIT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn1.ogg b/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn1.ogg
deleted file mode 100644
index f020c5b399..0000000000
Binary files a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn2.ogg b/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn2.ogg
deleted file mode 100644
index cdf5e2691d..0000000000
Binary files a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn2.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn3.ogg b/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn3.ogg
deleted file mode 100644
index 5403784159..0000000000
Binary files a/SOUNDS/MONSTERS/Z-Spec Ops/zspcmgn3.ogg and /dev/null differ
diff --git a/SOUNDS/COMBAT/DM1NGN5.ogg b/SOUNDS/MONSTERS/Zombie Commandos/DM1NGN5.ogg
similarity index 100%
rename from SOUNDS/COMBAT/DM1NGN5.ogg
rename to SOUNDS/MONSTERS/Zombie Commandos/DM1NGN5.ogg
diff --git a/SOUNDS/COMBAT/WEAPONS/Minigun/DSMINIGN.ogg b/SOUNDS/MONSTERS/Zombie Commandos/DSMINIGN.ogg
similarity index 100%
rename from SOUNDS/COMBAT/WEAPONS/Minigun/DSMINIGN.ogg
rename to SOUNDS/MONSTERS/Zombie Commandos/DSMINIGN.ogg
diff --git a/SOUNDS/BURNZOM1.ogg b/SOUNDS/MONSTERS/Zombieman/BURNZOM1.ogg
similarity index 100%
rename from SOUNDS/BURNZOM1.ogg
rename to SOUNDS/MONSTERS/Zombieman/BURNZOM1.ogg
diff --git a/SOUNDS/BURNZOM2.ogg b/SOUNDS/MONSTERS/Zombieman/BURNZOM2.ogg
similarity index 100%
rename from SOUNDS/BURNZOM2.ogg
rename to SOUNDS/MONSTERS/Zombieman/BURNZOM2.ogg
diff --git a/SOUNDS/BURNZOM3.ogg b/SOUNDS/MONSTERS/Zombieman/BURNZOM3.ogg
similarity index 100%
rename from SOUNDS/BURNZOM3.ogg
rename to SOUNDS/MONSTERS/Zombieman/BURNZOM3.ogg
diff --git a/SOUNDS/MONSTERS/fleshspawn/FLSPNACT.ogg b/SOUNDS/MONSTERS/fleshspawn/FLSPNACT.ogg
deleted file mode 100644
index a458a424c2..0000000000
Binary files a/SOUNDS/MONSTERS/fleshspawn/FLSPNACT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/fleshspawn/FLSPNATK.ogg b/SOUNDS/MONSTERS/fleshspawn/FLSPNATK.ogg
deleted file mode 100644
index 5d99bd89fc..0000000000
Binary files a/SOUNDS/MONSTERS/fleshspawn/FLSPNATK.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/fleshspawn/FLSPNDTH.ogg b/SOUNDS/MONSTERS/fleshspawn/FLSPNDTH.ogg
deleted file mode 100644
index d5c01f1ab3..0000000000
Binary files a/SOUNDS/MONSTERS/fleshspawn/FLSPNDTH.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/fleshspawn/FLSPNHIT.ogg b/SOUNDS/MONSTERS/fleshspawn/FLSPNHIT.ogg
deleted file mode 100644
index 7f8a99b014..0000000000
Binary files a/SOUNDS/MONSTERS/fleshspawn/FLSPNHIT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/fleshspawn/FLSPNSIT.ogg b/SOUNDS/MONSTERS/fleshspawn/FLSPNSIT.ogg
deleted file mode 100644
index d30b742328..0000000000
Binary files a/SOUNDS/MONSTERS/fleshspawn/FLSPNSIT.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDACT1.ogg b/SOUNDS/MONSTERS/shadow/SHDACT1.ogg
deleted file mode 100644
index f167512a29..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDACT1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDACT2.ogg b/SOUNDS/MONSTERS/shadow/SHDACT2.ogg
deleted file mode 100644
index dfb2633700..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDACT2.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDATTAK.ogg b/SOUNDS/MONSTERS/shadow/SHDATTAK.ogg
deleted file mode 100644
index f6172f61f2..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDATTAK.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDDEATH.ogg b/SOUNDS/MONSTERS/shadow/SHDDEATH.ogg
deleted file mode 100644
index 236b1dffe6..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDDEATH.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDPAIN1.ogg b/SOUNDS/MONSTERS/shadow/SHDPAIN1.ogg
deleted file mode 100644
index 391758057a..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDPAIN1.ogg and /dev/null differ
diff --git a/SOUNDS/MONSTERS/shadow/SHDPAIN2.ogg b/SOUNDS/MONSTERS/shadow/SHDPAIN2.ogg
deleted file mode 100644
index b52b0d0f55..0000000000
Binary files a/SOUNDS/MONSTERS/shadow/SHDPAIN2.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/BARPAIN.ogg b/SOUNDS/Misc/BARPAIN.ogg
deleted file mode 100644
index 8125ff748c..0000000000
Binary files a/SOUNDS/Misc/BARPAIN.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/CGFIRE1.ogg b/SOUNDS/Misc/CGFIRE1.ogg
deleted file mode 100644
index 508924b4ac..0000000000
Binary files a/SOUNDS/Misc/CGFIRE1.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/COMHER.ogg b/SOUNDS/Misc/COMHER.ogg
deleted file mode 100644
index 3cf6ea418e..0000000000
Binary files a/SOUNDS/Misc/COMHER.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/DSBOWFLY.ogg b/SOUNDS/Misc/DSBOWFLY.ogg
deleted file mode 100644
index 40ce6fb20c..0000000000
Binary files a/SOUNDS/Misc/DSBOWFLY.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/DSDAMND1.ogg b/SOUNDS/Misc/DSDAMND1.ogg
deleted file mode 100644
index b386ec081e..0000000000
Binary files a/SOUNDS/Misc/DSDAMND1.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/DSDAMND2.ogg b/SOUNDS/Misc/DSDAMND2.ogg
deleted file mode 100644
index 7c0c42b979..0000000000
Binary files a/SOUNDS/Misc/DSDAMND2.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/DSDAMND3.ogg b/SOUNDS/Misc/DSDAMND3.ogg
deleted file mode 100644
index 53da37dea2..0000000000
Binary files a/SOUNDS/Misc/DSDAMND3.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/DSDAMND4.ogg b/SOUNDS/Misc/DSDAMND4.ogg
deleted file mode 100644
index 26496a60b0..0000000000
Binary files a/SOUNDS/Misc/DSDAMND4.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/FRITCMHT.ogg b/SOUNDS/Misc/FRITCMHT.ogg
deleted file mode 100644
index ffc8cc8481..0000000000
Binary files a/SOUNDS/Misc/FRITCMHT.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/FRITFIRE.ogg b/SOUNDS/Misc/FRITFIRE.ogg
deleted file mode 100644
index ee1e7a395c..0000000000
Binary files a/SOUNDS/Misc/FRITFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/FRRDY.ogg b/SOUNDS/Misc/FRRDY.ogg
deleted file mode 100644
index 5fe6b00a88..0000000000
Binary files a/SOUNDS/Misc/FRRDY.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/HELLCLIP.ogg b/SOUNDS/Misc/HELLCLIP.ogg
deleted file mode 100644
index 8054e48779..0000000000
Binary files a/SOUNDS/Misc/HELLCLIP.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/HELLPK.ogg b/SOUNDS/Misc/HELLPK.ogg
deleted file mode 100644
index c12e978fc1..0000000000
Binary files a/SOUNDS/Misc/HELLPK.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/HRCHRG.ogg b/SOUNDS/Misc/HRCHRG.ogg
deleted file mode 100644
index 755755c5b7..0000000000
Binary files a/SOUNDS/Misc/HRCHRG.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/HRPCK.ogg b/SOUNDS/Misc/HRPCK.ogg
deleted file mode 100644
index e8668e261a..0000000000
Binary files a/SOUNDS/Misc/HRPCK.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/HRRDY.ogg b/SOUNDS/Misc/HRRDY.ogg
deleted file mode 100644
index cdad809add..0000000000
Binary files a/SOUNDS/Misc/HRRDY.ogg and /dev/null differ
diff --git a/SOUNDS/Misc/STNRHIT.ogg b/SOUNDS/Misc/STNRHIT.ogg
deleted file mode 100644
index a8e0663703..0000000000
Binary files a/SOUNDS/Misc/STNRHIT.ogg and /dev/null differ
diff --git a/SOUNDS/PDA_gui_mouseover_1.ogg b/SOUNDS/PDA/PDA_gui_mouseover_1.ogg
similarity index 100%
rename from SOUNDS/PDA_gui_mouseover_1.ogg
rename to SOUNDS/PDA/PDA_gui_mouseover_1.ogg
diff --git a/SOUNDS/PDA_gui_notification_5_new_entry.ogg b/SOUNDS/PDA/PDA_gui_notification_5_new_entry.ogg
similarity index 100%
rename from SOUNDS/PDA_gui_notification_5_new_entry.ogg
rename to SOUNDS/PDA/PDA_gui_notification_5_new_entry.ogg
diff --git a/SOUNDS/PDA_gui_notification_5_tone_up_1.ogg b/SOUNDS/PDA/PDA_gui_notification_5_tone_up_1.ogg
similarity index 100%
rename from SOUNDS/PDA_gui_notification_5_tone_up_1.ogg
rename to SOUNDS/PDA/PDA_gui_notification_5_tone_up_1.ogg
diff --git a/SOUNDS/PLSCO0L.ogg b/SOUNDS/PLSCO0L.ogg
deleted file mode 100644
index bdb0502067..0000000000
Binary files a/SOUNDS/PLSCO0L.ogg and /dev/null differ
diff --git a/SOUNDS/SENSCAN.ogg b/SOUNDS/SENSCAN.ogg
deleted file mode 100644
index cad8841bd5..0000000000
Binary files a/SOUNDS/SENSCAN.ogg and /dev/null differ
diff --git a/SOUNDS/SENSEE.ogg b/SOUNDS/SENSEE.ogg
deleted file mode 100644
index aeb7a53e86..0000000000
Binary files a/SOUNDS/SENSEE.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BARREL1.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BARREL1.ogg
similarity index 100%
rename from SOUNDS/WORLD/BARREL1.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BARREL1.ogg
diff --git a/SOUNDS/WORLD/BARREL2.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BARREL2.ogg
similarity index 100%
rename from SOUNDS/WORLD/BARREL2.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BARREL2.ogg
diff --git a/SOUNDS/WORLD/BARREL3.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BARREL3.ogg
similarity index 100%
rename from SOUNDS/WORLD/BARREL3.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BARREL3.ogg
diff --git a/SOUNDS/WORLD/BARREL4.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BARREL4.ogg
similarity index 100%
rename from SOUNDS/WORLD/BARREL4.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BARREL4.ogg
diff --git a/SOUNDS/BARRELZ.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BARRELZ.ogg
similarity index 100%
rename from SOUNDS/BARRELZ.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BARRELZ.ogg
diff --git a/SOUNDS/BIGEXPL2.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/BIGEXPL2.ogg
similarity index 100%
rename from SOUNDS/BIGEXPL2.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/BIGEXPL2.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_1.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_1.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_1.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_10.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_10.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_10.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_10.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_11.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_11.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_11.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_11.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_12.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_12.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_12.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_12.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_13.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_13.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_13.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_13.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_14.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_14.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_14.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_14.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_15.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_15.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_15.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_15.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_2.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_2.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_2.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_3.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_3.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_3.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_4.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_4.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_4.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_5.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_5.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_5.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_5.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_6.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_6.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_6.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_6.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_7.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_7.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_7.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_7.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_8.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_8.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_8.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_8.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/EXPL_9.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_9.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/EXPL_9.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/EXPL_9.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/FAREXPL0.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL0.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/FAREXPL0.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL0.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/FAREXPL1.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/FAREXPL1.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL1.ogg
diff --git a/SOUNDS/COMBAT/EXPLOSIONS/FAREXPL2.ogg b/SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/EXPLOSIONS/FAREXPL2.ogg
rename to SOUNDS/Sounds Effects/Barrel and Explosions/FAREXPL2.ogg
diff --git a/SOUNDS/DSBOTTLE.ogg b/SOUNDS/Sounds Effects/Broken glass/DSBOTTLE.ogg
similarity index 100%
rename from SOUNDS/DSBOTTLE.ogg
rename to SOUNDS/Sounds Effects/Broken glass/DSBOTTLE.ogg
diff --git a/SOUNDS/GLSFAL.ogg b/SOUNDS/Sounds Effects/Broken glass/GLSFAL.ogg
similarity index 100%
rename from SOUNDS/GLSFAL.ogg
rename to SOUNDS/Sounds Effects/Broken glass/GLSFAL.ogg
diff --git a/SOUNDS/WORLD/WINBREA.ogg b/SOUNDS/Sounds Effects/Broken glass/WINBREA.ogg
similarity index 100%
rename from SOUNDS/WORLD/WINBREA.ogg
rename to SOUNDS/Sounds Effects/Broken glass/WINBREA.ogg
diff --git a/SOUNDS/WORLD/CHNRTL1.ogg b/SOUNDS/Sounds Effects/Chains/CHNRTL1.ogg
similarity index 100%
rename from SOUNDS/WORLD/CHNRTL1.ogg
rename to SOUNDS/Sounds Effects/Chains/CHNRTL1.ogg
diff --git a/SOUNDS/WORLD/CHNRTL2.ogg b/SOUNDS/Sounds Effects/Chains/CHNRTL2.ogg
similarity index 100%
rename from SOUNDS/WORLD/CHNRTL2.ogg
rename to SOUNDS/Sounds Effects/Chains/CHNRTL2.ogg
diff --git a/SOUNDS/WORLD/CHNRTL3.ogg b/SOUNDS/Sounds Effects/Chains/CHNRTL3.ogg
similarity index 100%
rename from SOUNDS/WORLD/CHNRTL3.ogg
rename to SOUNDS/Sounds Effects/Chains/CHNRTL3.ogg
diff --git a/SOUNDS/HD/DSBDCLS.ogg b/SOUNDS/Sounds Effects/Door/DSBDCLS.ogg
similarity index 100%
rename from SOUNDS/HD/DSBDCLS.ogg
rename to SOUNDS/Sounds Effects/Door/DSBDCLS.ogg
diff --git a/SOUNDS/HD/DSBDOPN.ogg b/SOUNDS/Sounds Effects/Door/DSBDOPN.ogg
similarity index 100%
rename from SOUNDS/HD/DSBDOPN.ogg
rename to SOUNDS/Sounds Effects/Door/DSBDOPN.ogg
diff --git a/SOUNDS/HD/DSDORCLS.ogg b/SOUNDS/Sounds Effects/Door/DSDORCLS.ogg
similarity index 100%
rename from SOUNDS/HD/DSDORCLS.ogg
rename to SOUNDS/Sounds Effects/Door/DSDORCLS.ogg
diff --git a/SOUNDS/HD/DSDOROPN.ogg b/SOUNDS/Sounds Effects/Door/DSDOROPN.ogg
similarity index 100%
rename from SOUNDS/HD/DSDOROPN.ogg
rename to SOUNDS/Sounds Effects/Door/DSDOROPN.ogg
diff --git a/SOUNDS/DSRDTRCH.ogg b/SOUNDS/Sounds Effects/Fire/DSRDTRCH.ogg
similarity index 100%
rename from SOUNDS/DSRDTRCH.ogg
rename to SOUNDS/Sounds Effects/Fire/DSRDTRCH.ogg
diff --git a/SOUNDS/ICEBRK1.ogg b/SOUNDS/Sounds Effects/Ice/ICEBRK1.ogg
similarity index 100%
rename from SOUNDS/ICEBRK1.ogg
rename to SOUNDS/Sounds Effects/Ice/ICEBRK1.ogg
diff --git a/SOUNDS/DSBUZZ.ogg b/SOUNDS/Sounds Effects/Insects/DSBUZZ.ogg
similarity index 100%
rename from SOUNDS/DSBUZZ.ogg
rename to SOUNDS/Sounds Effects/Insects/DSBUZZ.ogg
diff --git a/SOUNDS/WORLD/FLEAS.ogg b/SOUNDS/Sounds Effects/Insects/FLEAS.ogg
similarity index 100%
rename from SOUNDS/WORLD/FLEAS.ogg
rename to SOUNDS/Sounds Effects/Insects/FLEAS.ogg
diff --git a/SOUNDS/COMBAT/BHITDIR1.ogg b/SOUNDS/Sounds Effects/Other/BHITDIR1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/BHITDIR1.ogg
rename to SOUNDS/Sounds Effects/Other/BHITDIR1.ogg
diff --git a/SOUNDS/COMBAT/BHITDIR2.ogg b/SOUNDS/Sounds Effects/Other/BHITDIR2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/BHITDIR2.ogg
rename to SOUNDS/Sounds Effects/Other/BHITDIR2.ogg
diff --git a/SOUNDS/COMBAT/BHITDIR3.ogg b/SOUNDS/Sounds Effects/Other/BHITDIR3.ogg
similarity index 100%
rename from SOUNDS/COMBAT/BHITDIR3.ogg
rename to SOUNDS/Sounds Effects/Other/BHITDIR3.ogg
diff --git a/SOUNDS/COMBAT/BHITDIR4.ogg b/SOUNDS/Sounds Effects/Other/BHITDIR4.ogg
similarity index 100%
rename from SOUNDS/COMBAT/BHITDIR4.ogg
rename to SOUNDS/Sounds Effects/Other/BHITDIR4.ogg
diff --git a/SOUNDS/COMBAT/BHITDIR5.ogg b/SOUNDS/Sounds Effects/Other/BHITDIR5.ogg
similarity index 100%
rename from SOUNDS/COMBAT/BHITDIR5.ogg
rename to SOUNDS/Sounds Effects/Other/BHITDIR5.ogg
diff --git a/SOUNDS/HD/DSPSTART.ogg b/SOUNDS/Sounds Effects/Other/DSPSTART.ogg
similarity index 100%
rename from SOUNDS/HD/DSPSTART.ogg
rename to SOUNDS/Sounds Effects/Other/DSPSTART.ogg
diff --git a/SOUNDS/HD/DSPSTOP.ogg b/SOUNDS/Sounds Effects/Other/DSPSTOP.ogg
similarity index 100%
rename from SOUNDS/HD/DSPSTOP.ogg
rename to SOUNDS/Sounds Effects/Other/DSPSTOP.ogg
diff --git a/SOUNDS/DSSECRET.ogg b/SOUNDS/Sounds Effects/Other/DSSECRET.ogg
similarity index 100%
rename from SOUNDS/DSSECRET.ogg
rename to SOUNDS/Sounds Effects/Other/DSSECRET.ogg
diff --git a/SOUNDS/DSSKINNY.ogg b/SOUNDS/Sounds Effects/Other/DSSKINNY.ogg
similarity index 100%
rename from SOUNDS/DSSKINNY.ogg
rename to SOUNDS/Sounds Effects/Other/DSSKINNY.ogg
diff --git a/SOUNDS/HD/DSSTNMOV.ogg b/SOUNDS/Sounds Effects/Other/DSSTNMOV.ogg
similarity index 100%
rename from SOUNDS/HD/DSSTNMOV.ogg
rename to SOUNDS/Sounds Effects/Other/DSSTNMOV.ogg
diff --git a/SOUNDS/HD/DSSWTCHN.ogg b/SOUNDS/Sounds Effects/Other/DSSWTCHN.ogg
similarity index 100%
rename from SOUNDS/HD/DSSWTCHN.ogg
rename to SOUNDS/Sounds Effects/Other/DSSWTCHN.ogg
diff --git a/SOUNDS/HD/DSTELEPT.ogg b/SOUNDS/Sounds Effects/Other/DSTELEPT.ogg
similarity index 100%
rename from SOUNDS/HD/DSTELEPT.ogg
rename to SOUNDS/Sounds Effects/Other/DSTELEPT.ogg
diff --git a/SOUNDS/WORLD/LAMPLOP1.ogg b/SOUNDS/Sounds Effects/Spark/LAMPLOP1.ogg
similarity index 100%
rename from SOUNDS/WORLD/LAMPLOP1.ogg
rename to SOUNDS/Sounds Effects/Spark/LAMPLOP1.ogg
diff --git a/SOUNDS/WORLD/LAMPLOP2.ogg b/SOUNDS/Sounds Effects/Spark/LAMPLOP2.ogg
similarity index 100%
rename from SOUNDS/WORLD/LAMPLOP2.ogg
rename to SOUNDS/Sounds Effects/Spark/LAMPLOP2.ogg
diff --git a/SOUNDS/SPARKS1.ogg b/SOUNDS/Sounds Effects/Spark/SPARKS1.ogg
similarity index 100%
rename from SOUNDS/SPARKS1.ogg
rename to SOUNDS/Sounds Effects/Spark/SPARKS1.ogg
diff --git a/SOUNDS/SPARKS2.ogg b/SOUNDS/Sounds Effects/Spark/SPARKS2.ogg
similarity index 100%
rename from SOUNDS/SPARKS2.ogg
rename to SOUNDS/Sounds Effects/Spark/SPARKS2.ogg
diff --git a/SOUNDS/SPARKS3.ogg b/SOUNDS/Sounds Effects/Spark/SPARKS3.ogg
similarity index 100%
rename from SOUNDS/SPARKS3.ogg
rename to SOUNDS/Sounds Effects/Spark/SPARKS3.ogg
diff --git a/SOUNDS/SPARKS4.ogg b/SOUNDS/Sounds Effects/Spark/SPARKS4.ogg
similarity index 100%
rename from SOUNDS/SPARKS4.ogg
rename to SOUNDS/Sounds Effects/Spark/SPARKS4.ogg
diff --git a/SOUNDS/WORLD/AMBRAIN.ogg b/SOUNDS/Sounds Effects/Water/AMBRAIN.ogg
similarity index 100%
rename from SOUNDS/WORLD/AMBRAIN.ogg
rename to SOUNDS/Sounds Effects/Water/AMBRAIN.ogg
diff --git a/SOUNDS/WORLD/BDWFALL1.ogg b/SOUNDS/Sounds Effects/Water/BDWFALL1.ogg
similarity index 100%
rename from SOUNDS/WORLD/BDWFALL1.ogg
rename to SOUNDS/Sounds Effects/Water/BDWFALL1.ogg
diff --git a/SOUNDS/WORLD/BDWFALL2.ogg b/SOUNDS/Sounds Effects/Water/BDWFALL2.ogg
similarity index 100%
rename from SOUNDS/WORLD/BDWFALL2.ogg
rename to SOUNDS/Sounds Effects/Water/BDWFALL2.ogg
diff --git a/SOUNDS/WORLD/DSSPLAS3.ogg b/SOUNDS/Sounds Effects/Water/DSSPLAS3.ogg
similarity index 100%
rename from SOUNDS/WORLD/DSSPLAS3.ogg
rename to SOUNDS/Sounds Effects/Water/DSSPLAS3.ogg
diff --git a/SOUNDS/WORLD/bigspl1.ogg b/SOUNDS/Sounds Effects/Water/bigspl1.ogg
similarity index 100%
rename from SOUNDS/WORLD/bigspl1.ogg
rename to SOUNDS/Sounds Effects/Water/bigspl1.ogg
diff --git a/SOUNDS/COMBAT/DSRFA1.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/DSRFA1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/DSRFA1.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/DSRFA1.ogg
diff --git a/SOUNDS/COMBAT/DSRFA2.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/DSRFA2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/DSRFA2.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/DSRFA2.ogg
diff --git a/SOUNDS/COMBAT/distant/MASDIS1.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/MASDIS1.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/MASDIS1.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/MASDIS1.ogg
diff --git a/SOUNDS/COMBAT/distant/MASDIS2.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/MASDIS2.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/MASDIS2.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/MASDIS2.ogg
diff --git a/SOUNDS/COMBAT/distant/RGDIS.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/RGDIS.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/RGDIS.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/RGDIS.ogg
diff --git a/SOUNDS/COMBAT/distant/RLFARR.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/RLFARR.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/RLFARR.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/RLFARR.ogg
diff --git a/SOUNDS/COMBAT/distant/SGDIS.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/SGDIS.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/SGDIS.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/SGDIS.ogg
diff --git a/SOUNDS/COMBAT/distant/SSHFAR.ogg b/SOUNDS/Sounds for multiple things/Far range noises (Enemies)/SSHFAR.ogg
similarity index 100%
rename from SOUNDS/COMBAT/distant/SSHFAR.ogg
rename to SOUNDS/Sounds for multiple things/Far range noises (Enemies)/SSHFAR.ogg
diff --git a/SOUNDS/fALLEXP1.ogg b/SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP1.ogg
similarity index 100%
rename from SOUNDS/fALLEXP1.ogg
rename to SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP1.ogg
diff --git a/SOUNDS/fALLEXP2.ogg b/SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP2.ogg
similarity index 100%
rename from SOUNDS/fALLEXP2.ogg
rename to SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP2.ogg
diff --git a/SOUNDS/fALLEXP3.ogg b/SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP3.ogg
similarity index 100%
rename from SOUNDS/fALLEXP3.ogg
rename to SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP3.ogg
diff --git a/SOUNDS/fALLEXP4.ogg b/SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP4.ogg
similarity index 100%
rename from SOUNDS/fALLEXP4.ogg
rename to SOUNDS/Sounds for multiple things/Magma and Imps/fALLEXP4.ogg
diff --git a/SOUNDS/VEHICLES/ACANO1.ogg b/SOUNDS/VEHICLES/ACANO1.ogg
deleted file mode 100644
index 9e8acdb526..0000000000
Binary files a/SOUNDS/VEHICLES/ACANO1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/ACANO2.ogg b/SOUNDS/VEHICLES/ACANO2.ogg
deleted file mode 100644
index e1c2382c69..0000000000
Binary files a/SOUNDS/VEHICLES/ACANO2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIGPLSM1.ogg b/SOUNDS/VEHICLES/BIGPLSM1.ogg
deleted file mode 100644
index 6812d88ec4..0000000000
Binary files a/SOUNDS/VEHICLES/BIGPLSM1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIGPLSM2.ogg b/SOUNDS/VEHICLES/BIGPLSM2.ogg
deleted file mode 100644
index 08402d81be..0000000000
Binary files a/SOUNDS/VEHICLES/BIGPLSM2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKE1.ogg b/SOUNDS/VEHICLES/BIKE1.ogg
deleted file mode 100644
index 554692482b..0000000000
Binary files a/SOUNDS/VEHICLES/BIKE1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKE1A.ogg b/SOUNDS/VEHICLES/BIKE1A.ogg
deleted file mode 100644
index 11653774ec..0000000000
Binary files a/SOUNDS/VEHICLES/BIKE1A.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKE1B.ogg b/SOUNDS/VEHICLES/BIKE1B.ogg
deleted file mode 100644
index 250f20a8ef..0000000000
Binary files a/SOUNDS/VEHICLES/BIKE1B.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKE1C.ogg b/SOUNDS/VEHICLES/BIKE1C.ogg
deleted file mode 100644
index c9cc50c7b9..0000000000
Binary files a/SOUNDS/VEHICLES/BIKE1C.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKE1D.ogg b/SOUNDS/VEHICLES/BIKE1D.ogg
deleted file mode 100644
index 3ea07d97cd..0000000000
Binary files a/SOUNDS/VEHICLES/BIKE1D.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKECLW.ogg b/SOUNDS/VEHICLES/BIKECLW.ogg
deleted file mode 100644
index a4a23603cd..0000000000
Binary files a/SOUNDS/VEHICLES/BIKECLW.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKESK.ogg b/SOUNDS/VEHICLES/BIKESK.ogg
deleted file mode 100644
index b1df0d35e5..0000000000
Binary files a/SOUNDS/VEHICLES/BIKESK.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKESK1.ogg b/SOUNDS/VEHICLES/BIKESK1.ogg
deleted file mode 100644
index 6e96b6438c..0000000000
Binary files a/SOUNDS/VEHICLES/BIKESK1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKESK2.ogg b/SOUNDS/VEHICLES/BIKESK2.ogg
deleted file mode 100644
index d4195819b8..0000000000
Binary files a/SOUNDS/VEHICLES/BIKESK2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKESK3.ogg b/SOUNDS/VEHICLES/BIKESK3.ogg
deleted file mode 100644
index ab89f4dfc0..0000000000
Binary files a/SOUNDS/VEHICLES/BIKESK3.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BIKESTRT.ogg b/SOUNDS/VEHICLES/BIKESTRT.ogg
deleted file mode 100644
index eef46a3d2f..0000000000
Binary files a/SOUNDS/VEHICLES/BIKESTRT.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKDETH1.ogg b/SOUNDS/VEHICLES/BTKDETH1.ogg
deleted file mode 100644
index 4e264ac0c6..0000000000
Binary files a/SOUNDS/VEHICLES/BTKDETH1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKENGN1.ogg b/SOUNDS/VEHICLES/BTKENGN1.ogg
deleted file mode 100644
index e146a323fd..0000000000
Binary files a/SOUNDS/VEHICLES/BTKENGN1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKPAIN1.ogg b/SOUNDS/VEHICLES/BTKPAIN1.ogg
deleted file mode 100644
index c399421b53..0000000000
Binary files a/SOUNDS/VEHICLES/BTKPAIN1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKPAIN2.ogg b/SOUNDS/VEHICLES/BTKPAIN2.ogg
deleted file mode 100644
index ac2fa5f6a6..0000000000
Binary files a/SOUNDS/VEHICLES/BTKPAIN2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKPAIN3.ogg b/SOUNDS/VEHICLES/BTKPAIN3.ogg
deleted file mode 100644
index 889b248dcc..0000000000
Binary files a/SOUNDS/VEHICLES/BTKPAIN3.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKUNQV1.ogg b/SOUNDS/VEHICLES/BTKUNQV1.ogg
deleted file mode 100644
index 0509359526..0000000000
Binary files a/SOUNDS/VEHICLES/BTKUNQV1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/BTKUNQV2.ogg b/SOUNDS/VEHICLES/BTKUNQV2.ogg
deleted file mode 100644
index d4e0c29841..0000000000
Binary files a/SOUNDS/VEHICLES/BTKUNQV2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/DSXDTH2E.ogg b/SOUNDS/VEHICLES/DSXDTH2E.ogg
deleted file mode 100644
index 4b7b7ffadc..0000000000
Binary files a/SOUNDS/VEHICLES/DSXDTH2E.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/EBIKEBNC.ogg b/SOUNDS/VEHICLES/EBIKEBNC.ogg
deleted file mode 100644
index e56a2cb37e..0000000000
Binary files a/SOUNDS/VEHICLES/EBIKEBNC.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/EBIKECLS.ogg b/SOUNDS/VEHICLES/EBIKECLS.ogg
deleted file mode 100644
index e844e9f239..0000000000
Binary files a/SOUNDS/VEHICLES/EBIKECLS.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/HELILOP.ogg b/SOUNDS/VEHICLES/HELILOP.ogg
deleted file mode 100644
index 56ec71fc53..0000000000
Binary files a/SOUNDS/VEHICLES/HELILOP.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/HELILOP2.ogg b/SOUNDS/VEHICLES/HELILOP2.ogg
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/SOUNDS/VEHICLES/HELSTAR.ogg b/SOUNDS/VEHICLES/HELSTAR.ogg
deleted file mode 100644
index 7342c0672e..0000000000
Binary files a/SOUNDS/VEHICLES/HELSTAR.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/HELSTOP.ogg b/SOUNDS/VEHICLES/HELSTOP.ogg
deleted file mode 100644
index 7be08fbca5..0000000000
Binary files a/SOUNDS/VEHICLES/HELSTOP.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/MECHJUMP.ogg b/SOUNDS/VEHICLES/MECHJUMP.ogg
deleted file mode 100644
index d3eaac6318..0000000000
Binary files a/SOUNDS/VEHICLES/MECHJUMP.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/MECHWLK.ogg b/SOUNDS/VEHICLES/MECHWLK.ogg
deleted file mode 100644
index 1897894fa8..0000000000
Binary files a/SOUNDS/VEHICLES/MECHWLK.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/MISLFIRE.ogg b/SOUNDS/VEHICLES/MISLFIRE.ogg
deleted file mode 100644
index 2b294100fa..0000000000
Binary files a/SOUNDS/VEHICLES/MISLFIRE.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/REPAIR.ogg b/SOUNDS/VEHICLES/REPAIR.ogg
deleted file mode 100644
index fdb5a086fa..0000000000
Binary files a/SOUNDS/VEHICLES/REPAIR.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/RICMET1.ogg b/SOUNDS/VEHICLES/RICMET1.ogg
deleted file mode 100644
index 1d37e10ec0..0000000000
Binary files a/SOUNDS/VEHICLES/RICMET1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/RICMET2.ogg b/SOUNDS/VEHICLES/RICMET2.ogg
deleted file mode 100644
index b75d7af155..0000000000
Binary files a/SOUNDS/VEHICLES/RICMET2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/RICMET3.ogg b/SOUNDS/VEHICLES/RICMET3.ogg
deleted file mode 100644
index 34ab13002b..0000000000
Binary files a/SOUNDS/VEHICLES/RICMET3.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/RICMET4.ogg b/SOUNDS/VEHICLES/RICMET4.ogg
deleted file mode 100644
index 4e1440cd75..0000000000
Binary files a/SOUNDS/VEHICLES/RICMET4.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANK1.ogg b/SOUNDS/VEHICLES/TANK1.ogg
deleted file mode 100644
index e9d992d1d6..0000000000
Binary files a/SOUNDS/VEHICLES/TANK1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANK2.ogg b/SOUNDS/VEHICLES/TANK2.ogg
deleted file mode 100644
index 5c12078afa..0000000000
Binary files a/SOUNDS/VEHICLES/TANK2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANK3.ogg b/SOUNDS/VEHICLES/TANK3.ogg
deleted file mode 100644
index e012da7be8..0000000000
Binary files a/SOUNDS/VEHICLES/TANK3.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANKF1.ogg b/SOUNDS/VEHICLES/TANKF1.ogg
deleted file mode 100644
index dae5f5a37e..0000000000
Binary files a/SOUNDS/VEHICLES/TANKF1.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANKF2.ogg b/SOUNDS/VEHICLES/TANKF2.ogg
deleted file mode 100644
index a37898bd94..0000000000
Binary files a/SOUNDS/VEHICLES/TANKF2.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANKF3.ogg b/SOUNDS/VEHICLES/TANKF3.ogg
deleted file mode 100644
index 6b0c262a18..0000000000
Binary files a/SOUNDS/VEHICLES/TANKF3.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANKMG.ogg b/SOUNDS/VEHICLES/TANKMG.ogg
deleted file mode 100644
index ee9ea7c066..0000000000
Binary files a/SOUNDS/VEHICLES/TANKMG.ogg and /dev/null differ
diff --git a/SOUNDS/VEHICLES/TANKRE.ogg b/SOUNDS/VEHICLES/TANKRE.ogg
deleted file mode 100644
index 4b95399563..0000000000
Binary files a/SOUNDS/VEHICLES/TANKRE.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BBARREL1.ogg b/SOUNDS/WORLD/BBARREL1.ogg
deleted file mode 100644
index a99641f320..0000000000
Binary files a/SOUNDS/WORLD/BBARREL1.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BBARREL2.ogg b/SOUNDS/WORLD/BBARREL2.ogg
deleted file mode 100644
index ea787bc76a..0000000000
Binary files a/SOUNDS/WORLD/BBARREL2.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BBARREL3.ogg b/SOUNDS/WORLD/BBARREL3.ogg
deleted file mode 100644
index 1072cd67db..0000000000
Binary files a/SOUNDS/WORLD/BBARREL3.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BBARREL4.ogg b/SOUNDS/WORLD/BBARREL4.ogg
deleted file mode 100644
index e0c26de007..0000000000
Binary files a/SOUNDS/WORLD/BBARREL4.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BBARREL5.ogg b/SOUNDS/WORLD/BBARREL5.ogg
deleted file mode 100644
index 609c88c940..0000000000
Binary files a/SOUNDS/WORLD/BBARREL5.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/BDALARM.ogg b/SOUNDS/WORLD/BDALARM.ogg
deleted file mode 100644
index 8b79800f23..0000000000
Binary files a/SOUNDS/WORLD/BDALARM.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/FLORGLS1.ogg b/SOUNDS/WORLD/FLORGLS1.ogg
deleted file mode 100644
index 845c8d028b..0000000000
Binary files a/SOUNDS/WORLD/FLORGLS1.ogg and /dev/null differ
diff --git a/SOUNDS/WORLD/FLORGLS2.ogg b/SOUNDS/WORLD/FLORGLS2.ogg
deleted file mode 100644
index 9543c00e7a..0000000000
Binary files a/SOUNDS/WORLD/FLORGLS2.ogg and /dev/null differ
diff --git a/SOUNDS/ds10kcdn.ogg b/SOUNDS/ds10kcdn.ogg
deleted file mode 100644
index dd4cb015d6..0000000000
Binary files a/SOUNDS/ds10kcdn.ogg and /dev/null differ
diff --git a/SOUNDS/ds10kidl.ogg b/SOUNDS/ds10kidl.ogg
deleted file mode 100644
index b642097aa0..0000000000
Binary files a/SOUNDS/ds10kidl.ogg and /dev/null differ
diff --git a/SOUNDS/dsbfg10k.ogg b/SOUNDS/dsbfg10k.ogg
deleted file mode 100644
index dd90d8baf5..0000000000
Binary files a/SOUNDS/dsbfg10k.ogg and /dev/null differ
diff --git a/SOUNDS/dsbfgfir.ogg b/SOUNDS/dsbfgfir.ogg
deleted file mode 100644
index f092b67fe9..0000000000
Binary files a/SOUNDS/dsbfgfir.ogg and /dev/null differ
diff --git a/SOUNDS/erer7.ogg b/SOUNDS/erer7.ogg
deleted file mode 100644
index d5d4053b56..0000000000
Binary files a/SOUNDS/erer7.ogg and /dev/null differ
diff --git a/actors/Weapons/BaseWeapon.dec b/actors/Weapons/BaseWeapon.dec
index 5b91635ce7..cb0286d2b9 100644
--- a/actors/Weapons/BaseWeapon.dec
+++ b/actors/Weapons/BaseWeapon.dec
@@ -62,6 +62,7 @@ States
 		Loop
 	
 	SelectFirstPersonLegs:
+	    TNT1 A 0 A_StopSound(1)
 		//TNT1 A 0 A_Overlay(10, "Flash")
 		TNT1 A 0 A_TakeInventory("CantWeaponSpecial",1) //Fixes bug with Weapon Special Key no longer working when changing SGL grenade type or RL missile mode
 		TNT1 A 0 A_TakeInventory("DualFireReload",2)
diff --git a/actors/Weapons/Slot6/PLASMA.dec b/actors/Weapons/Slot6/PLASMA.dec
index 850e026b55..0d80ffc375 100644
--- a/actors/Weapons/Slot6/PLASMA.dec
+++ b/actors/Weapons/Slot6/PLASMA.dec
@@ -417,7 +417,7 @@ ACTOR PB_M1Plasma : PB_Weapon //Replaces PlasmaRifle
 		TNT1 A 0 A_TakeInventory("PlasmaGunSelected",1)
 		TNT1 A 0 A_Zoomfactor(1.0)
 		TNT1 A 0 A_StopSound(6)
-	    TNT1 A 0 A_PlaySound("PLSOFF", 1)
+	    TNT1 A 0 A_PlaySound("PLSOFF", 4)
 		TNT1 A 0 A_JumpIfInventory("GotMeatShield", 1, "GrabEnemy")
 		TNT1 A 0 A_JumpIfInventory("PB_Pulsecannon",1,"DeselectUpgrade")
 		TNT1 A 0 A_JumpIfInventory("DualWieldingPlasma",1,"DeselectDualWield")
@@ -1059,7 +1059,7 @@ Scale 0.19
 
 		Death:
 			TNT1 A 0 A_SpawnItem ("Plasma_Puff", 0)
-			TNT1 B 1 A_Explode(6,50,1)
+			TNT1 B 1 //A_Explode(6,50,1)
 			TNT1 A 0 A_SpawnItemEx ("DetectFloorCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 			TNT1 A 0 A_SpawnItemEx ("DetectCeilCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 			TNT1 A 0 A_CustomMissile ("BluePlasmaFire", 0, 0, random (0, 360), 2, random (0, 360))
@@ -1117,14 +1117,14 @@ ACTOR UltPlasma_Ball: Plasma_Ball
 			TNT1 A 0 A_SpawnItem ("Plasma_Puff", 0)
 			TNT1 A 0 A_CustomMissile ("BluePlasmaFire", 0, 0, random (0, 360), 2, random (0, 360))
 			TNT1 AAAAA 0 A_CustomMissile ("BluePlasmaParticle", 0, 0, random (0, 360), 2, random (0, 360))
-			TNT1 B 1 A_Explode(6,50,0)
+			TNT1 B 1
 			TNT1 B 4
 			TNT2 AAA 9 A_CustomMissile ("PlasmaSmoke", 1, 0, random (0, 360), 2, random (0, 160))		
 			Stop
 
 		Death:
 			TNT1 A 0 A_SpawnItem ("Plasma_Puff", 0)
-			TNT1 B 1 A_Explode(6,50,1)
+			TNT1 B 1 A_Explode(4,50,0)
 			TNT1 A 0 A_SpawnItemEx ("DetectFloorCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 			TNT1 A 0 A_SpawnItemEx ("DetectCeilCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 			TNT1 A 0 A_CustomMissile ("BluePlasmaFire", 0, 0, random (0, 360), 2, random (0, 360))
@@ -1162,6 +1162,7 @@ Actor EnemyPlasmaBall : PlasmaBall75
 	-THRUACTORS
 	-THRUSPECIES
 	-MTHRUSPECIES
+	+THRUGHOST
 	//+DONTHURTSPECIES
 	States 
 
diff --git a/actors/Weapons/Slot6/PulseCannon.dec b/actors/Weapons/Slot6/PulseCannon.dec
index 81ea827a04..865ceab02c 100644
--- a/actors/Weapons/Slot6/PulseCannon.dec
+++ b/actors/Weapons/Slot6/PulseCannon.dec
@@ -32,7 +32,7 @@ Actor PB_PulseCannonUpgrade : Custominventory
 	States
 	{
 	Spawn:
-		PLCU ABCDEDCB 2 BRIGHT Light("WeaponUpgradeSpawner")
+		PLCU ABCDEDCB 2
 		Loop
 	
     Pickup:
@@ -126,7 +126,7 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
 		TNT1 A 0 A_TakeInventory("PlasmaGunSelected",1)
 		TNT1 A 0 A_Zoomfactor(1.0)
 		TNT1 A 0 A_StopSound(6)
-	    TNT1 A 0 A_PlaySound("PLSOFF", 1)
+	    TNT1 A 0 A_PlaySound("PLSOFF", 4)
 		TNT1 A 0 A_JumpIfInventory("GotMeatShield", 1, "GrabEnemy")
         PZC9 CBA 1
 		TNT1 AAAAAAAAAAAAAAAAAA 0 A_Lower
@@ -191,7 +191,7 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
 		PZCF A 1 BRIGHT A_FireCustomMissile("PulseCannonBall", 0, 1, 0, 0)
 		TNT1 A 0 A_FireCustomMissile("ShakeYourAssMinor", 0, 0, 0, 0)
 		TNT1 A 0 A_SpawnItem("PinkIonFlare",14,30,0,0) //This looks like crap, but it could look really awesome
-		TNT1 A 0 PB_WeaponRecoil(-2.4,-1.6) //Add some recoil, copied from Plasma -sarge945
+		TNT1 A 0 PB_WeaponRecoil(-0.72,-0.18) //Add some recoil, copied from Plasma -sarge945
 		PZCF B 1 A_ZoomFactor(.970)
 		PZCF C 1 A_ZoomFactor(.965)
 		PZCF B 0 A_ZoomFactor(.985)
@@ -212,7 +212,7 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
 		
 	AltFire:
 		TNT1 A 0 A_WeaponOffset(0,32)
-        TNT1 A 0 A_JumpIfInventory("PulseCannonAmmo",20,13)
+        TNT1 A 0 A_JumpIfInventory("PulseCannonAmmo",30,13)
         Goto Reload
         TNT1 AAAAAAAAAAAAAAAAAAAAAAAAAAA 0
 		TNT1 A 0 A_StopSound(6)
@@ -244,22 +244,15 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
         TNT1 A 0 A_FireCustomMissile("PurplePlasmaFlare",0,0,0,0)
         TNT1 A 0 A_JumpIfInventory("Reloading",1,"DeCharge")
 		TNT1 A 0 A_SpawnItem("PlasmaGauntlet", 0, 1, 0, 0)
-		PZCS BCD 1 BRIGHT {
+		PZCS BCDC 1 BRIGHT {
 			A_SpawnItem("PlasmaGauntlet", 0, 1, 0, 0);
 			A_FireCustomMissile("PurplePlasmaFlare",0,0,0,0);
+			 A_FireCustomMissile("ShakeYourAssMinor", 0, 0, 0, 0);
 			A_SpawnItem("PlasmaGauntlet", 0, 1, 0, 0);
 			if(JustPressed(BT_RELOAD)){return state ("DeCharge");
 				}
 				return state ("");
 			}
-		TNT1 A 0 PB_WeaponRecoil(-2.4,-1.6) //Add some recoil, copied from Plasma -sarge945
-		PZCS C 1 BRIGHT {
-			A_SpawnItem("PlasmaGauntlet", 0, 1, 0, 0);
-			A_FireCustomMissile("PurplePlasmaFlare",0,0,0,0);
-			A_SpawnItem("PlasmaGauntlet", 0, 1, 0, 0);
-			if(JustPressed(BT_RELOAD)){return state ("DeCharge");}
-				return state ("");
-			}
 	    TNT1 A 0 A_ReFire
 
 		TNT1 A 0 A_StopSound(7)
@@ -271,9 +264,9 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
 		TNT1 A 0 A_FireCustomMissile("PulseCannonSuperBall", 0, 0, 0, 0)
 		CoolAfterAltFire:
 		TNT1 A 0 PB_WeaponRecoilBasic(-1.15) //A_SetPitch(Pitch - 1.15)
-		TNT1 A 0 A_Takeinventory("PulseCannonAmmo",20)
-		TNT1 A 0 A_TakeInventory("RightPulseCannonAmmo", 20)
-		TNT1 A 0 A_TakeInventory("DoublePulseCannonAmmo", 20)
+		TNT1 A 0 A_Takeinventory("PulseCannonAmmo",30)
+		TNT1 A 0 A_TakeInventory("RightPulseCannonAmmo", 30)
+		TNT1 A 0 A_TakeInventory("DoublePulseCannonAmmo", 30)
 		
         PZCR A 1 A_ZoomFactor(0.90)
 		
@@ -298,7 +291,7 @@ ACTOR PB_Pulsecannon : PB_M1Plasma
 		TNT1 A 4
         Goto LightDone
 	Spawn:
-		PLCU ABCDEDCB 2 BRIGHT
+		PLCU ABCDEDCB 2
 		Loop
 	DeCharge:
 		TNT1 A 0 A_StopSound(7)
@@ -613,7 +606,7 @@ Xdeath:
 
 	Death:
 	TNT1 A 0 
-	TNT1 B 1 A_Explode(6,50,1)
+	TNT1 B 1 //A_Explode(8,50,1)
 	TNT1 A 0 A_SpawnItemEx ("DetectFloorCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 	TNT1 A 0 A_SpawnItemEx ("DetectCeilCraterSmall",0,0,0,0,0,0,0,SXF_NOCHECKPOSITION,0)
 	TNT1 A 0 A_CustomMissile ("PurplePlasmaFire", 0, 0, random (0, 360), 2, random (0, 360))
@@ -627,9 +620,9 @@ Xdeath:
 ACTOR PulseCannonBeamTrail
 {
   RenderStyle Add
-  Scale 0.07
+  Scale 0.05
   Alpha 0.7
-  Translation "0:255=%[0,0,0]:[1,0,1]"
+//  Translation "0:255=%[0,0,0]:[1,0,1]"
   +NOINTERACTION
   +NOGRAVITY
   States
@@ -637,11 +630,11 @@ ACTOR PulseCannonBeamTrail
   Spawn:
     TNT1 A 0
     TNT1 A 0 A_SetScale(ScaleX, ScaleY -0.005)
-    YAE5 A 1 bright
+    YA36 A 1 bright
   Trolololo:
-    YAE5 A 0 A_JumpIf(ScaleY <= 0, "NULL")
-    YAE5 A 0 A_SetScale(ScaleX -0.01, ScaleY -0.01)
-    YAE5 A 1 bright A_FadeOut(0.025)
+    YA36 A 0 A_JumpIf(ScaleY <= 0, "NULL")
+    YA36 A 0 A_SetScale(ScaleX -0.01, ScaleY -0.01)
+    YA36 A 1 bright A_FadeOut(0.025)
     Loop
   }
 }
@@ -673,7 +666,7 @@ ACTOR PulseCannonSuperBall
   Radius 16
   Height 16
   Damage 4
-  Speed 7
+  Speed 28
   RenderStyle Add
   Scale 0.14
   DamageType Blackhole