osgi-reorganize-commits