Renaming template tests
Deleting obsolete template files
Reorganising location and file name of templates