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

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