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

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