Refactored JAGGR code to isolate OSGi dependencies