Convert 00shot to shot and 357 to 357sig

10 files changed, 383 insertions, 352 deletions

diff --git a/guns/357.json b/guns/357.json
deleted file mode 100644
index 11d6d9d..0000000
--- a/guns/357.json
+++ /dev/null
@@ -1,64 +0,0 @@
-[
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "p226_357sig",
-        "files" : [
-            "guns/357/357.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "p226_357sig",
-        "files" : [
-            "guns/357/357.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "p226_357sig",
-        "files" : [
-            "guns/reload/revolver/revolver_1.ogg",
-			"guns/reload/revolver/revolver_2.ogg",
-			"guns/reload/revolver/revolver_3.ogg",
-			"guns/reload/revolver/revolver_4.ogg",
-			"guns/reload/revolver/revolver_5.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "fire_gun",
-        "volume" : 100,
-        "variant" : "p320_357sig",
-        "files" : [
-            "guns/357/357.ogg"
-        ]
-    },
-	{
-        "type": "sound_effect",
-        "id" : "fire_gun_distant",
-        "volume" : 60,
-        "variant" : "p320_357sig",
-        "files" : [
-            "guns/357/357.ogg"
-        ]
-    },
-    {
-        "type": "sound_effect",
-        "id" : "reload",
-        "volume" : 90,
-        "variant" : "p320_357sig",
-        "files" : [
-            "guns/reload/revolver/revolver_1.ogg",
-			"guns/reload/revolver/revolver_2.ogg",
-			"guns/reload/revolver/revolver_3.ogg",
-			"guns/reload/revolver/revolver_4.ogg",
-			"guns/reload/revolver/revolver_5.ogg"
-        ]
-    }
-]
diff --git a/guns/357sig.json b/guns/357sig.json
new file mode 100644
index 0000000..c3362bd
--- /dev/null
+++ b/guns/357sig.json
@@ -0,0 +1,95 @@
+[
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "p226_357sig",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "p226_357sig",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "p226_357sig",
+        "files" : [
+            "guns/reload/pistol_l/pistol_1.ogg",
+			"guns/reload/pistol_l/pistol_2.ogg",
+			"guns/reload/pistol_l/pistol_3.ogg",
+			"guns/reload/pistol_l/pistol_4.ogg",
+			"guns/reload/pistol_l/pistol_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "glock_31",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "glock_31",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "glock_31",
+        "files" : [
+            "guns/reload/pistol_l/pistol_1.ogg",
+			"guns/reload/pistol_l/pistol_2.ogg",
+			"guns/reload/pistol_l/pistol_3.ogg",
+			"guns/reload/pistol_l/pistol_4.ogg",
+			"guns/reload/pistol_l/pistol_5.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "fire_gun",
+        "volume" : 100,
+        "variant" : "p320_357sig",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+	{
+        "type": "sound_effect",
+        "id" : "fire_gun_distant",
+        "volume" : 60,
+        "variant" : "p320_357sig",
+        "files" : [
+            "guns/357sig/357sig.ogg"
+        ]
+    },
+    {
+        "type": "sound_effect",
+        "id" : "reload",
+        "volume" : 90,
+        "variant" : "p320_357sig",
+        "files" : [
+            "guns/reload/pistol_l/pistol_1.ogg",
+			"guns/reload/pistol_l/pistol_2.ogg",
+			"guns/reload/pistol_l/pistol_3.ogg",
+			"guns/reload/pistol_l/pistol_4.ogg",
+			"guns/reload/pistol_l/pistol_5.ogg"
+        ]
+    }
+]
diff --git a/guns/357/357.ogg b/guns/357sig/357sig.ogg
index f85fe9c..f85fe9c 100644
--- a/guns/357/357.ogg
+++ b/guns/357sig/357sig.ogg
diff --git a/guns/Other.json b/guns/Other.json
index 8f19291..d5d7c6f 100644
--- a/guns/Other.json
+++ b/guns/Other.json
@@ -513,10 +513,10 @@
         "volume" : 100,
         "variant" : "abzats",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg"
         ]
     },
 	{
@@ -525,10 +525,10 @@
         "volume" : 40,
         "variant" : "abzats",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg"
         ]
     },
     {
diff --git a/guns/00shot.json b/guns/shot.json
index c97a98f..f83a1a3 100644
--- a/guns/00shot.json
+++ b/guns/shot.json
@@ -5,11 +5,11 @@
         "volume" : 100,
         "variant" : "lemat_revolver_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -18,11 +18,11 @@
         "volume" : 60,
         "variant" : "lemat_revolver_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -44,11 +44,11 @@
         "volume" : 100,
         "variant" : "pipe_combination_gun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -57,11 +57,11 @@
         "volume" : 60,
         "variant" : "pipe_combination_gun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -83,11 +83,11 @@
         "volume" : 100,
         "variant" : "masterkey",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -96,11 +96,11 @@
         "volume" : 60,
         "variant" : "masterkey",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -122,11 +122,11 @@
         "volume" : 100,
         "variant" : "combination_gun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -135,11 +135,11 @@
         "volume" : 60,
         "variant" : "combination_gun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -161,11 +161,11 @@
         "volume" : 100,
         "variant" : "combination_gun_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -174,11 +174,11 @@
         "volume" : 60,
         "variant" : "combination_gun_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -200,11 +200,11 @@
         "volume" : 100,
         "variant" : "combination_gun_shotgun_pipe",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -213,11 +213,11 @@
         "volume" : 60,
         "variant" : "combination_gun_shotgun_pipe",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -239,11 +239,11 @@
         "volume" : 100,
         "variant" : "ashot",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -252,11 +252,11 @@
         "volume" : 60,
         "variant" : "ashot",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -278,11 +278,11 @@
         "volume" : 100,
         "variant" : "bigun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -291,11 +291,11 @@
         "volume" : 60,
         "variant" : "bigun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -317,11 +317,11 @@
         "volume" : 100,
         "variant" : "ksg",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -330,11 +330,11 @@
         "volume" : 60,
         "variant" : "ksg",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -356,11 +356,11 @@
         "volume" : 100,
         "variant" : "ksg_aux_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -369,11 +369,11 @@
         "volume" : 60,
         "variant" : "ksg_aux_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -395,11 +395,11 @@
         "volume" : 100,
         "variant" : "l_def_12",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -408,11 +408,11 @@
         "volume" : 60,
         "variant" : "l_def_12",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -434,11 +434,11 @@
         "volume" : 100,
         "variant" : "m1014",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -447,11 +447,11 @@
         "volume" : 60,
         "variant" : "m1014",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -473,11 +473,11 @@
         "volume" : 100,
         "variant" : "mossberg_500",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -486,11 +486,11 @@
         "volume" : 60,
         "variant" : "mossberg_500",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -512,11 +512,11 @@
         "volume" : 100,
         "variant" : "mossberg_500_security",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -525,11 +525,11 @@
         "volume" : 60,
         "variant" : "mossberg_500_security",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -538,11 +538,11 @@
         "volume" : 100,
         "variant" : "mossberg_590",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -551,11 +551,11 @@
         "volume" : 60,
         "variant" : "mossberg_590",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -590,11 +590,11 @@
         "volume" : 100,
         "variant" : "mossberg_930",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -603,11 +603,11 @@
         "volume" : 60,
         "variant" : "mossberg_930",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -629,11 +629,11 @@
         "volume" : 100,
         "variant" : "pipe_double_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -642,11 +642,11 @@
         "volume" : 60,
         "variant" : "pipe_double_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -668,11 +668,11 @@
         "volume" : 100,
         "variant" : "pipe_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -681,11 +681,11 @@
         "volume" : 60,
         "variant" : "pipe_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -707,11 +707,11 @@
         "volume" : 100,
         "variant" : "remington_870",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -720,11 +720,11 @@
         "volume" : 60,
         "variant" : "remington_870",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -746,11 +746,11 @@
         "volume" : 100,
         "variant" : "remington_870_breacher",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -759,11 +759,11 @@
         "volume" : 60,
         "variant" : "remington_870_breacher",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -785,11 +785,11 @@
         "volume" : 100,
         "variant" : "remington_870_express",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -798,11 +798,11 @@
         "volume" : 60,
         "variant" : "remington_870_express",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -824,11 +824,11 @@
         "volume" : 100,
         "variant" : "revolver_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -837,11 +837,11 @@
         "volume" : 60,
         "variant" : "revolver_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -863,11 +863,11 @@
         "volume" : 100,
         "variant" : "saiga_12",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -876,11 +876,11 @@
         "volume" : 60,
         "variant" : "saiga_12",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -902,11 +902,11 @@
         "volume" : 100,
         "variant" : "shotgun_d",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -915,11 +915,11 @@
         "volume" : 60,
         "variant" : "shotgun_d",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -941,11 +941,11 @@
         "volume" : 100,
         "variant" : "shotgun_s",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -954,11 +954,11 @@
         "volume" : 60,
         "variant" : "shotgun_s",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -980,11 +980,11 @@
         "volume" : 100,
         "variant" : "u_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -993,11 +993,11 @@
         "volume" : 60,
         "variant" : "u_shotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -1019,11 +1019,11 @@
         "volume" : 100,
         "variant" : "surv_levershotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -1032,11 +1032,11 @@
         "volume" : 60,
         "variant" : "surv_levershotgun",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
@@ -1058,11 +1058,11 @@
         "volume" : 100,
         "variant" : "browning_a5",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
 	{
@@ -1071,11 +1071,11 @@
         "volume" : 60,
         "variant" : "browning_a5",
         "files" : [
-            "guns/00shot/00shot1.ogg",
-			"guns/00shot/00shot2.ogg",
-			"guns/00shot/00shot3.ogg",
-			"guns/00shot/00shot4.ogg",
-			"guns/00shot/00shot5.ogg"
+            "guns/shot/shot1.ogg",
+			"guns/shot/shot2.ogg",
+			"guns/shot/shot3.ogg",
+			"guns/shot/shot4.ogg",
+			"guns/shot/shot5.ogg"
         ]
     },
     {
diff --git a/guns/00shot/00shot1.ogg b/guns/shot/shot1.ogg
index 5e52a58..5e52a58 100644
--- a/guns/00shot/00shot1.ogg
+++ b/guns/shot/shot1.ogg
diff --git a/guns/00shot/00shot2.ogg b/guns/shot/shot2.ogg
index a1fb63c..a1fb63c 100644
--- a/guns/00shot/00shot2.ogg
+++ b/guns/shot/shot2.ogg
diff --git a/guns/00shot/00shot3.ogg b/guns/shot/shot3.ogg
index b27ca2d..b27ca2d 100644
--- a/guns/00shot/00shot3.ogg
+++ b/guns/shot/shot3.ogg
diff --git a/guns/00shot/00shot4.ogg b/guns/shot/shot4.ogg
index 63ddc43..63ddc43 100644
--- a/guns/00shot/00shot4.ogg
+++ b/guns/shot/shot4.ogg
diff --git a/guns/00shot/00shot5.ogg b/guns/shot/shot5.ogg
index ed1aaf3..ed1aaf3 100644
--- a/guns/00shot/00shot5.ogg
+++ b/guns/shot/shot5.ogg