cosmetic: move stuff around in comps.

alphabetical ordering of same-level classes.