Reorganizing of parser. Stripping out of NER code