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

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