Change Date class name to DateUtil