Moved the parserFactory transformer into separate file for reuse.
A few other fixes for cleanup.