Revert "Trimmed the branch to only the calibration_estimation sub directory"

This reverts commit 4fefdabcefcf5906107322437a27e181f465bd19.
Rebase from 'upstream'
Trimmed the branch to only the calibration_estimation sub directory