shuffle some classes around, to aid readability