Move templates, preparing for httpd 2.4 support