Overhaul of config files