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

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