moved templates around
rename