reorg some of the more stuff