diff --git a/events/eventstore/grpc/inmemory/cmd/BUILD.bazel b/events/eventstore/grpc/inmemory/cmd/BUILD.bazel
index e0e8d4ff..ac6bc249 100644
--- a/events/eventstore/grpc/inmemory/cmd/BUILD.bazel
+++ b/events/eventstore/grpc/inmemory/cmd/BUILD.bazel
@@ -9,7 +9,7 @@ load("@rules_pact//:defs.bzl", "pact_test", "provider", "side_car")
 pact_test(
     name = "pact_test",
     testonly = True,
-    consumer = "//shape-app/domain/internal:area-calculator-grpc",
+    consumer = "//shape-app/domain/internal/pacts:area-calculator-grpc",
     provider = ":api-grpc-eventstore",
 )
 
diff --git a/shape-app/domain/internal/BUILD.bazel b/shape-app/domain/internal/BUILD.bazel
index 808877f3..b3240d30 100644
--- a/shape-app/domain/internal/BUILD.bazel
+++ b/shape-app/domain/internal/BUILD.bazel
@@ -1,13 +1,4 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-load("@rules_pact//:defs.bzl", "consumer")
-
-consumer(
-    name = "area-calculator-grpc",
-    testonly = True,
-    srcs = ":consumer_test",
-    data = ["//events/eventstore/grpc/proto:protodef"],
-    visibility = ["//visibility:public"],
-)
 
 go_library(
     name = "internal",
@@ -27,27 +18,6 @@ go_library(
     ],
 )
 
-go_test(
-    name = "consumer_test",
-    srcs = ["eventstore_consumer_test.go"],
-    embed = [":internal"],
-    tags = ["libpact_ffi_missing"],  # keep
-    deps = [
-        "//events/eventstore/grpc/inmemory/pkg",
-        "//events/eventstore/grpc/proto",
-        "//events/pkg",
-        "@com_github_google_uuid//:uuid",
-        "@com_github_pact_foundation_pact_go_v2//message/v4:message",
-        "@com_github_pact_foundation_pact_go_v2//models",
-        "@com_github_smarty_assertions//:assertions",
-        "@com_github_stretchr_testify//assert",
-        "@com_github_stretchr_testify//suite",
-        "@io_bazel_rules_go//go/runfiles:go_default_library",
-        "@org_golang_x_mod//module",
-        "@org_golang_x_mod//zip",
-    ],
-)
-
 go_test(
     name = "internal_test",
     srcs = [
@@ -59,12 +29,7 @@ go_test(
     ],
     embed = [":internal"],
     deps = [
-        "//events/eventstore/grpc/inmemory/pkg",
-        "//events/eventstore/grpc/proto",
-        "//events/pkg",
         "@com_github_google_uuid//:uuid",
-        "@com_github_pact_foundation_pact_go_v2//message/v4:message",
-        "@com_github_pact_foundation_pact_go_v2//models",
         "@com_github_smarty_assertions//:assertions",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//suite",
diff --git a/shape-app/domain/internal/pacts/BUILD.bazel b/shape-app/domain/internal/pacts/BUILD.bazel
new file mode 100644
index 00000000..4749879c
--- /dev/null
+++ b/shape-app/domain/internal/pacts/BUILD.bazel
@@ -0,0 +1,26 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+load("@rules_pact//:defs.bzl", "consumer")
+
+consumer(
+    name = "area-calculator-grpc",
+    testonly = True,
+    srcs = ":pacts_test",
+    data = ["//events/eventstore/grpc/proto:protodef"],
+    visibility = ["//visibility:public"],
+)
+
+go_test(
+    name = "pacts_test",
+    srcs = ["eventstore_consumer_test.go"],
+    tags = ["libpact_ffi_missing"],  # keep
+    deps = [
+        "//events/eventstore/grpc/inmemory/pkg",
+        "//events/eventstore/grpc/proto",
+        "//events/pkg",
+        "//shape-app/domain/internal",
+        "@com_github_google_uuid//:uuid",
+        "@com_github_pact_foundation_pact_go_v2//message/v4:message",
+        "@com_github_pact_foundation_pact_go_v2//models",
+        "@com_github_stretchr_testify//assert",
+    ],
+)
diff --git a/shape-app/domain/internal/eventstore_consumer_test.go b/shape-app/domain/internal/pacts/eventstore_consumer_test.go
similarity index 83%
rename from shape-app/domain/internal/eventstore_consumer_test.go
rename to shape-app/domain/internal/pacts/eventstore_consumer_test.go
index 494d3e97..6788ce87 100644
--- a/shape-app/domain/internal/eventstore_consumer_test.go
+++ b/shape-app/domain/internal/pacts/eventstore_consumer_test.go
@@ -1,10 +1,11 @@
-package internal
+package pacts
 
 import (
 	"github.com/google/uuid"
 	"github.com/opicaud/monorepo/events/eventstore/grpc/inmemory/pkg"
 	gen "github.com/opicaud/monorepo/events/eventstore/grpc/proto"
 	pkg2 "github.com/opicaud/monorepo/events/pkg"
+	"github.com/opicaud/monorepo/shape-app/domain/internal"
 	message "github.com/pact-foundation/pact-go/v2/message/v4"
 	"github.com/pact-foundation/pact-go/v2/models"
 	"github.com/stretchr/testify/assert"
@@ -18,7 +19,7 @@ func TestLoadEvents(t *testing.T) {
 	if err2 == "" {
 		return
 	}
-	dir2, _ := filepath.Abs("../../../events/eventstore/grpc/proto/grpc_event_store.proto")
+	dir2, _ := filepath.Abs("../../../../events/eventstore/grpc/proto/grpc_event_store.proto")
 	grpcInteraction := `{
 		"pact:proto": "` + dir2 + `",
 		"pact:proto-service": "EventStore/Load",
@@ -46,13 +47,13 @@ func TestLoadEvents(t *testing.T) {
 		id, _ := uuid.Parse(request.GetId())
 		events, err := loadEvents("localhost", transport.Port, id)
 		assert.Len(t, events, 1)
-		event := NewShapeEventFactory().NewDeserializedEvent(id, events[0])
-		assert.IsType(t, &Created{}, event)
+		event := internal.NewShapeEventFactory().NewDeserializedEvent(id, events[0])
+		assert.IsType(t, &internal.Created{}, event)
 		assert.Equal(t, "SHAPE_CREATED", event.Name())
 		assert.Equal(t, id, event.AggregateId())
-		assert.Equal(t, "square", event.(*Created).Nature)
-		assert.Equal(t, []float32{2, 3}, event.(*Created).Dimensions)
-		assert.Equal(t, float32(1), event.(*Created).Area)
+		assert.Equal(t, "square", event.(*internal.Created).Nature)
+		assert.Equal(t, []float32{2, 3}, event.(*internal.Created).Dimensions)
+		assert.Equal(t, float32(1), event.(*internal.Created).Area)
 
 		if err != nil {
 			return err