Parsers refactor, to single file