Global refactoring. Use one configuration file only
New configuration file