Arranging our class catalog...