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

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