Refactored parsers

Same namespace now. Also removed unnecessary documentation and unneeded
reference.