Rearrange order of classes