Refactored the location of templates