Remove SortAggregator, and just use differs to sort, everywhere.
Move datasource-related package methods into their own trait
Make Diff (with sorting) the default