Change packaging to OSGi bundle