Moves diff classes to package diff