Major class restructuring