Reorg gem dependencies