Moved models to app