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

This reverts commit 5a693729bf57cd833b3c4d488d749c96c36bb6be.
Rebase from 'upstream'
Trimmed the branch to only the ndt_map sub directory