Moved models to consolidated file