* Move marshalutil to hive.go * Adjust moved files from merge to use hive.go/marshalutil * Update go.mod * Change to use hive.go/marshalutil * Update go.mod
