Reorganize view models
Reflect model structure in umbraco doc types