config structure refactoring