packaged up the environment variables into one struct to be passed around, changed organization a bit