Moving some of the templates