convert to OSGI