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

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