Restructuring classes.