Converted proejct to MVVM