diff --git a/org.apache.felix.jmood/QUICKSTART.txt b/jmood/QUICKSTART.txt
similarity index 100%
rename from org.apache.felix.jmood/QUICKSTART.txt
rename to jmood/QUICKSTART.txt
diff --git a/org.apache.felix.jmood/pom.xml b/jmood/pom.xml
similarity index 100%
rename from org.apache.felix.jmood/pom.xml
rename to jmood/pom.xml
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/Activator.java b/jmood/src/main/java/org/apache/felix/jmood/Activator.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/Activator.java
rename to jmood/src/main/java/org/apache/felix/jmood/Activator.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/AgentConstants.java b/jmood/src/main/java/org/apache/felix/jmood/AgentConstants.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/AgentConstants.java
rename to jmood/src/main/java/org/apache/felix/jmood/AgentConstants.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/AgentContext.java b/jmood/src/main/java/org/apache/felix/jmood/AgentContext.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/AgentContext.java
rename to jmood/src/main/java/org/apache/felix/jmood/AgentContext.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/CompendiumHandler.java b/jmood/src/main/java/org/apache/felix/jmood/CompendiumHandler.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/CompendiumHandler.java
rename to jmood/src/main/java/org/apache/felix/jmood/CompendiumHandler.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/RMIHandler.java b/jmood/src/main/java/org/apache/felix/jmood/RMIHandler.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/RMIHandler.java
rename to jmood/src/main/java/org/apache/felix/jmood/RMIHandler.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/SecurityManagerHandler.java b/jmood/src/main/java/org/apache/felix/jmood/SecurityManagerHandler.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/SecurityManagerHandler.java
rename to jmood/src/main/java/org/apache/felix/jmood/SecurityManagerHandler.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManager.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManager.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManager.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManager.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManagerMBean.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManagerMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManagerMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigAdminManagerMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegate.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegate.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegate.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegate.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegateMBean.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegateMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegateMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/ConfigurationDelegateMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/LogManager.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/LogManager.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/LogManager.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/LogManager.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/LogManagerMBean.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/LogManagerMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/LogManagerMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/LogManagerMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/UserManager.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/UserManager.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/UserManager.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/UserManager.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/UserManagerMBean.java b/jmood/src/main/java/org/apache/felix/jmood/compendium/UserManagerMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/compendium/UserManagerMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/compendium/UserManagerMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/BundleNotAvailableException.java b/jmood/src/main/java/org/apache/felix/jmood/core/BundleNotAvailableException.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/BundleNotAvailableException.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/BundleNotAvailableException.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/CoreController.java b/jmood/src/main/java/org/apache/felix/jmood/core/CoreController.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/CoreController.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/CoreController.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/CoreControllerMBean.java b/jmood/src/main/java/org/apache/felix/jmood/core/CoreControllerMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/CoreControllerMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/CoreControllerMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/Framework.java b/jmood/src/main/java/org/apache/felix/jmood/core/Framework.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/Framework.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/Framework.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/FrameworkMBean.java b/jmood/src/main/java/org/apache/felix/jmood/core/FrameworkMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/FrameworkMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/FrameworkMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundle.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundle.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundle.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundle.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundleMBean.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundleMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundleMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedBundleMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackage.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackage.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackage.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackage.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackageMBean.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackageMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackageMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedPackageMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedService.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedService.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedService.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedService.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedServiceMBean.java b/jmood/src/main/java/org/apache/felix/jmood/core/ManagedServiceMBean.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ManagedServiceMBean.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ManagedServiceMBean.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/NotImplementedException.java b/jmood/src/main/java/org/apache/felix/jmood/core/NotImplementedException.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/NotImplementedException.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/NotImplementedException.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ServiceNotAvailableException.java b/jmood/src/main/java/org/apache/felix/jmood/core/ServiceNotAvailableException.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/ServiceNotAvailableException.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/ServiceNotAvailableException.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/BundleInfo.java b/jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/BundleInfo.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/BundleInfo.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/BundleInfo.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/FrameworkSnapshot.java b/jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/FrameworkSnapshot.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/FrameworkSnapshot.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/FrameworkSnapshot.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/PackageInfo.java b/jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/PackageInfo.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/PackageInfo.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/PackageInfo.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/ServiceInfo.java b/jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/ServiceInfo.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/ServiceInfo.java
rename to jmood/src/main/java/org/apache/felix/jmood/core/instrumentation/ServiceInfo.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/CompositeDataItemNames.java b/jmood/src/main/java/org/apache/felix/jmood/utils/CompositeDataItemNames.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/CompositeDataItemNames.java
rename to jmood/src/main/java/org/apache/felix/jmood/utils/CompositeDataItemNames.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/InstrumentationSupport.java b/jmood/src/main/java/org/apache/felix/jmood/utils/InstrumentationSupport.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/InstrumentationSupport.java
rename to jmood/src/main/java/org/apache/felix/jmood/utils/InstrumentationSupport.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/OSGi2JMXCodec.java b/jmood/src/main/java/org/apache/felix/jmood/utils/OSGi2JMXCodec.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/OSGi2JMXCodec.java
rename to jmood/src/main/java/org/apache/felix/jmood/utils/OSGi2JMXCodec.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/OSGiTypes.java b/jmood/src/main/java/org/apache/felix/jmood/utils/OSGiTypes.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/OSGiTypes.java
rename to jmood/src/main/java/org/apache/felix/jmood/utils/OSGiTypes.java
diff --git a/org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/ObjectNames.java b/jmood/src/main/java/org/apache/felix/jmood/utils/ObjectNames.java
similarity index 100%
rename from org.apache.felix.jmood/src/main/java/org/apache/felix/jmood/utils/ObjectNames.java
rename to jmood/src/main/java/org/apache/felix/jmood/utils/ObjectNames.java
diff --git a/org.apache.felix.jmood/src/main/resources/agent.properties b/jmood/src/main/resources/agent.properties
similarity index 100%
rename from org.apache.felix.jmood/src/main/resources/agent.properties
rename to jmood/src/main/resources/agent.properties
diff --git a/org.apache.felix.jmood/src/main/resources/simple.policy b/jmood/src/main/resources/simple.policy
similarity index 100%
rename from org.apache.felix.jmood/src/main/resources/simple.policy
rename to jmood/src/main/resources/simple.policy
diff --git a/org.apache.felix.jmood/src/site/site.xml b/jmood/src/site/site.xml
similarity index 100%
rename from org.apache.felix.jmood/src/site/site.xml
rename to jmood/src/site/site.xml
diff --git a/org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/FelixLauncher.java b/jmood/src/test/java/org/apache/felix/jmood/FelixLauncher.java
similarity index 100%
rename from org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/FelixLauncher.java
rename to jmood/src/test/java/org/apache/felix/jmood/FelixLauncher.java
diff --git a/org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/BundleMBeanTestCase.java b/jmood/src/test/java/org/apache/felix/jmood/core/BundleMBeanTestCase.java
similarity index 100%
rename from org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/BundleMBeanTestCase.java
rename to jmood/src/test/java/org/apache/felix/jmood/core/BundleMBeanTestCase.java
diff --git a/org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/CoreTestCase.java b/jmood/src/test/java/org/apache/felix/jmood/core/CoreTestCase.java
similarity index 100%
rename from org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/CoreTestCase.java
rename to jmood/src/test/java/org/apache/felix/jmood/core/CoreTestCase.java
diff --git a/org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/TestHarness.java b/jmood/src/test/java/org/apache/felix/jmood/core/TestHarness.java
similarity index 100%
rename from org.apache.felix.jmood/src/test/java/org/apache/felix/jmood/core/TestHarness.java
rename to jmood/src/test/java/org/apache/felix/jmood/core/TestHarness.java