Refactor JSP files