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

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