diff --git a/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java b/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java
index 9e33378014b..718b4ffd272 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsMasterMessageListener.java
@@ -32,7 +32,7 @@
 
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.indexes.spi.IndexManager;
 import org.hibernate.search.util.logging.impl.Log;
 import org.hibernate.search.util.logging.impl.LoggerFactory;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java b/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
index aa64c0076dc..fbb67c0b333 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
@@ -34,7 +34,7 @@
 
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.indexes.spi.IndexManager;
 import org.hibernate.search.util.impl.ContextHelper;
 import org.hibernate.search.util.logging.impl.Log;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/engine/spi/SearchFactoryImplementor.java b/hibernate-search/src/main/java/org/hibernate/search/engine/spi/SearchFactoryImplementor.java
index edfc285da50..770e4753b49 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/engine/spi/SearchFactoryImplementor.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/engine/spi/SearchFactoryImplementor.java
@@ -30,7 +30,7 @@
 import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
 import org.hibernate.search.engine.impl.FilterDef;
 import org.hibernate.search.filter.FilterCachingStrategy;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.spi.SearchFactoryIntegrator;
 import org.hibernate.search.stat.spi.StatisticsImplementor;
 
diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java b/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
index 87aad66b9a0..1d3df2af3ac 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
@@ -37,7 +37,7 @@
 import org.hibernate.search.backend.spi.Worker;
 import org.hibernate.search.engine.impl.FilterDef;
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.indexes.spi.IndexManager;
 import org.hibernate.search.jmx.impl.JMXRegistrar;
 import org.hibernate.search.reader.impl.MultiReaderFactory;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java b/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
index 51d33474b6a..bc72ca67a69 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
@@ -41,7 +41,7 @@
 import org.hibernate.search.engine.impl.FilterDef;
 import org.hibernate.search.engine.ServiceManager;
 import org.hibernate.search.filter.FilterCachingStrategy;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.query.dsl.QueryContextBuilder;
 import org.hibernate.search.query.engine.spi.HSQuery;
 import org.hibernate.search.spi.SearchFactoryBuilder;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactoryState.java b/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactoryState.java
index 692a617af3f..f2e5ca79195 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactoryState.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactoryState.java
@@ -33,7 +33,7 @@
 import org.hibernate.search.engine.impl.FilterDef;
 import org.hibernate.search.engine.ServiceManager;
 import org.hibernate.search.filter.FilterCachingStrategy;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
 import org.hibernate.search.spi.internals.SearchFactoryImplementorWithShareableState;
 import org.hibernate.search.spi.internals.SearchFactoryState;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/indexes/IndexManagerHolder.java b/hibernate-search/src/main/java/org/hibernate/search/indexes/impl/IndexManagerHolder.java
similarity index 98%
rename from hibernate-search/src/main/java/org/hibernate/search/indexes/IndexManagerHolder.java
rename to hibernate-search/src/main/java/org/hibernate/search/indexes/impl/IndexManagerHolder.java
index a3072989372..05440d90808 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/indexes/IndexManagerHolder.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/indexes/impl/IndexManagerHolder.java
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.search.indexes;
+package org.hibernate.search.indexes.impl;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -34,7 +34,6 @@
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.cfg.spi.SearchConfiguration;
 import org.hibernate.search.engine.impl.MutableEntityIndexMapping;
-import org.hibernate.search.indexes.impl.DirectoryBasedIndexManager;
 import org.hibernate.search.indexes.spi.IndexManager;
 import org.hibernate.search.spi.WorkerBuildContext;
 import org.hibernate.search.spi.internals.SearchFactoryImplementorWithShareableState;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java b/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java
index ae38526842e..1dc122aafb7 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java
@@ -24,7 +24,7 @@
 package org.hibernate.search.spi;
 
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 
 /**
  * Build context that can be used by some services at initialization
diff --git a/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java b/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java
index c8811a187be..eb16ec49510 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java
@@ -85,7 +85,7 @@
 import org.hibernate.search.impl.MutableSearchFactory;
 import org.hibernate.search.impl.MutableSearchFactoryState;
 import org.hibernate.search.impl.SearchMappingBuilder;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.indexes.spi.IndexManager;
 import org.hibernate.search.jmx.IndexControl;
 import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
diff --git a/hibernate-search/src/main/java/org/hibernate/search/spi/internals/SearchFactoryState.java b/hibernate-search/src/main/java/org/hibernate/search/spi/internals/SearchFactoryState.java
index 6ea9399e9f0..2177cb24752 100644
--- a/hibernate-search/src/main/java/org/hibernate/search/spi/internals/SearchFactoryState.java
+++ b/hibernate-search/src/main/java/org/hibernate/search/spi/internals/SearchFactoryState.java
@@ -32,7 +32,7 @@
 import org.hibernate.search.engine.impl.FilterDef;
 import org.hibernate.search.engine.ServiceManager;
 import org.hibernate.search.filter.FilterCachingStrategy;
-import org.hibernate.search.indexes.IndexManagerHolder;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.store.DirectoryProvider;
 
 import java.util.Map;
diff --git a/hibernate-search/src/test/java/org/hibernate/search/test/configuration/CustomBackendTest.java b/hibernate-search/src/test/java/org/hibernate/search/test/configuration/CustomBackendTest.java
index 686c30d4641..b6512be5b05 100644
--- a/hibernate-search/src/test/java/org/hibernate/search/test/configuration/CustomBackendTest.java
+++ b/hibernate-search/src/test/java/org/hibernate/search/test/configuration/CustomBackendTest.java
@@ -28,8 +28,8 @@
 import org.hibernate.search.backend.impl.blackhole.BlackHoleBackendQueueProcessorFactory;
 import org.hibernate.search.backend.impl.lucene.LuceneBackendQueueProcessorFactory;
 import org.hibernate.search.engine.spi.SearchFactoryImplementor;
-import org.hibernate.search.indexes.IndexManagerHolder;
 import org.hibernate.search.indexes.impl.DirectoryBasedIndexManager;
+import org.hibernate.search.indexes.impl.IndexManagerHolder;
 import org.hibernate.search.test.util.FullTextSessionBuilder;
 
 import org.junit.Test;