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

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