Note however that I would prefer to now change the jars in which the distribution is organized in 4.4. Our hope was to keep 4.4 extremely light and start working on 5.0 asap, so if this gets complex to do while keeping it in the same jar I'd postpone it to 5.0