moved templates around