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

This reverts commit ff6ab8f0752a2ea48fca5fb8299c698b068d7eb5.
Rebase from 'upstream'
Trimmed the branch to only the cram_math sub directory