Finished reworking the existing nsfdata structs' layout schemes