TimeTypes: Reorganize