Fixed package restore
Refactoring, refactoring...
Merge pull request #2 from maartenba/master

Refactoring to mvvm