Move types out of data.go