With business units consolidated, P&G shuffles executives