changed names
made it OSGi bundles