index mgmt
reorg pi/si api