BZ-11408 moving templates to the tempaltes folder