Move and clean some templates to a subfolder