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

This reverts commit e0b2b43b6dca2efa110d84a8b0ab2b128273124c.
Rebase from 'upstream'
Trimmed the branch to only the image_geometry sub directory