renamed and moved models to view models