Reorder classes