Move a few types into their own files

Clean up the source a little bit by moving some of the types into
their own files.