Move scratch into packages
Split ediff an grep config out