Refactor spatters to represent the common part as its own type.

Also figure out what the new field is for plus some material flags by Q.
Update CSV