Changed ViewModel to have it's own namespace.