Moved TimeUtils to data package