diff --git a/dependencymanager/core/pom.xml b/dependencymanager/core/pom.xml
index 01d3884..3114a2d 100644
--- a/dependencymanager/core/pom.xml
+++ b/dependencymanager/core/pom.xml
@@ -52,12 +52,12 @@
             <Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
             <Bundle-Description>A bundle that provides a run-time service dependency manager.</Bundle-Description>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-            <Export-Package>org.apache.felix.dm;version="3.0.0",org.apache.felix.dm.service;version="3.0.0",org.apache.felix.dm.management;version="3.0.0",org.apache.felix.dm.dependencies;version="3.0.0",org.apache.felix.dm.resources;version="3.0.0",org.apache.felix.dm.util;version="3.0.0"</Export-Package>
-            <Import-Package>!org.apache.felix.dm,!org.apache.felix.dm.service,!org.apache.felix.dm.management,!org.apache.felix.dm.dependencies,!org.apache.felix.dm.resources,*</Import-Package>
+            <Export-Package>org.apache.felix.dm;version="3.0.0"</Export-Package>
+            <Import-Package>!org.apache.felix.dm,*</Import-Package>
 	        <Private-Package>org.apache.felix.dm.impl,org.apache.felix.dm.impl.dependencies,org.apache.felix.dm.impl.tracker,org.apache.felix.dm.impl.metatype</Private-Package>
-	        <!-- Uncomment this line to include source code in the bundle.- ->
+	        <!-- Uncomment this line to include source code in the bundle.
             <Include-Resource>src/main/java</Include-Resource>
