more reorganizing and adding more parsers