diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/scope/AbstractConversationResolver.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/AbstractConversationResolver.java
similarity index 86%
rename from org.springframework.context/src/main/java/org/springframework/conversation/scope/AbstractConversationResolver.java
rename to org.springframework.context/src/main/java/org/springframework/conversation/manager/AbstractConversationResolver.java
index 6653865af9d0..96c06514eba5 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/scope/AbstractConversationResolver.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/AbstractConversationResolver.java
@@ -13,7 +13,8 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.springframework.conversation.scope;
+package org.springframework.conversation.manager;
+
 
 /**
  * The abstract implementation for a {@link ConversationResolver}.
@@ -24,7 +25,7 @@
 public abstract class AbstractConversationResolver implements ConversationResolver {
 
 	/**
-	 * @see org.springframework.conversation.scope.ConversationResolver#hasCurrentConversationId()
+	 * @see org.springframework.conversation.manager.ConversationResolver#hasCurrentConversationId()
 	 */
 	public boolean hasCurrentConversationId() {
 		return (getCurrentConversationId() != null);
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java
index 48628f8bbb03..cfbd1aac21e4 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java
@@ -26,7 +26,6 @@
 import org.springframework.conversation.annotation.BeginConversation;
 import org.springframework.conversation.annotation.Conversational;
 import org.springframework.conversation.annotation.EndConversation;
-import org.springframework.conversation.scope.ConversationResolver;
 import org.springframework.conversation.scope.ConversationScope;
 
 /**
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java
index e8b28a4f737d..1cb60b46b8f7 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java
@@ -23,7 +23,6 @@
 import org.springframework.conversation.ConversationEndingType;
 import org.springframework.conversation.ConversationType;
 import org.springframework.conversation.JoinMode;
-import org.springframework.conversation.scope.ConversationResolver;
 
 /**
  * The default implementation for the {@link ConversationManager} interface.
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/scope/ConversationResolver.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationResolver.java
similarity index 98%
rename from org.springframework.context/src/main/java/org/springframework/conversation/scope/ConversationResolver.java
rename to org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationResolver.java
index da651f4cab8d..395f95840b6c 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/scope/ConversationResolver.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationResolver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.springframework.conversation.scope;
+package org.springframework.conversation.manager;
 
 /**
  * The current conversation resolver is another extension point for the
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationStore.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationStore.java
index 56eb24761635..f46d68ca3180 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationStore.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationStore.java
@@ -19,7 +19,6 @@
 import java.util.List;
 
 import org.springframework.conversation.Conversation;
-import org.springframework.conversation.scope.ConversationResolver;
 
 /**
  * The conversation store is used within the {@link ConversationManager} to
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/scope/ThreadAttachedConversationResolver.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ThreadAttachedConversationResolver.java
similarity index 84%
rename from org.springframework.context/src/main/java/org/springframework/conversation/scope/ThreadAttachedConversationResolver.java
rename to org.springframework.context/src/main/java/org/springframework/conversation/manager/ThreadAttachedConversationResolver.java
index 9a7937611fc1..3e2f7cd8850c 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/scope/ThreadAttachedConversationResolver.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ThreadAttachedConversationResolver.java
@@ -13,7 +13,8 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.springframework.conversation.scope;
+package org.springframework.conversation.manager;
+
 
 /**
  * An implementation of the {@link ConversationResolver} where the currently
@@ -28,14 +29,14 @@ public class ThreadAttachedConversationResolver extends AbstractConversationReso
 	private static final ThreadLocal<String> CURRENT_CONVERSATION_ID = new ThreadLocal<String>();
 
 	/**
-	 * @see org.springframework.conversation.scope.ConversationResolver#getCurrentConversationId()
+	 * @see org.springframework.conversation.manager.ConversationResolver#getCurrentConversationId()
 	 */
 	public String getCurrentConversationId() {
 		return CURRENT_CONVERSATION_ID.get();
 	}
 
 	/**
-	 * @see org.springframework.conversation.scope.ConversationResolver#setCurrentConversationId(java.lang.String)
+	 * @see org.springframework.conversation.manager.ConversationResolver#setCurrentConversationId(java.lang.String)
 	 */
 	public void setCurrentConversationId(String conversationId) {
 		CURRENT_CONVERSATION_ID.set(conversationId);
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/scope/DefaultConversationScope.java b/org.springframework.context/src/main/java/org/springframework/conversation/scope/DefaultConversationScope.java
index 31d092fc8e6a..91983ff159b4 100644
--- a/org.springframework.context/src/main/java/org/springframework/conversation/scope/DefaultConversationScope.java
+++ b/org.springframework.context/src/main/java/org/springframework/conversation/scope/DefaultConversationScope.java
@@ -25,6 +25,7 @@
 import org.springframework.conversation.Conversation;
 import org.springframework.conversation.JoinMode;
 import org.springframework.conversation.manager.ConversationManager;
+import org.springframework.conversation.manager.ConversationResolver;
 import org.springframework.conversation.manager.ConversationStore;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java b/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java
index 3e56b4b78a1e..6e28a864ffbd 100644
--- a/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java
@@ -22,9 +22,9 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.conversation.manager.ConversationManager;
+import org.springframework.conversation.manager.ConversationResolver;
 import org.springframework.conversation.manager.ConversationStore;
 import org.springframework.conversation.manager.MutableConversation;
-import org.springframework.conversation.scope.ConversationResolver;
 
 /**
  * Basic conversation management tests.
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml b/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml
index 24af78eacdca..054d543eda5a 100644
--- a/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml
+++ b/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml
@@ -25,7 +25,7 @@
         <property name="useFallbackMap" value="false"/>
     </bean>
     
-    <bean id="conversationResolver" class="org.springframework.conversation.scope.ThreadAttachedConversationResolver" />
+    <bean id="conversationResolver" class="org.springframework.conversation.manager.ThreadAttachedConversationResolver" />
     
     <bean id="conversationScope" class="org.springframework.conversation.scope.DefaultConversationScope" lazy-init="false">
         <property name="conversationManager" ref="conversationManager"/>
diff --git a/org.springframework.web/src/main/java/org/springframework/web/conversation/WebBasedConversationResolver.java b/org.springframework.web/src/main/java/org/springframework/web/conversation/WebBasedConversationResolver.java
index 907434433f9d..3ea3481c3e6a 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/conversation/WebBasedConversationResolver.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/conversation/WebBasedConversationResolver.java
@@ -16,8 +16,8 @@
 package org.springframework.web.conversation;
 
 import org.springframework.conversation.Conversation;
-import org.springframework.conversation.scope.ConversationResolver;
-import org.springframework.conversation.scope.ThreadAttachedConversationResolver;
+import org.springframework.conversation.manager.ConversationResolver;
+import org.springframework.conversation.manager.ThreadAttachedConversationResolver;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
@@ -63,7 +63,7 @@ public WebBasedConversationResolver() {
 	}
 
 	/**
-	 * @see org.springframework.conversation.scope.ThreadAttachedConversationResolver#getCurrentConversationId()
+	 * @see org.springframework.conversation.manager.ThreadAttachedConversationResolver#getCurrentConversationId()
 	 */
 	@Override
 	public String getCurrentConversationId() {
@@ -82,7 +82,7 @@ public String getCurrentConversationId() {
 	}
 
 	/**
-	 * @see org.springframework.conversation.scope.ThreadAttachedConversationResolver#setCurrentConversationId(java.lang.String)
+	 * @see org.springframework.conversation.manager.ThreadAttachedConversationResolver#setCurrentConversationId(java.lang.String)
 	 */
 	@Override
 	public void setCurrentConversationId(String conversationId) {