refactored the config files