Reorg a bit in prep for tests