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

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