moving some templates around