Update

better organized weapon and armor classes