Move Diffs to .util