updated templates and links to use correct template files
removed redundant files