diff --git a/gamedir/Data/Sounds/Weapons/Misc/30-06_GARAND SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/30M1/30-06 GARAND SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/Misc/30-06_GARAND SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/30M1/30-06 GARAND SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 AUTOMAGIII SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 AUTOMAGIII SINGLE SHOT.ogg
new file mode 100644
index 000000000..ad5b49dfe
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 AUTOMAGIII SINGLE SHOT.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M1C SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M1C SINGLE SHOT.ogg
new file mode 100644
index 000000000..b24666ed5
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M1C SINGLE SHOT.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 1.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 1.ogg
new file mode 100644
index 000000000..9d8ee7b88
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 1.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 10.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 10.ogg
new file mode 100644
index 000000000..90aded974
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 10.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 11.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 11.ogg
new file mode 100644
index 000000000..8c8f8cc35
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 11.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 12.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 12.ogg
new file mode 100644
index 000000000..a6e7d5e64
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 12.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 13.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 13.ogg
new file mode 100644
index 000000000..312fad22b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 13.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 14.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 14.ogg
new file mode 100644
index 000000000..211a60a38
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 14.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 15.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 15.ogg
new file mode 100644
index 000000000..5f4dea1c1
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 15.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 16.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 16.ogg
new file mode 100644
index 000000000..37a99e8c4
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 16.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 17.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 17.ogg
new file mode 100644
index 000000000..c9f5f9ea4
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 17.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 18.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 18.ogg
new file mode 100644
index 000000000..5af5b4323
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 18.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 19.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 19.ogg
new file mode 100644
index 000000000..788be7999
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 19.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 2.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 2.ogg
new file mode 100644
index 000000000..cdd3fb2aa
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 2.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 20.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 20.ogg
new file mode 100644
index 000000000..1e3a0926c
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 20.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 21.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 21.ogg
new file mode 100644
index 000000000..c02d0b1ba
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 21.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 22.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 22.ogg
new file mode 100644
index 000000000..f2054ee92
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 22.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 23.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 23.ogg
new file mode 100644
index 000000000..6de2fc8ae
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 23.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 24.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 24.ogg
new file mode 100644
index 000000000..68bba6a75
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 24.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 25.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 25.ogg
new file mode 100644
index 000000000..b219af37d
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 25.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 26.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 26.ogg
new file mode 100644
index 000000000..52d407c4a
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 26.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 27.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 27.ogg
new file mode 100644
index 000000000..b32662323
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 27.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 28.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 28.ogg
new file mode 100644
index 000000000..65f04c942
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 28.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 29.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 29.ogg
new file mode 100644
index 000000000..61ca223b3
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 29.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 3.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 3.ogg
new file mode 100644
index 000000000..74b00fa27
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 3.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 30.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 30.ogg
new file mode 100644
index 000000000..6b54f026b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 30.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 4.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 4.ogg
new file mode 100644
index 000000000..4289c487c
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 4.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 5.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 5.ogg
new file mode 100644
index 000000000..b606cda1d
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 5.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 6.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 6.ogg
new file mode 100644
index 000000000..108251c58
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 6.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 7.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 7.ogg
new file mode 100644
index 000000000..68d548f6b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 7.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 8.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 8.ogg
new file mode 100644
index 000000000..b002f55fe
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 8.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 9.ogg b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 9.ogg
new file mode 100644
index 000000000..f3d7e1219
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/30M1/30M1 M2 BURST 9.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/44/44MAG WIN94 SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/44/44 Mag WIN94 Single Shot.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/44/44MAG WIN94 SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/44/44 Mag WIN94 Single Shot.ogg
diff --git a/gamedir/Data/Sounds/Weapons/45/45LC SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/45/45 LC Single Shot.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/45/45LC SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/45/45 LC Single Shot.ogg
diff --git a/gamedir/Data/Sounds/Weapons/47/4,73x25G11PDWSINGLESHOT.ogg b/gamedir/Data/Sounds/Weapons/47/4,73x25 G11PDW SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/47/4,73x25G11PDWSINGLESHOT.ogg
rename to gamedir/Data/Sounds/Weapons/47/4,73x25 G11PDW SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/50/50AE DE SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/50/50 AE DE SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/50/50AE DE SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/50/50 AE DE SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/m40.wav b/gamedir/Data/Sounds/Weapons/7,62 NATO M40.wav
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/m40.wav
rename to gamedir/Data/Sounds/Weapons/7,62 NATO M40.wav
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 1.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 1.ogg
new file mode 100644
index 000000000..69ea58634
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 1.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 10.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 10.ogg
new file mode 100644
index 000000000..a14d19fdb
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 10.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 11.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 11.ogg
new file mode 100644
index 000000000..8a564900e
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 11.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 12.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 12.ogg
new file mode 100644
index 000000000..67b5be0fb
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 12.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 13.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 13.ogg
new file mode 100644
index 000000000..2b1190d57
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 13.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 14.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 14.ogg
new file mode 100644
index 000000000..dba55ae49
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 14.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 15.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 15.ogg
new file mode 100644
index 000000000..1cb6de38f
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 15.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 16.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 16.ogg
new file mode 100644
index 000000000..11f914dec
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 16.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 17.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 17.ogg
new file mode 100644
index 000000000..fb40d6571
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 17.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 18.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 18.ogg
new file mode 100644
index 000000000..44c45c05f
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 18.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 19.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 19.ogg
new file mode 100644
index 000000000..7214d1a2e
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 19.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 2.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 2.ogg
new file mode 100644
index 000000000..46db994dc
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 2.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 20.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 20.ogg
new file mode 100644
index 000000000..85b378b5b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 20.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 21.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 21.ogg
new file mode 100644
index 000000000..4f220b27d
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 21.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 22.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 22.ogg
new file mode 100644
index 000000000..3f334c8a9
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 22.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 23.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 23.ogg
new file mode 100644
index 000000000..d5d2e901b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 23.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 24.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 24.ogg
new file mode 100644
index 000000000..0c5d90ffc
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 24.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 25.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 25.ogg
new file mode 100644
index 000000000..bd5f68076
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 25.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 26.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 26.ogg
new file mode 100644
index 000000000..87093e4b2
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 26.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 27.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 27.ogg
new file mode 100644
index 000000000..243ea6eeb
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 27.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 28.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 28.ogg
new file mode 100644
index 000000000..56fafe04b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 28.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 29.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 29.ogg
new file mode 100644
index 000000000..7d5752f86
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 29.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 3.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 3.ogg
new file mode 100644
index 000000000..9ae99014b
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 3.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 30.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 30.ogg
new file mode 100644
index 000000000..c6852957f
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 30.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 31.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 31.ogg
new file mode 100644
index 000000000..67fdbad3e
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 31.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 32.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 32.ogg
new file mode 100644
index 000000000..0c84e7952
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 32.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 4.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 4.ogg
new file mode 100644
index 000000000..6194882f1
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 4.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 5.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 5.ogg
new file mode 100644
index 000000000..6e4e0259d
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 5.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 6.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 6.ogg
new file mode 100644
index 000000000..076a0bd12
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 6.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 7.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 7.ogg
new file mode 100644
index 000000000..b656bec6d
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 7.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 8.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 8.ogg
new file mode 100644
index 000000000..986854631
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 8.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 9.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 9.ogg
new file mode 100644
index 000000000..ccf7bc1a5
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 BURST 9.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 SINGLE SHOT.ogg
new file mode 100644
index 000000000..fe825d91f
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/9x19/9MM MP40 SINGLE SHOT.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/Heavy/25x59BXM25SINGLESHOT.ogg b/gamedir/Data/Sounds/Weapons/Heavy/25x59 BXM25 SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/Heavy/25x59BXM25SINGLESHOT.ogg
rename to gamedir/Data/Sounds/Weapons/Heavy/25x59 BXM25 SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/Heavy/40MMVOG GP25 SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/Heavy/40MM VOG GP25 SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/Heavy/40MMVOG GP25 SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/Heavy/40MM VOG GP25 SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/Heavy/40MMVOG RG6 SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/Heavy/40MM VOG RG6 SINGLE SHOT.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/Heavy/40MMVOG RG6 SINGLE SHOT.ogg
rename to gamedir/Data/Sounds/Weapons/Heavy/40MM VOG RG6 SINGLE SHOT.ogg
diff --git a/gamedir/Data/Sounds/Weapons/Misc/30-06 GARAND SINGLE SHOT.ogg b/gamedir/Data/Sounds/Weapons/Misc/30-06 GARAND SINGLE SHOT.ogg
new file mode 100644
index 000000000..1deadabca
Binary files /dev/null and b/gamedir/Data/Sounds/Weapons/Misc/30-06 GARAND SINGLE SHOT.ogg differ
diff --git a/gamedir/Data/Sounds/Weapons/Misc/9X21SP10 GYURZA.ogg b/gamedir/Data/Sounds/Weapons/Misc/9X21 SP10 GYURZA.ogg
similarity index 100%
rename from gamedir/Data/Sounds/Weapons/Misc/9X21SP10 GYURZA.ogg
rename to gamedir/Data/Sounds/Weapons/Misc/9X21 SP10 GYURZA.ogg