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

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