diff --git a/lib/mcp.rb b/lib/mcp.rb
index 344a253..2fd4027 100644
--- a/lib/mcp.rb
+++ b/lib/mcp.rb
@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require_relative "mcp/shared/version"
-require_relative "mcp/shared/configuration"
-require_relative "mcp/shared/instrumentation"
-require_relative "mcp/shared/methods"
-require_relative "mcp/shared/transport"
-require_relative "mcp/shared/content"
-require_relative "mcp/shared/string_utils"
+require_relative "mcp/version"
+require_relative "mcp/configuration"
+require_relative "mcp/instrumentation"
+require_relative "mcp/methods"
+require_relative "mcp/transport"
+require_relative "mcp/content"
+require_relative "mcp/string_utils"
 
-require_relative "mcp/shared/resource"
-require_relative "mcp/shared/resource/contents"
-require_relative "mcp/shared/resource/embedded"
-require_relative "mcp/shared/resource_template"
+require_relative "mcp/resource"
+require_relative "mcp/resource/contents"
+require_relative "mcp/resource/embedded"
+require_relative "mcp/resource_template"
 
-require_relative "mcp/shared/tool"
-require_relative "mcp/shared/tool/input_schema"
-require_relative "mcp/shared/tool/response"
-require_relative "mcp/shared/tool/annotations"
+require_relative "mcp/tool"
+require_relative "mcp/tool/input_schema"
+require_relative "mcp/tool/response"
+require_relative "mcp/tool/annotations"
 
-require_relative "mcp/shared/prompt"
-require_relative "mcp/shared/prompt/argument"
-require_relative "mcp/shared/prompt/message"
-require_relative "mcp/shared/prompt/result"
+require_relative "mcp/prompt"
+require_relative "mcp/prompt/argument"
+require_relative "mcp/prompt/message"
+require_relative "mcp/prompt/result"
 
 require_relative "mcp/server"
 require_relative "mcp/server/transports/stdio"
diff --git a/lib/mcp/shared/configuration.rb b/lib/mcp/configuration.rb
similarity index 100%
rename from lib/mcp/shared/configuration.rb
rename to lib/mcp/configuration.rb
diff --git a/lib/mcp/shared/content.rb b/lib/mcp/content.rb
similarity index 100%
rename from lib/mcp/shared/content.rb
rename to lib/mcp/content.rb
diff --git a/lib/mcp/shared/instrumentation.rb b/lib/mcp/instrumentation.rb
similarity index 100%
rename from lib/mcp/shared/instrumentation.rb
rename to lib/mcp/instrumentation.rb
diff --git a/lib/mcp/shared/methods.rb b/lib/mcp/methods.rb
similarity index 100%
rename from lib/mcp/shared/methods.rb
rename to lib/mcp/methods.rb
diff --git a/lib/mcp/shared/prompt.rb b/lib/mcp/prompt.rb
similarity index 100%
rename from lib/mcp/shared/prompt.rb
rename to lib/mcp/prompt.rb
diff --git a/lib/mcp/shared/prompt/argument.rb b/lib/mcp/prompt/argument.rb
similarity index 100%
rename from lib/mcp/shared/prompt/argument.rb
rename to lib/mcp/prompt/argument.rb
diff --git a/lib/mcp/shared/prompt/message.rb b/lib/mcp/prompt/message.rb
similarity index 100%
rename from lib/mcp/shared/prompt/message.rb
rename to lib/mcp/prompt/message.rb
diff --git a/lib/mcp/shared/prompt/result.rb b/lib/mcp/prompt/result.rb
similarity index 100%
rename from lib/mcp/shared/prompt/result.rb
rename to lib/mcp/prompt/result.rb
diff --git a/lib/mcp/shared/resource.rb b/lib/mcp/resource.rb
similarity index 100%
rename from lib/mcp/shared/resource.rb
rename to lib/mcp/resource.rb
diff --git a/lib/mcp/shared/resource/contents.rb b/lib/mcp/resource/contents.rb
similarity index 100%
rename from lib/mcp/shared/resource/contents.rb
rename to lib/mcp/resource/contents.rb
diff --git a/lib/mcp/shared/resource/embedded.rb b/lib/mcp/resource/embedded.rb
similarity index 100%
rename from lib/mcp/shared/resource/embedded.rb
rename to lib/mcp/resource/embedded.rb
diff --git a/lib/mcp/shared/resource_template.rb b/lib/mcp/resource_template.rb
similarity index 100%
rename from lib/mcp/shared/resource_template.rb
rename to lib/mcp/resource_template.rb
diff --git a/lib/mcp/server.rb b/lib/mcp/server.rb
index 7a406fa..6dde615 100644
--- a/lib/mcp/server.rb
+++ b/lib/mcp/server.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "json_rpc_handler"
-require_relative "shared/instrumentation"
-require_relative "shared/methods"
+require_relative "instrumentation"
+require_relative "methods"
 
 module MCP
   class Server
