Gen1

Move generic code to non-Jetty artifact.