Moved viewmodels into view namespace