diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java
index e5a969e..bc3ab48 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
@@ -7,8 +7,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.ServiceReference;
 
 public class AspectImpl {
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/DefaultNullObject.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/DefaultNullObject.java
index 910f8cd..f981610 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/DefaultNullObject.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/DefaultNullObject.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
index 4d38804..3eedcf6 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/SerialExecutor.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/SerialExecutor.java
index addcc95..43c0ec5 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/SerialExecutor.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/SerialExecutor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceRegistrationImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
index 95087b0..a3a45d7 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java
index 2ef448d..1d41521 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.List;
 
-import org.apache.felix.dependencymanager.Dependency;
+import org.apache.felix.dm.dependencies.Dependency;
 
 /**
  * Encapsulates the current state of the dependencies of a service. A state is