changing template name
adding new template
moving templates to new directory
updated templating features