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

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