KM reorg based on Saurabh's comments