Some moved jspx-files