M1:make out the spring + jetty, refactor package stucture