added REST Servlet and cleaned up some ws