-            <!- - -->
+            -->
           </instructions>
         </configuration>
       </plugin>
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java
similarity index 96%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java
index 98676ea..4acb8ac 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java
@@ -9,9 +9,8 @@
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
-import org.apache.felix.dm.management.ServiceComponentDependency;
 import org.osgi.framework.Bundle;
 
 public interface BundleDependency extends Dependency, ServiceComponentDependency
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java
similarity index 96%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java
index da6e212..a82a9e9 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java
@@ -9,9 +9,8 @@
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
-import org.apache.felix.dm.management.ServiceComponentDependency;
 
 /**
  * Configuration dependency that can track the availability of a (valid) configuration. To use
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java
index df85d7f..f79f304 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
 import java.util.Dictionary;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java
index 7a86446..0584721 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java
@@ -20,15 +20,8 @@
 
 import java.util.List;
 
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
-import org.apache.felix.dm.dependencies.ResourceDependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
 import org.apache.felix.dm.impl.Logger;
 import org.apache.felix.dm.impl.ServiceImpl;
-import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
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 0a59f1b..6f78610 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
@@ -22,12 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
-import org.apache.felix.dm.dependencies.ResourceDependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
 import org.apache.felix.dm.impl.AdapterServiceImpl;
 import org.apache.felix.dm.impl.AspectServiceImpl;
 import org.apache.felix.dm.impl.BundleAdapterServiceImpl;
@@ -41,7 +35,6 @@
 import org.apache.felix.dm.impl.dependencies.ServiceDependencyImpl;
 import org.apache.felix.dm.impl.dependencies.TemporalServiceDependencyImpl;
 import org.apache.felix.dm.impl.metatype.PropertyMetaDataImpl;
-import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java
index 4a427c4..37732a5 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java
@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
 /**
  * This interface defines meta data regarding a given configuration property.
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java
index fb9a992..333d66f 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
 import java.net.URL;
 
-import org.apache.felix.dm.resources.ResourceHandler;
 
 public interface ResourceDependency extends Dependency, ResourceHandler {
     /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java
index 898aacd..9b758ca 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.resources;
+package org.apache.felix.dm;
 
 import java.net.URL;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java
similarity index 92%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java
index b004b43..04d849e 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.resources;
+package org.apache.felix.dm;
 
 import java.net.URL;
 import java.util.Dictionary;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java
index 8524f32..66397f5 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java
@@ -16,13 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.service;
+package org.apache.felix.dm;
 
 import java.util.Dictionary;
 import java.util.List;
 
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
 import org.osgi.framework.ServiceRegistration;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java
index ea5dfba..1f68f4f 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.management;
+package org.apache.felix.dm;
 
 /**
  * Describes a service component. Service components form descriptions of services
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java
index 9ecedc0..e9439b2 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.management;
+package org.apache.felix.dm;
 
 /**
  * Describes a service component dependency. They form descriptions of dependencies
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java
index 867543b..532c237 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
-import org.apache.felix.dm.management.ServiceComponentDependency;
 import org.osgi.framework.ServiceReference;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java
index 8b9c8cb..dbb70bc 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.service;
+package org.apache.felix.dm;
 
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java
index d6d8d36..301f867 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.util;
+package org.apache.felix.dm;
 
-import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java
similarity index 98%
rename from dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java
index 0626e21..cdcb294 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java
@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
 
 /**
 * A Temporal Service dependency that can block the caller thread between service updates. Only
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
index f2afb90..09c7cc8 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
@@ -25,10 +25,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ConfigurationException;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
index 50fd4e2..725c704 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
@@ -21,10 +21,10 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.ServiceReference;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java
index b715446..2076ad4 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java
@@ -23,11 +23,11 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java
index 5b5b8a3..6dedaa1 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java
@@ -22,10 +22,10 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java
index 1937e4b..fea85f7 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java
@@ -26,11 +26,11 @@
 import java.util.List;
 
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ManagedServiceFactory;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
 import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.metatype.MetaTypeProvider;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
index 3c78f45..896f529 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
@@ -23,10 +23,10 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 import org.osgi.framework.ServiceRegistration;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java
index 7bd7ca7..7406f44 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
 
 /**
  * Resource adapter service implementation. This class extends the FilterService in order to catch
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
index b7ddf50..d72c18c 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
@@ -32,14 +32,14 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceComponent;
+import org.apache.felix.dm.ServiceComponentDependency;
+import org.apache.felix.dm.ServiceStateListener;
 import org.apache.felix.dm.impl.dependencies.DependencyActivation;
 import org.apache.felix.dm.impl.dependencies.DependencyService;
-import org.apache.felix.dm.management.ServiceComponent;
-import org.apache.felix.dm.management.ServiceComponentDependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
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 1f6a2c1..9094a8b 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
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Dependency;
 
 /**
  * Encapsulates the current state of the dependencies of a service. A state is
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
index 2946486..380300e 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
@@ -23,13 +23,13 @@
 import java.util.Dictionary;
 import java.util.List;
 
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.BundleDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ServiceComponentDependency;
 import org.apache.felix.dm.impl.DefaultNullObject;
 import org.apache.felix.dm.impl.Logger;
 import org.apache.felix.dm.impl.tracker.BundleTracker;
 import org.apache.felix.dm.impl.tracker.BundleTrackerCustomizer;
-import org.apache.felix.dm.management.ServiceComponentDependency;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
index a0791f3..e55665e 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
@@ -26,13 +26,13 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.ConfigurationDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.ServiceComponentDependency;
 import org.apache.felix.dm.impl.InvocationUtil;
 import org.apache.felix.dm.impl.Logger;
 import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
-import org.apache.felix.dm.management.ServiceComponentDependency;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java
index 401f970..70217c5 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java
@@ -1,6 +1,6 @@
 package org.apache.felix.dm.impl.dependencies;
 
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.impl.Logger;
 
 public abstract class DependencyBase implements Dependency, DependencyActivation {
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java
index beece72..0b8f37a 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java
@@ -18,8 +18,8 @@
  */
 package org.apache.felix.dm.impl.dependencies;
 
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.Service;
 
 public interface DependencyService {
     /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
index b7faaab..428e1fb 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
@@ -24,12 +24,12 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ResourceDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ResourceDependency;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceComponentDependency;
 import org.apache.felix.dm.impl.Logger;
-import org.apache.felix.dm.management.ServiceComponentDependency;
-import org.apache.felix.dm.resources.ResourceHandler;
-import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
index 99ffe0f..86e1043 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
@@ -29,13 +29,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ServiceComponentDependency;
+import org.apache.felix.dm.ServiceDependency;
 import org.apache.felix.dm.impl.DefaultNullObject;
 import org.apache.felix.dm.impl.Logger;
 import org.apache.felix.dm.impl.tracker.ServiceTracker;
 import org.apache.felix.dm.impl.tracker.ServiceTrackerCustomizer;
-import org.apache.felix.dm.management.ServiceComponentDependency;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java
index 2dd37e3..3a54c4b 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java
@@ -16,7 +16,7 @@
 import java.lang.reflect.Proxy;
 
 import org.apache.felix.dm.DependencyActivatorBase;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
+import org.apache.felix.dm.TemporalServiceDependency;
 import org.apache.felix.dm.impl.Logger;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
index 26104fa..c6711b1 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
@@ -32,7 +32,7 @@
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.PropertyMetaData;
 import org.apache.felix.dm.impl.Logger;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
index f64c093..fc8cd61 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.PropertyMetaData;
 import org.osgi.service.metatype.AttributeDefinition;
 
 /**
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java
index 09a42cf..3b42585 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java
@@ -21,7 +21,7 @@
 import java.util.List;
 
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.util.ServiceUtil;
+import org.apache.felix.dm.ServiceUtil;
 import org.osgi.framework.AllServiceListener;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;