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

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