Refactor parsing to separate classes
Fix docblock issue
Merge pull request #2 from bramdevries/refactor-retrievers

Refactor retrievers