Lots of refactoring

Started to break out the interface for enabling outputs from the rdf
generation process to be something besides rdf.

Clean up.