reorg for nidash meeting
Merge branch 'master' of https://github.com/INCF/nap