Reorder class definition