refactored configuration files