Changed template organization.