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

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