Reorg aws clients to allow for different envs.