transitioning away from lex/* lexicon and using lexicon/* instead