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

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