change location of some models + added models for output generator