Changing settings file to be more modular