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

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