refactoring npiFields into fields loader and npifields + code cleanup