Working on OSGi modularization