Reorganized the nsfdata package a bit