Re-org template directory to work with ZAP URLs