More reorg, will rework text.