diff --git a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java
index 11712c841..4a465d80a 100644
--- a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java
+++ b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java
@@ -1,8 +1,8 @@
 package fr.inria.corese.core.next.query.api;
 
 import fr.inria.corese.core.next.data.api.Value;
-import fr.inria.corese.core.next.storagemanager.api.dataset.Dataset;
 import fr.inria.corese.core.next.query.api.result.BindingSet;
+import fr.inria.corese.core.next.query.api.dataset.Dataset;
 
 /**
  * A generic SPARQL operation (query or update) on a Corese repository.
diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java b/src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java
similarity index 97%
rename from src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java
rename to src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java
index 4375789d8..5952464c3 100644
--- a/src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java
+++ b/src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.core.next.storagemanager.api.dataset;
+package fr.inria.corese.core.next.query.api.dataset;
 
 import java.util.Set;
 
@@ -77,4 +77,4 @@ public interface Dataset {
      * @return this Dataset instance (or a new instance) cleared of all graphs.
      */
     Dataset clear();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java
index 09b5d36c4..ab9c12c8b 100644
--- a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java
+++ b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java
@@ -1,7 +1,7 @@
 package fr.inria.corese.core.next.query.api.repository;
 
 import fr.inria.corese.core.next.data.api.ValueFactory;
-import fr.inria.corese.core.next.storagemanager.api.dataset.Dataset;
+import fr.inria.corese.core.next.query.api.dataset.Dataset;
 import fr.inria.corese.core.next.query.api.exception.QuerySyntaxException;
 import fr.inria.corese.core.next.query.api.exception.RepositoryException;
 import fr.inria.corese.core.next.query.api.*;
@@ -141,4 +141,4 @@ Update prepareUpdate(QueryLanguage queryLanguage, String updateString)
      * @throws IllegalStateException if the connection is closed
      */
     void rollback() throws RepositoryException;
-}
\ No newline at end of file
+}