diff --git a/mcp/example_progress_test.go b/examples/client/middleware/main.go
similarity index 89%
rename from mcp/example_progress_test.go
rename to examples/client/middleware/main.go
index 304c838..6ae87df 100644
--- a/mcp/example_progress_test.go
+++ b/examples/client/middleware/main.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-package mcp_test
+package main
 
 import (
 	"context"
@@ -15,10 +15,9 @@ var nextProgressToken atomic.Int64
 
 // This middleware function adds a progress token to every outgoing request
 // from the client.
-func Example_progressMiddleware() {
-	c := mcp.NewClient(testImpl, nil)
+func main() {
+	c := mcp.NewClient(&mcp.Implementation{Name: "test"}, nil)
 	c.AddSendingMiddleware(addProgressToken[*mcp.ClientSession])
-	_ = c
 }
 
 func addProgressToken[S mcp.Session](h mcp.MethodHandler) mcp.MethodHandler {
diff --git a/mcp/example_middleware_test.go b/examples/server/middleware/main.go
similarity index 98%
rename from mcp/example_middleware_test.go
rename to examples/server/middleware/main.go
index b6b8e52..224c8c6 100644
--- a/mcp/example_middleware_test.go
+++ b/examples/server/middleware/main.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-package mcp_test
+package main
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 )
 
 // This example demonstrates server side logging using the mcp.Middleware system.
-func Example_loggingMiddleware() {
+func main() {
 	// Create a logger for demonstration purposes.
 	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelInfo,
diff --git a/mcp/mcp-repo-replace.txt b/mcp/mcp-repo-replace.txt
deleted file mode 100644
index 3409dd7..0000000
--- a/mcp/mcp-repo-replace.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-"github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2"==>"github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2"
-github.com/modelcontextprotocol/go-sdk/internal/xcontext==>github.com/modelcontextprotocol/go-sdk/internal/xcontext
-github.com/modelcontextprotocol/go-sdk/internal==>github.com/modelcontextprotocol/go-sdk/internal
-github.com/modelcontextprotocol/go-sdk/jsonschema==>github.com/modelcontextprotocol/go-sdk/jsonschema
-github.com/modelcontextprotocol/go-sdk/examples==>github.com/modelcontextprotocol/go-sdk/examples
-github.com/modelcontextprotocol/go-sdk/design==>github.com/modelcontextprotocol/go-sdk/design
-github.com/modelcontextprotocol/go-sdk/mcp==>github.com/modelcontextprotocol/go-sdk/mcp
-governed by an MIT-style==>governed by an MIT-style
-regex:Copyright (20\d\d) The Go Authors==>Copyright \1 The Go MCP SDK Authors