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

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