Adding modified  + convert to OSGi bundle