JSP reorganization to match what we do elsewhere
SF