Using CDI and refactoring preparing to add OSGi manifests