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

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