diff --git a/org.apache.felix.framework/etc/all.policy b/framework/etc/all.policy
similarity index 100%
rename from org.apache.felix.framework/etc/all.policy
rename to framework/etc/all.policy
diff --git a/org.apache.felix.framework/etc/config.properties.gui b/framework/etc/config.properties.gui
similarity index 100%
rename from org.apache.felix.framework/etc/config.properties.gui
rename to framework/etc/config.properties.gui
diff --git a/org.apache.felix.framework/etc/config.properties.text b/framework/etc/config.properties.text
similarity index 100%
rename from org.apache.felix.framework/etc/config.properties.text
rename to framework/etc/config.properties.text
diff --git a/org.apache.felix.framework/etc/example.policy b/framework/etc/example.policy
similarity index 100%
rename from org.apache.felix.framework/etc/example.policy
rename to framework/etc/example.policy
diff --git a/org.apache.felix.framework/etc/felix.bat b/framework/etc/felix.bat
similarity index 100%
rename from org.apache.felix.framework/etc/felix.bat
rename to framework/etc/felix.bat
diff --git a/org.apache.felix.framework/etc/felix.sh b/framework/etc/felix.sh
similarity index 100%
rename from org.apache.felix.framework/etc/felix.sh
rename to framework/etc/felix.sh
diff --git a/org.apache.felix.framework/pom.xml b/framework/pom.xml
similarity index 100%
rename from org.apache.felix.framework/pom.xml
rename to framework/pom.xml
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
rename to framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
rename to framework/src/main/java/org/apache/felix/framework/BundleImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleInfo.java b/framework/src/main/java/org/apache/felix/framework/BundleInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleInfo.java
rename to framework/src/main/java/org/apache/felix/framework/BundleInfo.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java b/framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
rename to framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java b/framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
rename to framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
rename to framework/src/main/java/org/apache/felix/framework/Felix.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FilterImpl.java b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/FilterImpl.java
rename to framework/src/main/java/org/apache/felix/framework/FilterImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java b/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
rename to framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java b/framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java
rename to framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/GetEntryPathsEnumeration.java b/framework/src/main/java/org/apache/felix/framework/GetEntryPathsEnumeration.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/GetEntryPathsEnumeration.java
rename to framework/src/main/java/org/apache/felix/framework/GetEntryPathsEnumeration.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Logger.java b/framework/src/main/java/org/apache/felix/framework/Logger.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/Logger.java
rename to framework/src/main/java/org/apache/felix/framework/Logger.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java b/framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java
rename to framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java b/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
rename to framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java b/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
rename to framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java b/framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
rename to framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java b/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
rename to framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java b/framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java
rename to framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java b/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
rename to framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundle.java b/framework/src/main/java/org/apache/felix/framework/SystemBundle.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundle.java
rename to framework/src/main/java/org/apache/felix/framework/SystemBundle.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java b/framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java
rename to framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java b/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java
rename to framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlers.java b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlers.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlers.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
rename to framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
rename to framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
rename to framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
rename to framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
rename to framework/src/main/java/org/apache/felix/framework/cache/DirectoryRevision.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java b/framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
rename to framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/SystemBundleArchive.java b/framework/src/main/java/org/apache/felix/framework/cache/SystemBundleArchive.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/SystemBundleArchive.java
rename to framework/src/main/java/org/apache/felix/framework/cache/SystemBundleArchive.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java b/framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java
rename to framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleDefinition.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleDefinition.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleDefinition.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/ModuleDefinition.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Import.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Import.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Import.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Import.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Library.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Library.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Library.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Library.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4LibraryHeader.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4LibraryHeader.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4LibraryHeader.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4LibraryHeader.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveException.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveException.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveException.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveException.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveListener.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveListener.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveListener.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/ResolveListener.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/URLPolicyImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/VersionRange.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/VersionRange.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/VersionRange.java
rename to framework/src/main/java/org/apache/felix/framework/searchpolicy/VersionRange.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java b/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
rename to framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java b/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
rename to framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java b/framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java
rename to framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ManifestParser.java b/framework/src/main/java/org/apache/felix/framework/util/ManifestParser.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ManifestParser.java
rename to framework/src/main/java/org/apache/felix/framework/util/ManifestParser.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java b/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
rename to framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java b/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java
rename to framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
rename to framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java b/framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java
rename to framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java b/framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java
rename to framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecureAction.java b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
rename to framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java b/framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
rename to framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/StringMap.java b/framework/src/main/java/org/apache/felix/framework/util/StringMap.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/StringMap.java
rename to framework/src/main/java/org/apache/felix/framework/util/StringMap.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Util.java b/framework/src/main/java/org/apache/felix/framework/util/Util.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Util.java
rename to framework/src/main/java/org/apache/felix/framework/util/Util.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java
rename to framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ContentDirectoryContent.java b/framework/src/main/java/org/apache/felix/moduleloader/ContentDirectoryContent.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ContentDirectoryContent.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ContentDirectoryContent.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/DirectoryContent.java b/framework/src/main/java/org/apache/felix/moduleloader/DirectoryContent.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/DirectoryContent.java
rename to framework/src/main/java/org/apache/felix/moduleloader/DirectoryContent.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IContent.java b/framework/src/main/java/org/apache/felix/moduleloader/IContent.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IContent.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IContent.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java b/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModule.java b/framework/src/main/java/org/apache/felix/moduleloader/IModule.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModule.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IModule.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java b/framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java b/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ISearchPolicy.java b/framework/src/main/java/org/apache/felix/moduleloader/ISearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ISearchPolicy.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ISearchPolicy.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IURLPolicy.java b/framework/src/main/java/org/apache/felix/moduleloader/IURLPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IURLPolicy.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IURLPolicy.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IWire.java b/framework/src/main/java/org/apache/felix/moduleloader/IWire.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/IWire.java
rename to framework/src/main/java/org/apache/felix/moduleloader/IWire.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarContent.java b/framework/src/main/java/org/apache/felix/moduleloader/JarContent.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarContent.java
rename to framework/src/main/java/org/apache/felix/moduleloader/JarContent.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarFileX.java b/framework/src/main/java/org/apache/felix/moduleloader/JarFileX.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarFileX.java
rename to framework/src/main/java/org/apache/felix/moduleloader/JarFileX.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java b/framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java b/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java b/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java b/framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java b/framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java
rename to framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java
diff --git a/org.apache.felix.framework/src/main/java/org/osgi/framework/AdminPermission.java b/framework/src/main/java/org/osgi/framework/AdminPermission.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/osgi/framework/AdminPermission.java
rename to framework/src/main/java/org/osgi/framework/AdminPermission.java
diff --git a/org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkUtil.java b/framework/src/main/java/org/osgi/framework/FrameworkUtil.java
similarity index 100%
rename from org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkUtil.java
rename to framework/src/main/java/org/osgi/framework/FrameworkUtil.java
diff --git a/org.apache.felix.framework/src/main/resources/org/apache/felix/framework/Felix.properties b/framework/src/main/resources/org/apache/felix/framework/Felix.properties
similarity index 100%
rename from org.apache.felix.framework/src/main/resources/org/apache/felix/framework/Felix.properties
rename to framework/src/main/resources/org/apache/felix/framework/Felix.properties
diff --git a/main/pom.xml b/main/pom.xml
index 9a729ee..d49ada8 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -51,7 +51,7 @@
       tofile="${basedir}/bin/felix.jar"/>
 <copy file="${basedir}/target/classes/config.properties"
       todir="${basedir}/conf"/>
-<copy file="${basedir}/../org.apache.felix.framework/target/org.apache.felix.framework-${pom.version}.jar"
+<copy file="${basedir}/../framework/target/org.apache.felix.framework-${pom.version}.jar"
       todir="${basedir}/lib"/>
 <copy file="${basedir}/../org.osgi.core/target/org.osgi.core-${pom.version}.jar"
       todir="${basedir}/lib"/>
diff --git a/pom.xml b/pom.xml
index 7e54932..7f4ec30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <module>javax.servlet</module>
     <module>org.osgi.core</module>
     <module>org.osgi.compendium</module>
-    <module>org.apache.felix.framework</module>
+    <module>framework</module>
     <module>shell</module>
     <module>shell.tui</module>
     <module>shell.gui</module>