Rearrange the struct of classes.