restructured templates

structured html templates