BZ-11714: Refactor files of the savingsEstimator