Downgraded to servlet 2.5
Added jetty runner configuration and refactored build