diff --git a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java
index 3597e9b..3f7ccc4 100644
--- a/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java
+++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named;
 
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.named.ConversationScoped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.Bean;
diff --git a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java
similarity index 87%
rename from core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java
rename to core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java
index fc3da85..eb5ac36 100644
--- a/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java
+++ b/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.scope.conversation;
+package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationContext;
 
 /**
  * @author Gerhard Petracek
@@ -27,8 +29,6 @@
 
     ConversationContext getCurrentConversationContext();
 
-    ConversationContext getConversationContext(Long id);
-
     void activateConversationContext(ConversationContext conversationContext);
 
     void resetCurrentConversationContext();
diff --git a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java
index f48e4ef..692a465 100644
--- a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java
+++ b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java
@@ -18,15 +18,13 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
 
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationContext;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;
 
 /**
  * TODO
  * @author Gerhard Petracek
  */
-@Jsf
 public class DefaultConversationManager implements ConversationManager
 {
     public ConversationContext getCurrentConversationContext()
diff --git a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java
index 2614482..7f97a77 100644
--- a/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java
+++ b/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.named;
 
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
 import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.AbstractNamedConversationContextAdapter;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;