diff --git a/org.apache.felix.framework/build.xml b/org.apache.felix.framework/build.xml
index 19dade0..d98b041 100644
--- a/org.apache.felix.framework/build.xml
+++ b/org.apache.felix.framework/build.xml
@@ -1,7 +1,7 @@
 <project name="felix" default="all" basedir=".">
 
     <!-- Set our global properties -->
-    <property name="src.dir" value="src"/>
+    <property name="src.dir" value="src/main/java"/>
     <property name="lib.dir" value="lib"/>
     <property name="output.dir" value="classes"/>
     <property name="bundle.dir" value="bundle"/>
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/BundleRecord.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/BundleRecord.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/BundleRecord.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/BundleRecord.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/BundleRepository.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/BundleRepository.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/BundleRepository.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/BundleRepository.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/IAttribute.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IAttribute.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/IAttribute.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IAttribute.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/IDirective.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IDirective.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/IDirective.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IDirective.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/IPackage.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IPackage.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/IPackage.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IPackage.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/IVersion.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IVersion.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/IVersion.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/IVersion.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/ResolveException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/ResolveException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/ResolveException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/ResolveException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/Activator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/Activator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/Activator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/Activator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/FileUtil.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/FileUtil.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/FileUtil.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/FileUtil.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/LocalState.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/LocalState.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/LocalState.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/LocalState.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/MapToDictionary.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/MapToDictionary.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/MapToDictionary.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/MapToDictionary.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Attribute.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Attribute.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Attribute.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Attribute.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Directive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Directive.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Directive.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Directive.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Package.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Package.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Package.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Package.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Version.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Version.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/R4Version.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/R4Version.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/RepositoryState.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryState.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/RepositoryState.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryState.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/Util.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/Util.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/Util.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/Util.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/manifest.mf
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/BundleContextImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/BundleContextImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/BundleImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/BundleImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/BundleInfo.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/BundleInfo.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/BundleInfo.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/ExportedPackageImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/ExportedPackageImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/FakeURLStreamHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/FakeURLStreamHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/FakeURLStreamHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/Felix.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/Felix.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/FilterImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FilterImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/FilterImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/FilterImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/FrameworkUtil.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/FrameworkUtil.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/FrameworkUtil.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/LogWrapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/LogWrapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/LogWrapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/LogWrapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/Main.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Main.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/Main.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/Main.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/OSGiLibrarySource.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/OSGiLibrarySource.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/OSGiLibrarySource.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/OSGiURLPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/OSGiURLPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/OSGiURLPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/OSGiURLPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/PackageAdminActivator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/PackageAdminActivator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminActivator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/PackageAdminImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/PackageAdminImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/ServiceReferenceImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/ServiceReferenceImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/ServiceRegistrationImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/ServiceRegistrationImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/ServiceRegistry.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/ServiceRegistry.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/StartLevelActivator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/StartLevelActivator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelActivator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/StartLevelImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/StartLevelImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/SystemBundle.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundle.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/SystemBundle.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundle.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/SystemBundleActivator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/SystemBundleActivator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleActivator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/SystemBundleArchive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleArchive.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/SystemBundleArchive.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/SystemBundleArchive.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlers.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlers.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlers.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlers.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersActivator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersActivator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersActivator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersBundleStreamHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleStreamHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersBundleURLConnection.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersBundleURLConnection.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersContentHandlerProxy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersServiceTracker.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersServiceTracker.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersServiceTracker.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/cache/BundleArchive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/cache/BundleArchive.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/cache/BundleCache.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/cache/BundleCache.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/cache/DefaultBundleArchive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/cache/DefaultBundleArchive.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleArchive.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/cache/DefaultBundleCache.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/cache/DefaultBundleCache.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/DefaultBundleCache.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/ext/FelixBundleContext.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/ext/FelixBundleContext.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/ext/FelixBundleContext.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/Artifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Artifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/Artifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Artifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/BooleanProperty.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/BooleanProperty.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/BooleanProperty.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/BooleanProperty.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/Install.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Install.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/Install.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Install.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/Property.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Property.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/Property.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Property.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/PropertyPanel.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/PropertyPanel.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/PropertyPanel.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/PropertyPanel.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/Status.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Status.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/Status.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/Status.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/StringProperty.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/StringProperty.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/StringProperty.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/StringProperty.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/URLFileArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/URLFileArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/URLJarArtifact.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/artifact/URLJarArtifact.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/BooleanEditor.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/BooleanEditor.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/BooleanEditor.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/BooleanEditor.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/BooleanStringEditor.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/BooleanStringEditor.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/FileEditor.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/FileEditor.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/FileEditor.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/FileEditor.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/StringEditor.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/StringEditor.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/editor/StringEditor.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/editor/StringEditor.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/manifest.mf
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/manifest.mf
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/manifest.mf
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/StringPropertyImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/property/StringPropertyImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/installer/resource/ResourceLoader.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/resource/ResourceLoader.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/installer/resource/ResourceLoader.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/installer/resource/ResourceLoader.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/manifest.mf
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/manifest.mf
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/manifest.mf
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Attribute.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Attribute.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Attribute.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Directive.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Directive.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Directive.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Package.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Package.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Package.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Version.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Version.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Version.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Version.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Wire.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/searchpolicy/R4Wire.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Wire.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/BundleListenerWrapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/BundleListenerWrapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/BundleListenerWrapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/BundleListenerWrapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/DispatchQueue.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/DispatchQueue.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/DispatchQueue.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/DispatchQueue.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/Dispatcher.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Dispatcher.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/Dispatcher.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Dispatcher.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/FelixConstants.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/FelixConstants.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/FelixDispatchQueue.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/FelixDispatchQueue.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FelixDispatchQueue.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FrameworkListenerWrapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/FrameworkListenerWrapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/IteratorToEnumeration.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/IteratorToEnumeration.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/IteratorToEnumeration.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/LibraryInfo.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/LibraryInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/LibraryInfo.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/LibraryInfo.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ListenerWrapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ListenerWrapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ListenerWrapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ListenerWrapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/MapToDictionary.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/MapToDictionary.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/MutablePropertyResolver.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/MutablePropertyResolver.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolver.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ObjectInputStreamX.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ObjectInputStreamX.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ObjectInputStreamX.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/PropertyResolver.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/PropertyResolver.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/PropertyResolver.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/SecureAction.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/SecureAction.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/SecurityManagerEx.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/SecurityManagerEx.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/SecurityManagerEx.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ServiceListenerWrapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ServiceListenerWrapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ServiceListenerWrapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ServiceListenerWrapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/StringMap.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/StringMap.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/StringMap.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/StringMap.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/Util.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Util.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/Util.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/Util.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Driver.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Driver.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Driver.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/EvaluationException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/EvaluationException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/EvaluationException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Evaluator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Evaluator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Evaluator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/LdapLexer.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/LdapLexer.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/LdapLexer.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Mapper.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Mapper.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Mapper.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Operator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Operator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Operator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/ParseException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/ParseException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/ParseException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Parser.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Parser.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Unknown.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/framework/util/ldap/Unknown.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/ldap/Unknown.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/DefaultURLPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/DefaultURLPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/DefaultURLPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/DefaultURLPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/JarResourceSource.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarResourceSource.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/JarResourceSource.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/JarResourceSource.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/LibrarySource.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/LibrarySource.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/LibrarySource.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/LibrarySource.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/Module.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/Module.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/Module.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/Module.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleClassLoader.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleClassLoader.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleClassLoader.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleClassLoader.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleEvent.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleEvent.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleEvent.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleListener.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleListener.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleListener.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleManager.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleManager.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleManager.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleManager.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleURLConnection.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleURLConnection.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleURLConnection.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleURLConnection.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleURLStreamHandler.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ModuleURLStreamHandler.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ResourceNotFoundException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ResourceNotFoundException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceNotFoundException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/ResourceSource.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceSource.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/ResourceSource.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/ResourceSource.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/SearchPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/SearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/SearchPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/SearchPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/URLPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/URLPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/URLPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/URLPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/Util.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/Util.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/Util.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/Util.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/CompatibilityPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/CompatibilityPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ImportSearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ImportSearchPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ResolveException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ResolveException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ResolveException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ResolveException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ResolveListener.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ResolveListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ResolveListener.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ResolveListener.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/SelectionPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/SelectionPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/SelectionPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/SelectionPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ValidationException.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ValidationException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ValidationException.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ValidationException.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ValidationListener.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ValidationListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/ValidationListener.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/ValidationListener.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java b/org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/CdCommand.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/CdCommand.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/CdCommand.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/CdCommand.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/Command.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/Command.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/Command.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/Command.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/ShellService.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/ShellService.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/ShellService.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/ShellService.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/Activator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/Activator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/Activator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/Activator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/CdCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/CdCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/HeadersCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/HeadersCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/HelpCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/HelpCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/InstallCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/InstallCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/PackagesCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/PackagesCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/PsCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/PsCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/RefreshCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/RefreshCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/ServicesCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/ServicesCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/ShutdownCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/ShutdownCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/StartCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/StartCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/StartLevelCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/StartLevelCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/StopCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/StopCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/UninstallCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/UninstallCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/UpdateCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/UpdateCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/Util.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/Util.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/Util.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/Util.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/VersionCommandImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/VersionCommandImpl.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shell/impl/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shell/impl/manifest.mf
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
diff --git a/org.apache.felix.framework/src/org/apache/felix/shelltui/Activator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shelltui/Activator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java
diff --git a/org.apache.felix.framework/src/org/apache/felix/shelltui/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf
similarity index 100%
rename from org.apache.felix.framework/src/org/apache/felix/shelltui/manifest.mf
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf
diff --git a/org.apache.felix.framework/src/org/osgi/framework/AdminPermission.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/AdminPermission.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/AdminPermission.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/AdminPermission.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/AllServiceListener.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/AllServiceListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/AllServiceListener.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/AllServiceListener.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/Bundle.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/Bundle.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/Bundle.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/Bundle.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundleActivator.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundleActivator.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundleActivator.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundleActivator.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundleContext.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundleContext.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundleContext.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundleContext.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundleEvent.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundleEvent.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundleEvent.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundleEvent.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundleException.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundleException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundleException.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundleException.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundleListener.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundleListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundleListener.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundleListener.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/BundlePermission.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/BundlePermission.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/BundlePermission.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/BundlePermission.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/Configurable.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/Configurable.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/Configurable.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/Configurable.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/Constants.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/Constants.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/Constants.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/Constants.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/Filter.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/Filter.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/Filter.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/Filter.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/FrameworkEvent.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkEvent.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/FrameworkEvent.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkEvent.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/FrameworkListener.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/FrameworkListener.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkListener.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/FrameworkUtil.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkUtil.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/FrameworkUtil.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/FrameworkUtil.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/InvalidSyntaxException.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/InvalidSyntaxException.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/InvalidSyntaxException.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/InvalidSyntaxException.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/PackagePermission.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/PackagePermission.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/PackagePermission.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/PackagePermission.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServiceEvent.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceEvent.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServiceEvent.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceEvent.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServiceFactory.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceFactory.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServiceFactory.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceFactory.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServiceListener.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServiceListener.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceListener.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServicePermission.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServicePermission.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServicePermission.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServicePermission.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServiceReference.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceReference.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServiceReference.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceReference.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/ServiceRegistration.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceRegistration.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/ServiceRegistration.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/ServiceRegistration.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/SynchronousBundleListener.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/SynchronousBundleListener.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/SynchronousBundleListener.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/SynchronousBundleListener.java
diff --git a/org.apache.felix.framework/src/org/osgi/framework/Version.java b/org.apache.felix.framework/src/main/java/org/osgi/framework/Version.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/framework/Version.java
rename to org.apache.felix.framework/src/main/java/org/osgi/framework/Version.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/BundleLocationCondition.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/BundleLocationCondition.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/BundleLocationCondition.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/BundleLocationCondition.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/BundleSignerCondition.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/BundleSignerCondition.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/BundleSignerCondition.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/Condition.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/Condition.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/Condition.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/Condition.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionInfo.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionInfo.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionInfo.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java b/org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/packageadmin/ExportedPackage.java b/org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/ExportedPackage.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/packageadmin/ExportedPackage.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/ExportedPackage.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/packageadmin/PackageAdmin.java b/org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/PackageAdmin.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/packageadmin/PackageAdmin.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/PackageAdmin.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/packageadmin/RequiredBundle.java b/org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/RequiredBundle.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/packageadmin/RequiredBundle.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/packageadmin/RequiredBundle.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/permissionadmin/PermissionAdmin.java b/org.apache.felix.framework/src/main/java/org/osgi/service/permissionadmin/PermissionAdmin.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/permissionadmin/PermissionAdmin.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/permissionadmin/PermissionAdmin.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/permissionadmin/PermissionInfo.java b/org.apache.felix.framework/src/main/java/org/osgi/service/permissionadmin/PermissionInfo.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/permissionadmin/PermissionInfo.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/permissionadmin/PermissionInfo.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/startlevel/StartLevel.java b/org.apache.felix.framework/src/main/java/org/osgi/service/startlevel/StartLevel.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/startlevel/StartLevel.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/startlevel/StartLevel.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/url/AbstractURLStreamHandlerService.java b/org.apache.felix.framework/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/url/AbstractURLStreamHandlerService.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/url/URLConstants.java b/org.apache.felix.framework/src/main/java/org/osgi/service/url/URLConstants.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/url/URLConstants.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/url/URLConstants.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/url/URLStreamHandlerService.java b/org.apache.felix.framework/src/main/java/org/osgi/service/url/URLStreamHandlerService.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/url/URLStreamHandlerService.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/url/URLStreamHandlerService.java
diff --git a/org.apache.felix.framework/src/org/osgi/service/url/URLStreamHandlerSetter.java b/org.apache.felix.framework/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/service/url/URLStreamHandlerSetter.java
rename to org.apache.felix.framework/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java
diff --git a/org.apache.felix.framework/src/org/osgi/util/tracker/ServiceTracker.java b/org.apache.felix.framework/src/main/java/org/osgi/util/tracker/ServiceTracker.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/util/tracker/ServiceTracker.java
rename to org.apache.felix.framework/src/main/java/org/osgi/util/tracker/ServiceTracker.java
diff --git a/org.apache.felix.framework/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java b/org.apache.felix.framework/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
similarity index 100%
rename from org.apache.felix.framework/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java
rename to org.apache.felix.framework/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
diff --git a/org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/CdCommand.java b/org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java
similarity index 100%
rename from org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/CdCommand.java
rename to org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java
diff --git a/org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/Command.java b/org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/Command.java
similarity index 100%
rename from org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/Command.java
rename to org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/Command.java
diff --git a/org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/ShellService.java b/org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java
similarity index 100%
rename from org.apache.felix.framework/src/org/ungoverned/osgi/service/shell/ShellService.java
rename to org.apache.felix.framework/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java