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

This reverts commit e2c7cbd61c519e3337f41e251de18688d85247fc.
Rebase from 'upstream'
Trimmed the branch to only the voxel_grid sub directory