Restructure the ViewModel(s) closer to the Views

[npvisual]

Recent development in other projects have made it a little clearer that the ViewModel files should be either closer to the Views themselves, or even inside the Views for ease / speed of development.