Reordered DateOffset classes after merge