Switch to Servlet/HttpServlet instead of ServletEngine/Servlet