ViewModels and reorg