reorganize parsers