Move classes into the correct logical groupings