MVVMLight added.
Refactoring to MVVM