Convert to OSGi