Rearrange the code so embedded Jetty works