Configuration file refactoring