Initial commit for OSGI version