Fix imports for OSGi

* prefer convention over configuration (for bundle manifests)