Revert "removing nfincl & ncmod"

This reverts commit 7902222ccd19989fdfdd0233ad962aa715f70f1a.