Added NFS files
Refactored code builds OK. Untested