Moved server-stuff to Servlet package