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

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