diff --git a/Templates/Empty/game/core/art/sound/volumeTest.wav b/Templates/Empty/game/art/sound/ui/volumeTest.wav
similarity index 100%
rename from Templates/Empty/game/core/art/sound/volumeTest.wav
rename to Templates/Empty/game/art/sound/ui/volumeTest.wav
diff --git a/Templates/Empty/game/scripts/gui/optionsDlg.cs b/Templates/Empty/game/scripts/gui/optionsDlg.cs
index 0784c7939..3e2ea865f 100644
--- a/Templates/Empty/game/scripts/gui/optionsDlg.cs
+++ b/Templates/Empty/game/scripts/gui/optionsDlg.cs
@@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
    $pref::SFX::masterVolume = %volume;
    
    if( !isObject( $AudioTestHandle ) )
-      $AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
 }
 
 function OptAudioUpdateChannelVolume( %description, %volume )
@@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
    if( !isObject( $AudioTestHandle ) )
    {
       $AudioTestDescription.volume = %volume;
-      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
    }
 }
 
diff --git a/Templates/Full/game/art/datablocks/audioProfiles.cs b/Templates/Full/game/art/datablocks/audioProfiles.cs
index 36afba56c..34aa3fd36 100644
--- a/Templates/Full/game/art/datablocks/audioProfiles.cs
+++ b/Templates/Full/game/art/datablocks/audioProfiles.cs
@@ -33,10 +33,3 @@ datablock SFXProfile(ThrowSnd)
    description = AudioClose3d;
    preload = false;
 };
-
-datablock SFXProfile(OOBWarningSnd)
-{
-   filename = "art/sound/orc_pain";
-   description = "AudioLoop2D";
-   preload = false;
-};
diff --git a/Templates/Full/game/art/datablocks/weapons/Lurker.cs b/Templates/Full/game/art/datablocks/weapons/Lurker.cs
index 35cc0ce0d..446e05d44 100644
--- a/Templates/Full/game/art/datablocks/weapons/Lurker.cs
+++ b/Templates/Full/game/art/datablocks/weapons/Lurker.cs
@@ -68,7 +68,7 @@ datablock SFXPlayList(LurkerFireSoundList)
 
 /*datablock SFXProfile(BulletImpactSound)
 {
-   filename = "art/sound/CT_fx/weapons/SCARFIRE";
+   filename = "art/sound/weapons/SCARFIRE";
    description = AudioClose3D;
    preload = true;
 };*/
diff --git a/Templates/Full/game/art/datablocks/weapons/grenadefx.cs b/Templates/Full/game/art/datablocks/weapons/grenadefx.cs
index 00ac1af72..473cd81b8 100644
--- a/Templates/Full/game/art/datablocks/weapons/grenadefx.cs
+++ b/Templates/Full/game/art/datablocks/weapons/grenadefx.cs
@@ -22,7 +22,7 @@ $GrenadeUpVectorOffset = "0 0 1";
 
 datablock SFXProfile(GrenadeExplosionSound)
 {
-   filename = "art/sound/CT_fx/weapons/GRENADELAND.wav";
+   filename = "art/sound/weapons/GRENADELAND.wav";
    description = AudioDefault3d;
    preload = true;
 };
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav b/Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav
deleted file mode 100644
index 2b821e7e1..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav b/Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav
deleted file mode 100644
index 60b18242f..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3 b/Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3
deleted file mode 100644
index 65b43fd8a..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3 and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav b/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav
deleted file mode 100644
index 81068890e..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav b/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav
deleted file mode 100644
index eca62a315..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav b/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav
deleted file mode 100644
index 5a55cbd63..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav b/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav
deleted file mode 100644
index 63736c8ea..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav b/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav
deleted file mode 100644
index ab7272d2f..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3 b/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3
deleted file mode 100644
index f34c7586d..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3 and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3 b/Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3
deleted file mode 100644
index 096f28b88..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3 and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav b/Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav
deleted file mode 100644
index a2427ec39..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav b/Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav
deleted file mode 100644
index 45bb5b017..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3 b/Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3
deleted file mode 100644
index 235e81fcc..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3 and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav b/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav
deleted file mode 100644
index a36a570d8..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav b/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav
deleted file mode 100644
index 88d32206b..000000000
Binary files a/Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav and /dev/null differ
diff --git a/Templates/Full/game/core/art/sound/volumeTest.wav b/Templates/Full/game/art/sound/ui/volumeTest.wav
similarity index 100%
rename from Templates/Full/game/core/art/sound/volumeTest.wav
rename to Templates/Full/game/art/sound/ui/volumeTest.wav
diff --git a/Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg b/Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg
deleted file mode 100644
index 8fc57aabf..000000000
Binary files a/Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg b/Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg
deleted file mode 100644
index 5af489ab3..000000000
Binary files a/Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg b/Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg
deleted file mode 100644
index aeda259b6..000000000
Binary files a/Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/GRENADELAND.wav b/Templates/Full/game/art/sound/weapons/GRENADELAND.wav
similarity index 100%
rename from Templates/Full/game/art/sound/CT_fx/weapons/GRENADELAND.wav
rename to Templates/Full/game/art/sound/weapons/GRENADELAND.wav
diff --git a/Templates/Full/game/art/sound/CT_fx/weapons/SCARFIRE.wav b/Templates/Full/game/art/sound/weapons/SCARFIRE.wav
similarity index 100%
rename from Templates/Full/game/art/sound/CT_fx/weapons/SCARFIRE.wav
rename to Templates/Full/game/art/sound/weapons/SCARFIRE.wav
diff --git a/Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg b/Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg
deleted file mode 100644
index ed4ad5f97..000000000
Binary files a/Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg b/Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg
deleted file mode 100644
index 2783397f3..000000000
Binary files a/Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/shot.ogg b/Templates/Full/game/art/sound/weapons/shot.ogg
deleted file mode 100644
index 653c80b42..000000000
Binary files a/Templates/Full/game/art/sound/weapons/shot.ogg and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_fire.wav b/Templates/Full/game/art/sound/weapons/wpn_fire.wav
deleted file mode 100644
index 03ab0dc14..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_fire.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav b/Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav
deleted file mode 100644
index 50a70d495..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_idle.wav b/Templates/Full/game/art/sound/weapons/wpn_idle.wav
deleted file mode 100644
index 3c82ce68c..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_idle.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav b/Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav
deleted file mode 100644
index 0955958b4..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_reload.wav b/Templates/Full/game/art/sound/weapons/wpn_reload.wav
deleted file mode 100644
index 7f62c2b43..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_reload.wav and /dev/null differ
diff --git a/Templates/Full/game/art/sound/weapons/wpn_switchin.wav b/Templates/Full/game/art/sound/weapons/wpn_switchin.wav
deleted file mode 100644
index c8c5a8f8c..000000000
Binary files a/Templates/Full/game/art/sound/weapons/wpn_switchin.wav and /dev/null differ
diff --git a/Templates/Full/game/scripts/gui/optionsDlg.cs b/Templates/Full/game/scripts/gui/optionsDlg.cs
index 0784c7939..3e2ea865f 100644
--- a/Templates/Full/game/scripts/gui/optionsDlg.cs
+++ b/Templates/Full/game/scripts/gui/optionsDlg.cs
@@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
    $pref::SFX::masterVolume = %volume;
    
    if( !isObject( $AudioTestHandle ) )
-      $AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
 }
 
 function OptAudioUpdateChannelVolume( %description, %volume )
@@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
    if( !isObject( $AudioTestHandle ) )
    {
       $AudioTestDescription.volume = %volume;
-      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
    }
 }