Reorganize classes.