Reorder type definitions