diff --git a/lib/mcp/server/transports/stdio.rb b/lib/mcp/server/transports/stdio.rb
index 1e7e343..a90ea67 100644
--- a/lib/mcp/server/transports/stdio.rb
+++ b/lib/mcp/server/transports/stdio.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../shared/transport"
+require_relative "../../transport"
 require "json"
 
 module MCP
diff --git a/lib/mcp/shared/string_utils.rb b/lib/mcp/string_utils.rb
similarity index 100%
rename from lib/mcp/shared/string_utils.rb
rename to lib/mcp/string_utils.rb
diff --git a/lib/mcp/shared/tool.rb b/lib/mcp/tool.rb
similarity index 100%
rename from lib/mcp/shared/tool.rb
rename to lib/mcp/tool.rb
diff --git a/lib/mcp/shared/tool/annotations.rb b/lib/mcp/tool/annotations.rb
similarity index 100%
rename from lib/mcp/shared/tool/annotations.rb
rename to lib/mcp/tool/annotations.rb
diff --git a/lib/mcp/shared/tool/input_schema.rb b/lib/mcp/tool/input_schema.rb
similarity index 100%
rename from lib/mcp/shared/tool/input_schema.rb
rename to lib/mcp/tool/input_schema.rb
diff --git a/lib/mcp/shared/tool/response.rb b/lib/mcp/tool/response.rb
similarity index 100%
rename from lib/mcp/shared/tool/response.rb
rename to lib/mcp/tool/response.rb
diff --git a/lib/mcp/shared/transport.rb b/lib/mcp/transport.rb
similarity index 100%
rename from lib/mcp/shared/transport.rb
rename to lib/mcp/transport.rb
diff --git a/lib/mcp/shared/version.rb b/lib/mcp/version.rb
similarity index 100%
rename from lib/mcp/shared/version.rb
rename to lib/mcp/version.rb
diff --git a/mcp.gemspec b/mcp.gemspec
index 0faf14d..c598f45 100644
--- a/mcp.gemspec
+++ b/mcp.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "lib/mcp/shared/version"
+require_relative "lib/mcp/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mcp"
diff --git a/test/mcp/shared/configuration_test.rb b/test/mcp/configuration_test.rb
similarity index 100%
rename from test/mcp/shared/configuration_test.rb
rename to test/mcp/configuration_test.rb
diff --git a/test/mcp/shared/instrumentation_test.rb b/test/mcp/instrumentation_test.rb
similarity index 100%
rename from test/mcp/shared/instrumentation_test.rb
rename to test/mcp/instrumentation_test.rb
diff --git a/test/mcp/shared/methods_test.rb b/test/mcp/methods_test.rb
similarity index 100%
rename from test/mcp/shared/methods_test.rb
rename to test/mcp/methods_test.rb
diff --git a/test/mcp/shared/prompt_test.rb b/test/mcp/prompt_test.rb
similarity index 100%
rename from test/mcp/shared/prompt_test.rb
rename to test/mcp/prompt_test.rb
diff --git a/test/mcp/shared/string_utils_test.rb b/test/mcp/string_utils_test.rb
similarity index 100%
rename from test/mcp/shared/string_utils_test.rb
rename to test/mcp/string_utils_test.rb
diff --git a/test/mcp/shared/tool/input_schema_test.rb b/test/mcp/tool/input_schema_test.rb
similarity index 100%
rename from test/mcp/shared/tool/input_schema_test.rb
rename to test/mcp/tool/input_schema_test.rb