small restructure, getting non-model classes out of the models; also addition of lexica processing