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

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