code reorg
api location format fix. doc updates