Changes in our setup-env directory structure