Reworked the entity classes with their weapon and shield