Reorganize classes for renewal html