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

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