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

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