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

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