Move templates to correct location, fix typos and refactor the same

This class doesn't appear to do much of anything.  What does it actually do?