Moves some more classes to hero packages