Moved views and viewmodels into same views folder.