Changed location of two templates