Fixing import/exports for osgi compatability