organizing and refactoring config files