changed packaging to bundle for OSGi compat.