Client: config module refactoring