Rearrange the new architecture classes.