Expand + rename classes.

DiffCollection + Diff better reflect what the objects
contain and do. Write some more of the code + some more of the tests.