Changed location of templates