diff --git a/src/main/java/it/cavallium/dbengine/lucene/collector/LMDBFullFieldDocCollector.java b/src/main/java/it/cavallium/dbengine/lucene/collector/LMDBFullFieldDocCollector.java
index 1647e1e..7683659 100644
--- a/src/main/java/it/cavallium/dbengine/lucene/collector/LMDBFullFieldDocCollector.java
+++ b/src/main/java/it/cavallium/dbengine/lucene/collector/LMDBFullFieldDocCollector.java
@@ -19,10 +19,7 @@ package it.cavallium.dbengine.lucene.collector;
 import it.cavallium.dbengine.database.disk.LLTempLMDBEnv;
 import it.cavallium.dbengine.lucene.FieldValueHitQueue;
 import it.cavallium.dbengine.lucene.FullDocs;
-import it.cavallium.dbengine.lucene.LLDoc;
 import it.cavallium.dbengine.lucene.LLFieldDoc;
-import it.cavallium.dbengine.lucene.LLScoreDoc;
-import it.cavallium.dbengine.lucene.LLScoreDocCodec;
 import it.cavallium.dbengine.lucene.LLSlotDoc;
 import it.cavallium.dbengine.lucene.LLSlotDocCodec;
 import it.cavallium.dbengine.lucene.LMDBPriorityQueue;
@@ -32,20 +29,14 @@ import it.cavallium.dbengine.lucene.ResourceIterable;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
 import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.ReaderUtil;
 import org.apache.lucene.search.CollectionTerminatedException;
 import org.apache.lucene.search.CollectorManager;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.FieldComparator;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.FieldValueHitQueue.Entry;
 import org.apache.lucene.search.LeafCollector;
 import org.apache.lucene.search.LeafFieldComparator;
-import org.apache.lucene.search.MultiLeafFieldComparator;
+import it.cavallium.dbengine.lucene.comparators.MultiLeafFieldComparator;
 import org.apache.lucene.search.Scorable;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Sort;
diff --git a/src/main/java/org/apache/lucene/search/MultiLeafFieldComparator.java b/src/main/java/it/cavallium/dbengine/lucene/comparators/MultiLeafFieldComparator.java
similarity index 94%
rename from src/main/java/org/apache/lucene/search/MultiLeafFieldComparator.java
rename to src/main/java/it/cavallium/dbengine/lucene/comparators/MultiLeafFieldComparator.java
index 7eeddd8..cb73204 100644
--- a/src/main/java/org/apache/lucene/search/MultiLeafFieldComparator.java
+++ b/src/main/java/it/cavallium/dbengine/lucene/comparators/MultiLeafFieldComparator.java
@@ -14,9 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.lucene.search;
+package it.cavallium.dbengine.lucene.comparators;
 
 import java.io.IOException;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.LeafFieldComparator;
+import org.apache.lucene.search.Scorable;
 
 public final class MultiLeafFieldComparator implements LeafFieldComparator {