Moving private classes to their own files.

I think this is the first thing that eclipse has actually been useful
for.