Doc reorg

Change-Id: Ife46ed02a216cc4e31d81e12e8e04e262a47d479