Map classes re-orginzed.