Reorganize view models