Lots of reorg, testing, etc