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

This reverts commit dee52e273645c15fadecaf6fe711cd6918130555.
Rebase from 'upstream'
Trimmed the branch to only the geometry sub directory