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

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