REV: Begin to redesign the template structure.