Restructure templates.