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

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