renaming and adding a few new templates