Moved models to model file