Cleaned up the entity classes and removed position from Entity.