Moved viewmodels to correct folder