Use per release dirs for templates

Change-Id: If3605dde1cc4b699c3fd1beb0456ae83ea3a5ab4