OSGi added, poms modified