some structural reorg, all links need updating