moving views into logical groupings
start of template organisation
adding changes to restructured templates