moved some templates around