Refactoring to put templates in a more sensible location
Refactoring to name templates in a less unnecessarily verbose manner