Major refactor, focussing on a JETTY deployable WAR now - cuts out a lot of superflous stuff.