Update before reorganizing classes.