Refactoring config files