Reorg dev dependencies