Change Tomcat to Jetty, add push server, refactor and fixes