diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java
index 6826b6f..4918877 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java
@@ -38,10 +38,10 @@
 import org.apache.felix.dm.impl.dependencies.ResourceDependencyImpl;
 import org.apache.felix.dm.impl.dependencies.ServiceDependencyImpl;
 import org.apache.felix.dm.impl.dependencies.TemporalServiceDependencyImpl;
+import org.apache.felix.dm.impl.index.AspectFilterIndex;
+import org.apache.felix.dm.impl.index.MultiPropertyExactFilter;
+import org.apache.felix.dm.impl.index.ServiceRegistryCache;
 import org.apache.felix.dm.impl.metatype.PropertyMetaDataImpl;
-import org.apache.felix.dm.index.AspectFilterIndex;
-import org.apache.felix.dm.index.MultiPropertyExactFilter;
-import org.apache.felix.dm.index.ServiceRegistryCache;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/AspectFilterIndex.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/AspectFilterIndex.java
similarity index 99%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/AspectFilterIndex.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/AspectFilterIndex.java
index ffe5b7c..e57a91b 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/AspectFilterIndex.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/AspectFilterIndex.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptor.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptor.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
index 4246b67..8e2e8e8 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptor.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptorBase.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java
similarity index 99%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptorBase.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java
index c32225c..6bb237d 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/BundleContextInterceptorBase.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndex.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndex.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndex.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndex.java
index cdc2b86..6d248fa 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndex.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndex.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.List;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndexBundleContext.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndexBundleContext.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java
index ab8f499..afaee86 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/FilterIndexBundleContext.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.Map.Entry;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/MultiPropertyExactFilter.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
similarity index 99%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/MultiPropertyExactFilter.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
index 422b328..9484f96 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/MultiPropertyExactFilter.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/ServiceRegistryCache.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/ServiceRegistryCache.java
similarity index 99%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/index/ServiceRegistryCache.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/ServiceRegistryCache.java
index 29566bf..3d5c68e 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/index/ServiceRegistryCache.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/ServiceRegistryCache.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.HashMap;
 import java.util.Iterator;