restructured templates and layouts.