Moved time entities to bottom of file, sort packages by name; no functional changes