Updates to support separate handlebars template files.