Optimize viewmodel organization.