diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
index 362cc93d..643584fd 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
@@ -26,7 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Spring.ConversationWA.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Spring.Web.Conversation.NHibernate32.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -59,14 +59,14 @@
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ConversationWA\HttpModule\ConversationModule.cs" />
-    <Compile Include="ConversationWA\IConversationManager.cs" />
-    <Compile Include="ConversationWA\IConversationState.cs" />
-    <Compile Include="ConversationWA\Impl\InnerConversationList.cs" />
-    <Compile Include="ConversationWA\Impl\WebConversationManager.cs" />
-    <Compile Include="ConversationWA\Impl\WebConversationSpringState.cs" />
     <Compile Include="Data\NHibernate\Support\SessionPerConversationScope.cs" />
     <Compile Include="Data\NHibernate\Support\SessionPerConversationSettings.cs" />
+    <Compile Include="Web\Conversation\HttpModule\ConversationModule.cs" />
+    <Compile Include="Web\Conversation\IConversationManager.cs" />
+    <Compile Include="Web\Conversation\IConversationState.cs" />
+    <Compile Include="Web\Conversation\InnerConversationList.cs" />
+    <Compile Include="Web\Conversation\WebConversationManager.cs" />
+    <Compile Include="Web\Conversation\WebConversationSpringState.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\build-support\tools\nant\schema\nant.xsd">
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
index ccfbfd68..29d3a5e9 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
@@ -55,30 +55,30 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\HttpModule\ConversationModule.cs">
-      <Link>Conversation\HttpModule\ConversationModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationManager.cs">
-      <Link>Conversation\IConversationManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationState.cs">
-      <Link>Conversation\IConversationState.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\InnerConversationList.cs">
-      <Link>Conversation\Impl\InnerConversationList.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationManager.cs">
-      <Link>Conversation\Impl\WebConversationManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationSpringState.cs">
-      <Link>Conversation\Impl\WebConversationSpringState.cs</Link>
-    </Compile>
     <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
     </Compile>
     <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
     </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\HttpModule\ConversationModule.cs">
+      <Link>Web\Conversation\HttpModule\ConversationModule.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationManager.cs">
+      <Link>Web\Conversation\IConversationManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationState.cs">
+      <Link>Web\Conversation\IConversationState.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\InnerConversationList.cs">
+      <Link>Web\Conversation\InnerConversationList.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationManager.cs">
+      <Link>Web\Conversation\WebConversationManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationSpringState.cs">
+      <Link>Web\Conversation\WebConversationSpringState.cs</Link>
+    </Compile>
     <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs
index aa059233..9323812e 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs
@@ -23,7 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 using Spring.Web.Conversation;
 using Spring.Web.UI;
-using Spring.Web.Conversation;
 
 namespace Spring.Web.Conversation
 {
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs
index 8768c896..5a37ce20 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs
@@ -23,7 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 using Spring.Web.Conversation;
 using Spring.Web.UI;
-using Spring.Web.Conversation;
 
 namespace Spring.Web.Conversation
 {
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs
index 4b62beb2..497f2df0 100644
Binary files a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs and b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs differ