SOKPify the tree

Change-Id: I8001cc13270ea27d3429b059555db81d55ccf001