migrated to OSGi bundles