Refactored, changed package/class names; now works with Tomcat and Jetty