Change Controller and Servlet to rest