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

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