Properly handle template directory names, so we can use subfolders