restructuring classes