diff --git a/pkg/common/types.go b/pkg/common/types.go
index 18f98e0a9..2e140900c 100644
--- a/pkg/common/types.go
+++ b/pkg/common/types.go
@@ -48,3 +48,20 @@ func (d *DispatcherID) DecodeMsg(dc *msgp.Reader) error {
 }
 
 type SchemaID int64
+
+type GID struct {
+	low  uint64
+	high uint64
+}
+
+func (g GID) IsZero() bool {
+	return g.low == 0 && g.high == 0
+}
+
+func NewGID() GID {
+	uuid := uuid.New()
+	return GID{
+		low:  binary.LittleEndian.Uint64(uuid[0:8]),
+		high: binary.LittleEndian.Uint64(uuid[8:16]),
+	}
+}
diff --git a/utils/dynstream/dnynamic_stream_bech_test.go b/utils/dynstream/dynamic_stream_bench_test.go
similarity index 100%
rename from utils/dynstream/dnynamic_stream_bech_test.go
rename to utils/dynstream/dynamic_stream_bench_test.go
diff --git a/utils/dynstream/path.go b/utils/dynstream/path.go
deleted file mode 100644
index 58df71b88..000000000
--- a/utils/dynstream/path.go
+++ /dev/null
@@ -1 +0,0 @@
-package dynstream