adding external templates and deleting old stuff