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

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