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

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