Housecleaning: demoted diff to one file
Removed core/diff/