Restructured templates