Rearranged env variables for modularity

Change-Id: Ie76ac0a5bcd11a9dad3ce81eb5651b6c4a52b377