Simplified viewmodel organization