template/view reorg mostly complete