Reorganization changes. Removed NSPR calls into it's own library