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

This reverts commit 0891e27b4d60d6e398391466fc9a347485ea801a.
Rebase from 'upstream' @ version '0.3.1'
Trimmed the branch to only the geometry_experimental sub directory