refactor manifest and osgi generation