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

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