Change V+MVM to MVVM