Move templates to addressable subdir