testing changes and some reorg in nlp files