Moved account viewmodels to own files