Modules updated to work as a OSGi bundles