Refactoring of nef library.
Reorganised / Renamed nef files
Update build for renamed files
Refactoring of nef library
Minor formatting