Moved environment variables to their proper location