time-exts-2.1.0: massive code refactoring