Modified models and added ViewModels folder in project.