Preparing for OSGi deploy