refactoring configuration classes