Moving to consistent loading of config files