refactoring towards properly splitting OSGi and standalone builds