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

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