Reorg a few deps