Renamed to package DateUtils, refactored and has new functions