Move templates to separate JSP files