diff --git a/Audio/announcer/female/game_over.wav b/Audio/Announcer/female/GameOver.wav
similarity index 100%
rename from Audio/announcer/female/game_over.wav
rename to Audio/Announcer/female/GameOver.wav
diff --git a/Audio/announcer/female/hurry_up.wav b/Audio/Announcer/female/HurryUp.wav
similarity index 100%
rename from Audio/announcer/female/hurry_up.wav
rename to Audio/Announcer/female/HurryUp.wav
diff --git a/Audio/announcer/female/mission_completed.wav b/Audio/Announcer/female/MissionCompleted.wav
similarity index 100%
rename from Audio/announcer/female/mission_completed.wav
rename to Audio/Announcer/female/MissionCompleted.wav
diff --git a/Audio/announcer/female/mission_failed.wav b/Audio/Announcer/female/MissionFailed.wav
similarity index 100%
rename from Audio/announcer/female/mission_failed.wav
rename to Audio/Announcer/female/MissionFailed.wav
diff --git a/Audio/announcer/female/objective_achieved.wav b/Audio/Announcer/female/ObjectiveAchieved.wav
similarity index 100%
rename from Audio/announcer/female/objective_achieved.wav
rename to Audio/Announcer/female/ObjectiveAchieved.wav
diff --git a/Audio/announcer/female/objective_failed.wav b/Audio/Announcer/female/ObjectiveFailed.wav
similarity index 100%
rename from Audio/announcer/female/objective_failed.wav
rename to Audio/Announcer/female/ObjectiveFailed.wav
diff --git a/Audio/announcer/female/time_over.wav b/Audio/Announcer/female/TimeOver.wav
similarity index 100%
rename from Audio/announcer/female/time_over.wav
rename to Audio/Announcer/female/TimeOver.wav
diff --git a/Audio/announcer/female/you_lose.wav b/Audio/Announcer/female/YouLose.wav
similarity index 100%
rename from Audio/announcer/female/you_lose.wav
rename to Audio/Announcer/female/YouLose.wav
diff --git a/Audio/announcer/female/you_win.wav b/Audio/Announcer/female/YouWin.wav
similarity index 100%
rename from Audio/announcer/female/you_win.wav
rename to Audio/Announcer/female/YouWin.wav
diff --git a/Audio/announcer/male/game_over.wav b/Audio/Announcer/male/GameOver.wav
similarity index 100%
rename from Audio/announcer/male/game_over.wav
rename to Audio/Announcer/male/GameOver.wav
diff --git a/Audio/announcer/male/hurry_up.wav b/Audio/Announcer/male/HurryUp.wav
similarity index 100%
rename from Audio/announcer/male/hurry_up.wav
rename to Audio/Announcer/male/HurryUp.wav
diff --git a/Audio/announcer/male/mission_completed.wav b/Audio/Announcer/male/MissionCompleted.wav
similarity index 100%
rename from Audio/announcer/male/mission_completed.wav
rename to Audio/Announcer/male/MissionCompleted.wav
diff --git a/Audio/announcer/male/mission_failed.wav b/Audio/Announcer/male/MissionFailed.wav
similarity index 100%
rename from Audio/announcer/male/mission_failed.wav
rename to Audio/Announcer/male/MissionFailed.wav
diff --git a/Audio/announcer/male/objective_achieved.wav b/Audio/Announcer/male/ObjectiveAchieved.wav
similarity index 100%
rename from Audio/announcer/male/objective_achieved.wav
rename to Audio/Announcer/male/ObjectiveAchieved.wav
diff --git a/Audio/announcer/male/time_over.wav b/Audio/Announcer/male/TimeOver.wav
similarity index 100%
rename from Audio/announcer/male/time_over.wav
rename to Audio/Announcer/male/TimeOver.wav
diff --git a/Audio/announcer/male/you_lose.wav b/Audio/Announcer/male/YouLose.wav
similarity index 100%
rename from Audio/announcer/male/you_lose.wav
rename to Audio/Announcer/male/YouLose.wav
diff --git a/Audio/announcer/male/you_win.wav b/Audio/Announcer/male/YouWin.wav
similarity index 100%
rename from Audio/announcer/male/you_win.wav
rename to Audio/Announcer/male/YouWin.wav
diff --git a/Audio/Weapon/Assault/AssaultWeaponFire.wav b/Audio/Weapon/Assault/AssaultWeaponFire.wav
new file mode 100644
index 0000000..7775b38
Binary files /dev/null and b/Audio/Weapon/Assault/AssaultWeaponFire.wav differ
diff --git a/Audio/weapon/reload.wav b/Audio/Weapon/Assault/AssaultWeaponReload.wav
similarity index 100%
rename from Audio/weapon/reload.wav
rename to Audio/Weapon/Assault/AssaultWeaponReload.wav
diff --git a/Audio/Weapon/Licenses.txt b/Audio/Weapon/Licenses.txt
new file mode 100644
index 0000000..1a5e01d
--- /dev/null
+++ b/Audio/Weapon/Licenses.txt
@@ -0,0 +1,4 @@
+ShotgunFire.wav - http://soundbible.com/1771-Laser-Cannon.html
+
+
+AsssaultWeaponFire.wav - http://soundbible.com/1774-Laser-Machine-Gun.html
\ No newline at end of file
diff --git a/Audio/laser/laser1.wav b/Audio/Weapon/Secondary/SecondaryFire.wav
similarity index 100%
rename from Audio/laser/laser1.wav
rename to Audio/Weapon/Secondary/SecondaryFire.wav
diff --git a/Audio/Weapon/Shotgun/ShotgunFire.wav b/Audio/Weapon/Shotgun/ShotgunFire.wav
new file mode 100644
index 0000000..6a3b9d0
Binary files /dev/null and b/Audio/Weapon/Shotgun/ShotgunFire.wav differ
diff --git a/Audio/crosscounter.wav b/Audio/crosscounter.wav
deleted file mode 100644
index 5e0c3ab..0000000
Binary files a/Audio/crosscounter.wav and /dev/null differ
diff --git a/Audio/lalala.wav b/Audio/lalala.wav
deleted file mode 100644
index 228ecb1..0000000
Binary files a/Audio/lalala.wav and /dev/null differ