Renamed viewmodels + refactored viewmodel structure