parser-site restructuring