defactored npmconf back into npm

Fixes #6397, by doing what that issue says.