refactoring - moved parser to own package