Move templates
Hopefully fix templates