diff --git a/dependencymanager.temp/LICENSE b/dependencymanager/core/LICENSE
similarity index 100%
rename from dependencymanager.temp/LICENSE
rename to dependencymanager/core/LICENSE
diff --git a/dependencymanager.temp/NOTICE b/dependencymanager/core/NOTICE
similarity index 100%
rename from dependencymanager.temp/NOTICE
rename to dependencymanager/core/NOTICE
diff --git a/dependencymanager.temp/pom.xml b/dependencymanager/core/pom.xml
similarity index 100%
rename from dependencymanager.temp/pom.xml
rename to dependencymanager/core/pom.xml
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DefaultNullObject.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DefaultNullObject.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DefaultNullObject.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DefaultNullObject.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Dependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Dependency.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Dependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Dependency.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DependencyActivatorBase.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyActivatorBase.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DependencyActivatorBase.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyActivatorBase.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/DependencyManager.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Logger.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Logger.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Logger.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Logger.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/SerialExecutor.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/SerialExecutor.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/SerialExecutor.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/SerialExecutor.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Service.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Service.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/Service.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/Service.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceRegistrationImpl.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceStateListener.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceStateListener.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceStateListener.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceStateListener.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceTracker.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceTracker.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceTracker.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceTracker.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceTrackerCustomizer.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceTrackerCustomizer.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/ServiceTrackerCustomizer.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceTrackerCustomizer.java
diff --git a/dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/State.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/State.java
similarity index 100%
rename from dependencymanager.temp/src/main/java/org/apache/felix/dependencymanager/State.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/State.java
diff --git a/dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java b/dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
similarity index 100%
rename from dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
rename to dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
diff --git a/dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/Ensure.java b/dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/Ensure.java
similarity index 100%
rename from dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/Ensure.java
rename to dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/Ensure.java
diff --git a/dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java b/dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
similarity index 100%
rename from dependencymanager.temp/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
rename to dependencymanager/core/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java