Structured template directory: fix of fix of fix