refactoring the monolith - split out jetty & junit