Refactored Warrior and added Weapon