Reorganized render classes/packages