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

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