Reorg envs
Bump versions