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

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