Jetty server refactoring. Closes #5