Refactoring locations of the various config files