file-format: move timing information into <cityTime> child element