reorganize diffs