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

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