Using Jetty (WIP)
renamed a couple classes