Refactor the Environment Aware stuff. Also move file loader's parameters out of environment options.