Clean up namespaces (#410)

No meaningful code changes, just lots of namespace shuffling to have fewer namespaces and to put things in better namespaces.

src/ModelContextProtocol/Server/AIFunctionMcpServerPrompt.cs

@@ -1,8 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.ComponentModel;
 using System.Reflection;
 using System.Text.Json;

src/ModelContextProtocol/Server/AIFunctionMcpServerResource.cs

@@ -1,8 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Globalization;

src/ModelContextProtocol/Server/AIFunctionMcpServerTool.cs

@@ -1,8 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;

src/ModelContextProtocol/Server/DelegatingMcpServerPrompt.cs

@@ -1,5 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/DelegatingMcpServerResource.cs

@@ -1,5 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/DelegatingMcpServerTool.cs

@@ -1,5 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/DestinationBoundMcpServer.cs

@@ -1,6 +1,4 @@
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Diagnostics;
 
 namespace ModelContextProtocol.Server;

src/ModelContextProtocol/Server/IMcpServer.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/McpServer.cs

@@ -1,11 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Shared;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization.Metadata;
 
@@ -558,12 +553,12 @@ internal sealed class McpServer : McpEndpoint, IMcpServer
     internal static LoggingLevel ToLoggingLevel(LogLevel level) =>
         level switch
         {
-            LogLevel.Trace => Protocol.Types.LoggingLevel.Debug,
-            LogLevel.Debug => Protocol.Types.LoggingLevel.Debug,
-            LogLevel.Information => Protocol.Types.LoggingLevel.Info,
-            LogLevel.Warning => Protocol.Types.LoggingLevel.Warning,
-            LogLevel.Error => Protocol.Types.LoggingLevel.Error,
-            LogLevel.Critical => Protocol.Types.LoggingLevel.Critical,
-            _ => Protocol.Types.LoggingLevel.Emergency,
+            LogLevel.Trace => Protocol.LoggingLevel.Debug,
+            LogLevel.Debug => Protocol.LoggingLevel.Debug,
+            LogLevel.Information => Protocol.LoggingLevel.Info,
+            LogLevel.Warning => Protocol.LoggingLevel.Warning,
+            LogLevel.Error => Protocol.LoggingLevel.Error,
+            LogLevel.Critical => Protocol.LoggingLevel.Critical,
+            _ => Protocol.LoggingLevel.Emergency,
         };
 }

src/ModelContextProtocol/Server/McpServerExtensions.cs

@@ -1,9 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;

src/ModelContextProtocol/Server/McpServerFactory.cs

@@ -1,6 +1,5 @@
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Utils;
 using Microsoft.Extensions.Logging;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/McpServerHandlers.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/McpServerOptions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/McpServerPrimitiveCollection.cs

@@ -1,4 +1,3 @@
-using ModelContextProtocol.Utils;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;

src/ModelContextProtocol/Server/McpServerPrompt.cs

@@ -1,8 +1,7 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Reflection;
 using System.Text.Json;
 

src/ModelContextProtocol/Server/McpServerPromptAttribute.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
 namespace ModelContextProtocol.Server;

src/ModelContextProtocol/Server/McpServerPromptCreateOptions.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.AI;
-using ModelContextProtocol.Utils.Json;
 using System.ComponentModel;
 using System.Text.Json;
 

src/ModelContextProtocol/Server/McpServerResource.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Reflection;
 
 namespace ModelContextProtocol.Server;

src/ModelContextProtocol/Server/McpServerResourceAttribute.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Server;
 

src/ModelContextProtocol/Server/McpServerTool.cs

@@ -1,9 +1,7 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Reflection;
 using System.Text.Json;