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

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