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

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