big update templates renamed and move