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

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