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

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