Moving client templates to their right place