Updating: reorganizing some templates.