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

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