Switching to Spring Servlet