Moved a number more nsfdata structs to the new layout