Adding OSGi bundle manifest generation and restructuring to avoid split package issues