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

This reverts commit d1e7ea3a3c09d22cf8056c6e8e39ad751874bae9.
Rebase from 'upstream'
Trimmed the branch to only the calibration sub directory