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

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