some reorg, major doc updates