Refactoring Studio to MVVM