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

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