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

At least use the modern standard for string formatting and not '%s%s' % (var1, var2).