reorg a few things