Weapon modes refactored - preparing to add new weapon modes.
Test resources moved