Structured template directory: fix