Refactor to organize parsers inside utils