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

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