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

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