Reorder classes, traits, and objects