Leave the original files there, just flatten them with the GW files, unless you don't like the GW cheers! If that's the case then you just have to replace the Ono_Cheers01.ogg & Ono_Cheers02.ogg files in each of the 9 speech folders with the original, hope this helps.
