Better class organization in jetty package
Merge branch 'feature-jetty' into develop