Remove obsolete imports
Make element-connector an OSGi bundle