Restructured templates a bit.