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

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