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

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