Move collections, rename views to templates: move back up commit chain