Update the name of the config file in setup.py.
Move a variable declaration to be closer to it's usage.