Minor changes to Weapon class, moved Weapon class