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

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