Don't have the package api twice
fixed osgi manifest generation