Move to OSGI