Vanilla Weapons Adjusted - V2

I have always been bugged by the weapon positions in SOC and decided to try my hand at moving them around and in the process clean up some of the other quirks with vanilla weaponary. FEEDBACK IS APPRECIATED