diff --git a/websocket-sharp/Net/ClientSslAuthConfiguration.cs b/websocket-sharp/Net/ClientSslAuthConfiguration.cs
index 0a518eb3..d5a63a15 100644
--- a/websocket-sharp/Net/ClientSslAuthConfiguration.cs
+++ b/websocket-sharp/Net/ClientSslAuthConfiguration.cs
@@ -36,8 +36,12 @@
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WebSocketSharp
+namespace WebSocketSharp.Net
 {
+    /// <summary>
+    /// Stores the parameters used in configuring <see cref="System.Net.Security.SslStream"/>
+    /// as a client.
+    /// </summary>
     public class ClientSslAuthConfiguration
     {
         /// <summary>
diff --git a/websocket-sharp/Server/ServerSslAuthConfiguration.cs b/websocket-sharp/Net/ServerSslAuthConfiguration.cs
similarity index 96%
rename from websocket-sharp/Server/ServerSslAuthConfiguration.cs
rename to websocket-sharp/Net/ServerSslAuthConfiguration.cs
index 401ad5db..06d7bf62 100644
--- a/websocket-sharp/Server/ServerSslAuthConfiguration.cs
+++ b/websocket-sharp/Net/ServerSslAuthConfiguration.cs
@@ -36,8 +36,12 @@
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WebSocketSharp
+namespace WebSocketSharp.Net
 {
+    /// <summary>
+    /// Stores the parameters used in configuring <see cref="System.Net.Security.SslStream"/>
+    /// as a server.
+    /// </summary>
     public class ServerSslAuthConfiguration
     {
         /// <summary>
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index 2f7ba597..04eef04d 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -68,7 +68,7 @@
     <Compile Include="ByteOrder.cs" />
     <Compile Include="ErrorEventArgs.cs" />
     <Compile Include="Net\ClientSslAuthConfiguration.cs" />
-    <Compile Include="Server\ServerSslAuthConfiguration.cs" />
+    <Compile Include="Net\ServerSslAuthConfiguration.cs" />
     <Compile Include="WebSocket.cs" />
     <Compile Include="Server\WebSocketServer.cs" />
     <Compile Include="Net\AuthenticationSchemes.cs" />