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

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