configuration files refactoring.