Fixing pom alignment and osgi changes