diff --git a/mosgi/mosgi.console.component/pom.xml b/mosgi/console.component/pom.xml
similarity index 100%
rename from mosgi/mosgi.console.component/pom.xml
rename to mosgi/console.component/pom.xml
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/Activator.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/Activator.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/Activator.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/Activator.java
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/JtableCellRenderer.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/JtableCellRenderer.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/JtableCellRenderer.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/JtableCellRenderer.java
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/JtreeCellRenderer.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/JtreeCellRenderer.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/JtreeCellRenderer.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/JtreeCellRenderer.java
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/MyTree.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/MyTree.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/MyTree.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/MyTree.java
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
diff --git a/mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtree.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtree.java
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtree.java
rename to mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtree.java
diff --git a/mosgi/mosgi.console.component/src/main/resources/META-INF/LICENSE b/mosgi/console.component/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/META-INF/LICENSE
rename to mosgi/console.component/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.console.component/src/main/resources/META-INF/NOTICE b/mosgi/console.component/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/META-INF/NOTICE
rename to mosgi/console.component/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/ACTIVE.gif b/mosgi/console.component/src/main/resources/icons/ACTIVE.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/ACTIVE.gif
rename to mosgi/console.component/src/main/resources/icons/ACTIVE.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/INSTALLED.gif b/mosgi/console.component/src/main/resources/icons/INSTALLED.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/INSTALLED.gif
rename to mosgi/console.component/src/main/resources/icons/INSTALLED.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/OLDLOG.gif b/mosgi/console.component/src/main/resources/icons/OLDLOG.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/OLDLOG.gif
rename to mosgi/console.component/src/main/resources/icons/OLDLOG.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/RESOLVED.gif b/mosgi/console.component/src/main/resources/icons/RESOLVED.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/RESOLVED.gif
rename to mosgi/console.component/src/main/resources/icons/RESOLVED.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/STARTING.gif b/mosgi/console.component/src/main/resources/icons/STARTING.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/STARTING.gif
rename to mosgi/console.component/src/main/resources/icons/STARTING.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/STOPPING.gif b/mosgi/console.component/src/main/resources/icons/STOPPING.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/STOPPING.gif
rename to mosgi/console.component/src/main/resources/icons/STOPPING.gif
Binary files differ
diff --git a/mosgi/mosgi.console.component/src/main/resources/icons/UNINSTALLED.gif b/mosgi/console.component/src/main/resources/icons/UNINSTALLED.gif
similarity index 100%
rename from mosgi/mosgi.console.component/src/main/resources/icons/UNINSTALLED.gif
rename to mosgi/console.component/src/main/resources/icons/UNINSTALLED.gif
Binary files differ
diff --git a/mosgi/mosgi.console.gui/pom.xml b/mosgi/console.gui/pom.xml
similarity index 100%
rename from mosgi/mosgi.console.gui/pom.xml
rename to mosgi/console.gui/pom.xml
diff --git a/mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/Activator.java b/mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/Activator.java
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/Activator.java
rename to mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/Activator.java
diff --git a/mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/CommonPanel.java b/mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/CommonPanel.java
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/CommonPanel.java
rename to mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/CommonPanel.java
diff --git a/mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodeCellRenderer.java b/mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodeCellRenderer.java
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodeCellRenderer.java
rename to mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodeCellRenderer.java
diff --git a/mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodePanel.java b/mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodePanel.java
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodePanel.java
rename to mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodePanel.java
diff --git a/mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodesTree.java b/mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodesTree.java
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodesTree.java
rename to mosgi/console.gui/src/main/java/org/apache/felix/mosgi/console/gui/NodesTree.java
diff --git a/mosgi/mosgi.console.gui/src/main/resources/META-INF/LICENSE b/mosgi/console.gui/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/META-INF/LICENSE
rename to mosgi/console.gui/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.console.gui/src/main/resources/META-INF/NOTICE b/mosgi/console.gui/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/META-INF/NOTICE
rename to mosgi/console.gui/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.console.gui/src/main/resources/images/GraphSettings.gif b/mosgi/console.gui/src/main/resources/images/GraphSettings.gif
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/images/GraphSettings.gif
rename to mosgi/console.gui/src/main/resources/images/GraphSettings.gif
Binary files differ
diff --git a/mosgi/mosgi.console.gui/src/main/resources/images/ServerBlocked.gif b/mosgi/console.gui/src/main/resources/images/ServerBlocked.gif
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/images/ServerBlocked.gif
rename to mosgi/console.gui/src/main/resources/images/ServerBlocked.gif
Binary files differ
diff --git a/mosgi/mosgi.console.gui/src/main/resources/images/ServerRunning.gif b/mosgi/console.gui/src/main/resources/images/ServerRunning.gif
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/images/ServerRunning.gif
rename to mosgi/console.gui/src/main/resources/images/ServerRunning.gif
Binary files differ
diff --git a/mosgi/mosgi.console.gui/src/main/resources/images/logo.gif b/mosgi/console.gui/src/main/resources/images/logo.gif
similarity index 100%
rename from mosgi/mosgi.console.gui/src/main/resources/images/logo.gif
rename to mosgi/console.gui/src/main/resources/images/logo.gif
Binary files differ
diff --git a/mosgi/mosgi.console.ifc/pom.xml b/mosgi/console.ifc/pom.xml
similarity index 100%
rename from mosgi/mosgi.console.ifc/pom.xml
rename to mosgi/console.ifc/pom.xml
diff --git a/mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/CommonPlugin.java b/mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/CommonPlugin.java
similarity index 100%
rename from mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/CommonPlugin.java
rename to mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/CommonPlugin.java
diff --git a/mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/Plugin.java b/mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/Plugin.java
similarity index 100%
rename from mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/Plugin.java
rename to mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/Plugin.java
diff --git a/mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/TabIfc.java b/mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/TabIfc.java
similarity index 100%
rename from mosgi/mosgi.console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/TabIfc.java
rename to mosgi/console.ifc/src/main/java/org/apache/felix/mosgi/console/ifc/TabIfc.java
diff --git a/mosgi/mosgi.console.ifc/src/main/resources/META-INF/LICENSE b/mosgi/console.ifc/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.console.ifc/src/main/resources/META-INF/LICENSE
rename to mosgi/console.ifc/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.console.ifc/src/main/resources/META-INF/NOTICE b/mosgi/console.ifc/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.console.ifc/src/main/resources/META-INF/NOTICE
rename to mosgi/console.ifc/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.doc/Readme.txt b/mosgi/doc/Readme.txt
similarity index 100%
rename from mosgi/mosgi.doc/Readme.txt
rename to mosgi/doc/Readme.txt
diff --git a/mosgi/mosgi.doc/config.properties.core b/mosgi/doc/config.properties.core
similarity index 86%
rename from mosgi/mosgi.doc/config.properties.core
rename to mosgi/doc/config.properties.core
index 3d64be3..8a03f30 100644
--- a/mosgi/mosgi.doc/config.properties.core
+++ b/mosgi/doc/config.properties.core
@@ -16,14 +16,14 @@
  file:bundle/org.apache.felix.shell.tui-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.bundlerepository-0.9.0-incubator-SNAPSHOT.jar \
  http://ares.insa-lyon.fr/~sfrenot/devel/mosgi/insajmx/trunk/lib/log.jar \
- file:../mosgi/mosgi.jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-incubator-SNAPSHOT.jar \
  http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.linuxprobes/target/org.apache.felix.mosgi.managedelements.linuxprobes-0.8.0-SNAPSHOT.jar
 
 #file:../mosgi/mosgi.managedelements.memoryprobe/target/org.apache.felix.mosgi.managedelements.memoryprobe-0.9.0-incubator-SNAPSHOT.jar \
@@ -32,9 +32,9 @@
 # file:../mosgi.jmx.httpconnector/target/org.apache.felix.mosgi.jmx.httpconnector-0.8.0-SNAPSHOT.jar
 
 
-mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi/mosgi.managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-incubator-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi/mosgi.managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-incubator-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi/mosgi.managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi/managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi/managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi/managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-incubator-SNAPSHOT.jar
 mosgi.jmxconsole.tab.url.memoryprobetab=http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.memoryprobe.tab/target/org.apache.felix.mosgi.managedelements.memoryprobe.tab-0.8.0-SNAPSHOT.jar
 mosgi.jmxconsole.tab.url.linuxprobestab=http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.linuxprobes.tab/target/org.apache.felix.mosgi.managedelements.linuxprobes.tab-0.8.0-SNAPSHOT.jar
 
diff --git a/mosgi/mosgi.doc/config.properties.jmxconsole b/mosgi/doc/config.properties.jmxconsole
similarity index 96%
rename from mosgi/mosgi.doc/config.properties.jmxconsole
rename to mosgi/doc/config.properties.jmxconsole
index d24cbff..f3a7cfc 100644
--- a/mosgi/mosgi.doc/config.properties.jmxconsole
+++ b/mosgi/doc/config.properties.jmxconsole
@@ -15,9 +15,9 @@
  file:bundle/org.apache.felix.shell-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.shell.tui-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.bundlerepository-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi/mosgi.console.component/target/org.apache.felix.mosgi.console.component-0.9.0-incubator-SNAPSHOT.jar
+ file:../mosgi/console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/console.component/target/org.apache.felix.mosgi.console.component-0.9.0-incubator-SNAPSHOT.jar
 
 #possible values : both treeonly tableonly none (default=both)
 mosgi.jmxconsole.remotelogger.componentfilter=both
diff --git a/mosgi/doc/core.sh b/mosgi/doc/core.sh
new file mode 100755
index 0000000..dcb9660
--- /dev/null
+++ b/mosgi/doc/core.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+
+echo "cd into felix directory"
+cd ../../main
+
+echo "lauching felix with core gateway properties"
+java -Dfelix.config.properties=file:../mosgi/doc/config.properties.core -jar bin/felix.jar
+
diff --git a/mosgi/doc/jmxconsole.sh b/mosgi/doc/jmxconsole.sh
new file mode 100755
index 0000000..07cfcd5
--- /dev/null
+++ b/mosgi/doc/jmxconsole.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+echo "cd into felix directory"
+cd ../../main
+
+echo "lauching felix with jmxconsole properties"
+java -Dfelix.config.properties=file:../mosgi/doc/config.properties.jmxconsole -jar bin/felix.jar
diff --git a/mosgi/mosgi.jmx.agent/pom.xml b/mosgi/jmx.agent/pom.xml
similarity index 100%
rename from mosgi/mosgi.jmx.agent/pom.xml
rename to mosgi/jmx.agent/pom.xml
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/Constants.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/Constants.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/Constants.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/Constants.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/AbstractDynamicMBean.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/AbstractDynamicMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/AbstractDynamicMBean.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/AbstractDynamicMBean.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/ImplementationException.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/ImplementationException.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/ImplementationException.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/ImplementationException.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescription.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescription.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescription.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescription.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescriptionAdapter.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescriptionAdapter.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescriptionAdapter.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MBeanDescriptionAdapter.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MX4JSystemKeys.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MX4JSystemKeys.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MX4JSystemKeys.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/MX4JSystemKeys.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/ClassLoaderObjectInputStream.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/ClassLoaderObjectInputStream.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/ClassLoaderObjectInputStream.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/ClassLoaderObjectInputStream.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParseException.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParseException.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParseException.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParseException.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParser.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParser.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParser.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetParser.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetTag.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetTag.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetTag.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/loading/MLetTag.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Log.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Log.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Log.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Log.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Logger.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Logger.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Logger.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/log/Logger.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultClassLoaderRepository.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultClassLoaderRepository.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultClassLoaderRepository.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultClassLoaderRepository.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultMBeanRepository.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultMBeanRepository.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultMBeanRepository.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/DefaultMBeanRepository.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanIntrospector.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanIntrospector.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanIntrospector.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanIntrospector.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanInvoker.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanInvoker.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanInvoker.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanInvoker.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanMetaData.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanMetaData.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanMetaData.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanMetaData.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanRepository.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanRepository.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanRepository.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MBeanRepository.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServer.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServer.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServer.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServer.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerBuilder.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerBuilder.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerBuilder.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerBuilder.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerDelegate.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerDelegate.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerDelegate.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/MX4JMBeanServerDelegate.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ModifiableClassLoaderRepository.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ModifiableClassLoaderRepository.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ModifiableClassLoaderRepository.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ModifiableClassLoaderRepository.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ReflectedMBeanInvoker.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ReflectedMBeanInvoker.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ReflectedMBeanInvoker.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/ReflectedMBeanInvoker.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/ContextClassLoaderMBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/ContextClassLoaderMBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/ContextClassLoaderMBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/ContextClassLoaderMBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptorMBean.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptorMBean.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/DefaultMBeanServerInterceptorMBean.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptorMBean.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptorMBean.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/InvokerMBeanServerInterceptorMBean.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfigurator.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfigurator.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfigurator.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfigurator.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfiguratorMBean.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfiguratorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfiguratorMBean.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/MBeanServerInterceptorConfiguratorMBean.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/NotificationListenerMBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/NotificationListenerMBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/NotificationListenerMBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/NotificationListenerMBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptor.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptor.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptor.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptorMBean.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptorMBean.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/server/interceptor/SecurityMBeanServerInterceptorMBean.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Base64Codec.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Base64Codec.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Base64Codec.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Base64Codec.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/MethodTernaryTree.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/MethodTernaryTree.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/MethodTernaryTree.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/MethodTernaryTree.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Utils.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Utils.java
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Utils.java
rename to mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/mx4j/util/Utils.java
diff --git a/mosgi/mosgi.jmx.agent/src/main/resources/META-INF/LICENCE-MX4J b/mosgi/jmx.agent/src/main/resources/META-INF/LICENCE-MX4J
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/resources/META-INF/LICENCE-MX4J
rename to mosgi/jmx.agent/src/main/resources/META-INF/LICENCE-MX4J
diff --git a/mosgi/mosgi.jmx.agent/src/main/resources/META-INF/LICENSE b/mosgi/jmx.agent/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/resources/META-INF/LICENSE
rename to mosgi/jmx.agent/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.jmx.agent/src/main/resources/META-INF/NOTICE b/mosgi/jmx.agent/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.jmx.agent/src/main/resources/META-INF/NOTICE
rename to mosgi/jmx.agent/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.jmx.httpconnector/pom.xml b/mosgi/jmx.httpconnector/pom.xml
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/pom.xml
rename to mosgi/jmx.httpconnector/pom.xml
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/HttpConnectorActivator.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/HttpConnectorActivator.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/HttpConnectorActivator.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/HttpConnectorActivator.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/AdaptorServerSocketFactory.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/AdaptorServerSocketFactory.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/AdaptorServerSocketFactory.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/AdaptorServerSocketFactory.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/PlainAdaptorServerSocketFactory.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/PlainAdaptorServerSocketFactory.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/PlainAdaptorServerSocketFactory.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/PlainAdaptorServerSocketFactory.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CommandProcessorUtil.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CommandProcessorUtil.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CommandProcessorUtil.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CommandProcessorUtil.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ConstructorsCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ConstructorsCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ConstructorsCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ConstructorsCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CreateMBeanCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CreateMBeanCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CreateMBeanCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/CreateMBeanCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DefaultProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DefaultProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DefaultProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DefaultProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DeleteMBeanCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DeleteMBeanCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DeleteMBeanCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/DeleteMBeanCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/EmptyCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/EmptyCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/EmptyCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/EmptyCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/GetAttributeCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/GetAttributeCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/GetAttributeCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/GetAttributeCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptorMBean.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptorMBean.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpAdaptorMBean.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessorAdaptor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessorAdaptor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessorAdaptor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpCommandProcessorAdaptor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpConstants.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpConstants.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpConstants.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpConstants.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpException.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpException.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpException.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpException.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpInputStream.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpInputStream.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpInputStream.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpInputStream.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpOutputStream.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpOutputStream.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpOutputStream.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpOutputStream.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpUtil.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpUtil.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpUtil.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/HttpUtil.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/InvokeOperationCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/InvokeOperationCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/InvokeOperationCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/InvokeOperationCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/MBeanCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/MBeanCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/MBeanCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/MBeanCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ProcessorMBean.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ProcessorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ProcessorMBean.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ProcessorMBean.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerByDomainCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerByDomainCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerByDomainCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerByDomainCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/ServerCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributeCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributeCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributeCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributeCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributesCommandProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributesCommandProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributesCommandProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/SetAttributesCommandProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessor.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessor.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessor.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessor.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessorMBean.java b/mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessorMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessorMBean.java
rename to mosgi/jmx.httpconnector/src/main/java/org/apache/felix/mosgi/jmx/httpconnector/mx4j/tools/adaptor/http/XSLTProcessorMBean.java
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/LICENCE-MX4J b/mosgi/jmx.httpconnector/src/main/resources/META-INF/LICENCE-MX4J
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/LICENCE-MX4J
rename to mosgi/jmx.httpconnector/src/main/resources/META-INF/LICENCE-MX4J
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/LICENSE b/mosgi/jmx.httpconnector/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/LICENSE
rename to mosgi/jmx.httpconnector/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/NOTICE b/mosgi/jmx.httpconnector/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/META-INF/NOTICE
rename to mosgi/jmx.httpconnector/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/about.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/about.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/about.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/about.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/common.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/common.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/common.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/common.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/constructors.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/constructors.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/constructors.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/constructors.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/create.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/create.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/create.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/create.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/delete.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/delete.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/delete.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/delete.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/emptymbean.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/emptymbean.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/emptymbean.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/emptymbean.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/error.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/error.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/error.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/error.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/favicon.ico b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/favicon.ico
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/favicon.ico
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/favicon.ico
Binary files differ
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/identity.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/identity.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/identity.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/identity.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/invoke.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/invoke.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/invoke.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/invoke.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/logo.gif b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/logo.gif
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/logo.gif
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/logo.gif
Binary files differ
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean_attributes.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean_attributes.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean_attributes.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mbean_attributes.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mlet.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mlet.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mlet.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/mlet.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor_create.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor_create.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor_create.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/monitor_create.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/relation.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/relation.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/relation.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/relation.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/server.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/server.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/server.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/server.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/serverbydomain.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/serverbydomain.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/serverbydomain.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/serverbydomain.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattribute.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattribute.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattribute.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattribute.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattributes.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattributes.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattributes.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/setattributes.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/strings_en.xml b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/strings_en.xml
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/strings_en.xml
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/strings_en.xml
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/stylesheet.css b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/stylesheet.css
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/stylesheet.css
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/stylesheet.css
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer_create.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer_create.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer_create.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/timer_create.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewarray.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewarray.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewarray.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewarray.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewcollection.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewcollection.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewcollection.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewcollection.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewmap.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewmap.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewmap.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/viewmap.xsl
diff --git a/mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/xalan-ext.xsl b/mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/xalan-ext.xsl
similarity index 100%
rename from mosgi/mosgi.jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/xalan-ext.xsl
rename to mosgi/jmx.httpconnector/src/main/resources/mx4j/tools/adaptor/http/xsl/xalan-ext.xsl
diff --git a/mosgi/mosgi.jmx.registry/pom.xml b/mosgi/jmx.registry/pom.xml
similarity index 100%
rename from mosgi/mosgi.jmx.registry/pom.xml
rename to mosgi/jmx.registry/pom.xml
diff --git a/mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingService.java b/mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingService.java
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingService.java
rename to mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingService.java
diff --git a/mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceIfc.java b/mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceIfc.java
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceIfc.java
rename to mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceIfc.java
diff --git a/mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceMBean.java b/mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceMBean.java
rename to mosgi/jmx.registry/src/main/java/org/apache/felix/mosgi/jmx/registry/mx4j/tools/naming/NamingServiceMBean.java
diff --git a/mosgi/mosgi.jmx.registry/src/main/resources/META-INF/LICENCE-MX4J b/mosgi/jmx.registry/src/main/resources/META-INF/LICENCE-MX4J
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/resources/META-INF/LICENCE-MX4J
rename to mosgi/jmx.registry/src/main/resources/META-INF/LICENCE-MX4J
diff --git a/mosgi/mosgi.jmx.registry/src/main/resources/META-INF/LICENSE b/mosgi/jmx.registry/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/resources/META-INF/LICENSE
rename to mosgi/jmx.registry/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.jmx.registry/src/main/resources/META-INF/NOTICE b/mosgi/jmx.registry/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.jmx.registry/src/main/resources/META-INF/NOTICE
rename to mosgi/jmx.registry/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.jmx.remotelogger/pom.xml b/mosgi/jmx.remotelogger/pom.xml
similarity index 100%
rename from mosgi/mosgi.jmx.remotelogger/pom.xml
rename to mosgi/jmx.remotelogger/pom.xml
diff --git a/mosgi/mosgi.jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/Logger.java b/mosgi/jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/Logger.java
similarity index 100%
rename from mosgi/mosgi.jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/Logger.java
rename to mosgi/jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/Logger.java
diff --git a/mosgi/mosgi.jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/LoggerMBean.java b/mosgi/jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/LoggerMBean.java
similarity index 100%
rename from mosgi/mosgi.jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/LoggerMBean.java
rename to mosgi/jmx.remotelogger/src/main/java/org/apache/felix/mosgi/jmx/remotelogger/LoggerMBean.java
diff --git a/mosgi/mosgi.jmx.remotelogger/src/main/resources/META-INF/LICENSE b/mosgi/jmx.remotelogger/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.jmx.remotelogger/src/main/resources/META-INF/LICENSE
rename to mosgi/jmx.remotelogger/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.jmx.remotelogger/src/main/resources/META-INF/NOTICE b/mosgi/jmx.remotelogger/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.jmx.remotelogger/src/main/resources/META-INF/NOTICE
rename to mosgi/jmx.remotelogger/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.jmx.rmiconnector/pom.xml b/mosgi/jmx.rmiconnector/pom.xml
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/pom.xml
rename to mosgi/jmx.rmiconnector/pom.xml
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/RmiConnectorActivator.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/RmiConnectorActivator.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/RmiConnectorActivator.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/RmiConnectorActivator.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/AbstractHeartBeat.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/AbstractHeartBeat.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/AbstractHeartBeat.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/AbstractHeartBeat.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ClientProxy.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ClientProxy.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ClientProxy.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ClientProxy.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionNotificationEmitter.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionNotificationEmitter.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionNotificationEmitter.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionNotificationEmitter.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionResolver.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionResolver.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionResolver.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ConnectionResolver.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/DefaultRemoteNotificationServerHandler.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/DefaultRemoteNotificationServerHandler.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/DefaultRemoteNotificationServerHandler.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/DefaultRemoteNotificationServerHandler.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/HeartBeat.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/HeartBeat.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/HeartBeat.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/HeartBeat.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteConstants.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteConstants.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteConstants.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteConstants.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteUtils.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteUtils.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteUtils.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/MX4JRemoteUtils.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/NotificationTuple.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/NotificationTuple.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/NotificationTuple.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/NotificationTuple.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderFactory.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderFactory.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderFactory.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderFactory.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderHelper.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderHelper.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderHelper.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/ProviderHelper.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationClientHandler.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationClientHandler.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationClientHandler.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationClientHandler.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationServerHandler.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationServerHandler.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationServerHandler.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/RemoteNotificationServerHandler.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIClientProvider.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIClientProvider.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIClientProvider.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIClientProvider.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIServerProvider.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIServerProvider.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIServerProvider.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/RMIServerProvider.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/rmi/ServerProvider.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/rmi/ServerProvider.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/rmi/ServerProvider.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/provider/rmi/ServerProvider.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/resolver/rmi/RMIResolver.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/resolver/rmi/RMIResolver.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/resolver/rmi/RMIResolver.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/resolver/rmi/RMIResolver.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientExceptionCatcher.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientExceptionCatcher.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientExceptionCatcher.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientExceptionCatcher.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientInvoker.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientInvoker.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientInvoker.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientInvoker.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientUnmarshaller.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientUnmarshaller.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientUnmarshaller.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/ClientUnmarshaller.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionInvoker.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionInvoker.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionInvoker.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionInvoker.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionProxy.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionProxy.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionProxy.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionProxy.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionSubjectInvoker.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionSubjectInvoker.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionSubjectInvoker.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIConnectionSubjectInvoker.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIHeartBeat.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIHeartBeat.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIHeartBeat.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIHeartBeat.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIMarshaller.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIMarshaller.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIMarshaller.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIMarshaller.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIRemoteNotificationServerHandler.java b/mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIRemoteNotificationServerHandler.java
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIRemoteNotificationServerHandler.java
rename to mosgi/jmx.rmiconnector/src/main/java/org/apache/felix/mosgi/jmx/rmiconnector/mx4j/remote/rmi/RMIRemoteNotificationServerHandler.java
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/LICENCE-MX4J b/mosgi/jmx.rmiconnector/src/main/resources/META-INF/LICENCE-MX4J
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/LICENCE-MX4J
rename to mosgi/jmx.rmiconnector/src/main/resources/META-INF/LICENCE-MX4J
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/LICENSE b/mosgi/jmx.rmiconnector/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/LICENSE
rename to mosgi/jmx.rmiconnector/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/NOTICE b/mosgi/jmx.rmiconnector/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.jmx.rmiconnector/src/main/resources/META-INF/NOTICE
rename to mosgi/jmx.rmiconnector/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml b/mosgi/managedelements.bundlesprobes.tab/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml
rename to mosgi/managedelements.bundlesprobes.tab/pom.xml
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesModelTabUI.java b/mosgi/managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesModelTabUI.java
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesModelTabUI.java
rename to mosgi/managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesModelTabUI.java
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesTabUI.java b/mosgi/managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesTabUI.java
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesTabUI.java
rename to mosgi/managedelements.bundlesprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/tab/BundlesProbesTabUI.java
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.bundlesprobes.tab/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.bundlesprobes.tab/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.bundlesprobes.tab/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes.tab/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.bundlesprobes.tab/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/pom.xml b/mosgi/managedelements.bundlesprobes/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes/pom.xml
rename to mosgi/managedelements.bundlesprobes/pom.xml
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbes.java b/mosgi/managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbes.java
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbes.java
rename to mosgi/managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbes.java
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbesMBean.java b/mosgi/managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbesMBean.java
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbesMBean.java
rename to mosgi/managedelements.bundlesprobes/src/main/java/org/apache/felix/mosgi/managedelements/bundlesprobes/BundlesProbesMBean.java
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.bundlesprobes/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.bundlesprobes/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.bundlesprobes/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.bundlesprobes/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.bundlesprobes/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.memoryprobe/pom.xml b/mosgi/managedelements.memoryprobe/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.memoryprobe/pom.xml
rename to mosgi/managedelements.memoryprobe/pom.xml
diff --git a/mosgi/mosgi.managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbe.java b/mosgi/managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbe.java
similarity index 100%
rename from mosgi/mosgi.managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbe.java
rename to mosgi/managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbe.java
diff --git a/mosgi/mosgi.managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbeMBean.java b/mosgi/managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbeMBean.java
similarity index 100%
rename from mosgi/mosgi.managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbeMBean.java
rename to mosgi/managedelements.memoryprobe/src/main/java/org/apache/felix/mosgi/managedelements/memoryprobe/MemoryProbeMBean.java
diff --git a/mosgi/mosgi.managedelements.memoryprobe/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.memoryprobe/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.memoryprobe/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.memoryprobe/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.memoryprobe/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.memoryprobe/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.memoryprobe/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.memoryprobe/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/pom.xml b/mosgi/managedelements.obrprobe.tab/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe.tab/pom.xml
rename to mosgi/managedelements.obrprobe.tab/pom.xml
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java b/mosgi/managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
rename to mosgi/managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.obrprobe.tab/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe.tab/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.obrprobe.tab/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.obrprobe.tab/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe.tab/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.obrprobe.tab/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.obrprobe/pom.xml b/mosgi/managedelements.obrprobe/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe/pom.xml
rename to mosgi/managedelements.obrprobe/pom.xml
diff --git a/mosgi/mosgi.managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbe.java b/mosgi/managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbe.java
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbe.java
rename to mosgi/managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbe.java
diff --git a/mosgi/mosgi.managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbeMBean.java b/mosgi/managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbeMBean.java
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbeMBean.java
rename to mosgi/managedelements.obrprobe/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/ObrProbeMBean.java
diff --git a/mosgi/mosgi.managedelements.obrprobe/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.obrprobe/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.obrprobe/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.obrprobe/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.obrprobe/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.obrprobe/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.obrprobe/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml b/mosgi/managedelements.osgiprobes.tab/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml
rename to mosgi/managedelements.osgiprobes.tab/pom.xml
diff --git a/mosgi/mosgi.managedelements.osgiprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/tab/OsgiProbesTabUI.java b/mosgi/managedelements.osgiprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/tab/OsgiProbesTabUI.java
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/tab/OsgiProbesTabUI.java
rename to mosgi/managedelements.osgiprobes.tab/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/tab/OsgiProbesTabUI.java
diff --git a/mosgi/mosgi.managedelements.osgiprobes.tab/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.osgiprobes.tab/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes.tab/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.osgiprobes.tab/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.osgiprobes.tab/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.osgiprobes.tab/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes.tab/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.osgiprobes.tab/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.managedelements.osgiprobes/pom.xml b/mosgi/managedelements.osgiprobes/pom.xml
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes/pom.xml
rename to mosgi/managedelements.osgiprobes/pom.xml
diff --git a/mosgi/mosgi.managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbes.java b/mosgi/managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbes.java
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbes.java
rename to mosgi/managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbes.java
diff --git a/mosgi/mosgi.managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbesMBean.java b/mosgi/managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbesMBean.java
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbesMBean.java
rename to mosgi/managedelements.osgiprobes/src/main/java/org/apache/felix/mosgi/managedelements/osgiprobes/OsgiProbesMBean.java
diff --git a/mosgi/mosgi.managedelements.osgiprobes/src/main/resources/META-INF/LICENSE b/mosgi/managedelements.osgiprobes/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes/src/main/resources/META-INF/LICENSE
rename to mosgi/managedelements.osgiprobes/src/main/resources/META-INF/LICENSE
diff --git a/mosgi/mosgi.managedelements.osgiprobes/src/main/resources/META-INF/NOTICE b/mosgi/managedelements.osgiprobes/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from mosgi/mosgi.managedelements.osgiprobes/src/main/resources/META-INF/NOTICE
rename to mosgi/managedelements.osgiprobes/src/main/resources/META-INF/NOTICE
diff --git a/mosgi/mosgi.doc/core.sh b/mosgi/mosgi.doc/core.sh
deleted file mode 100755
index 111bc0b..0000000
--- a/mosgi/mosgi.doc/core.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-
-echo "cd into felix directory"
-cd ../../main
-
-echo "lauching felix with core gateway properties"
-java -Dfelix.config.properties=file:../mosgi/mosgi.doc/config.properties.core -jar bin/felix.jar
-
diff --git a/mosgi/mosgi.doc/jmxconsole.sh b/mosgi/mosgi.doc/jmxconsole.sh
deleted file mode 100755
index 1ed93de..0000000
--- a/mosgi/mosgi.doc/jmxconsole.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "cd into felix directory"
-cd ../../main
-
-echo "lauching felix with jmxconsole properties"
-java -Dfelix.config.properties=file:../mosgi/mosgi.doc/config.properties.jmxconsole -jar bin/felix.jar
diff --git a/mosgi/pom.xml b/mosgi/pom.xml
index 735e01a..dd62b40 100644
--- a/mosgi/pom.xml
+++ b/mosgi/pom.xml
@@ -12,21 +12,21 @@
   <version>0.0.1</version>
   <packaging>pom</packaging>
   <modules>
-    <module>mosgi.console.ifc</module>
-    <module>mosgi.console.component</module>
-    <module>mosgi.console.gui</module>
-    <module>mosgi.jmx.agent</module>
-    <module>mosgi.jmx.httpconnector</module>
-    <module>mosgi.jmx.registry</module>
-    <module>mosgi.jmx.remotelogger</module>
-    <module>mosgi.jmx.rmiconnector</module>
-    <module>mosgi.managedelements.osgiprobes</module>
-    <module>mosgi.managedelements.osgiprobes.tab</module>
-    <module>mosgi.managedelements.bundlesprobes</module>
-    <module>mosgi.managedelements.bundlesprobes.tab</module>
-    <module>mosgi.managedelements.obrprobe</module>
-    <module>mosgi.managedelements.obrprobe.tab</module>
-    <module>mosgi.managedelements.memoryprobe</module>
+    <module>console.ifc</module>
+    <module>console.component</module>
+    <module>console.gui</module>
+    <module>jmx.agent</module>
+    <module>jmx.httpconnector</module>
+    <module>jmx.registry</module>
+    <module>jmx.remotelogger</module>
+    <module>jmx.rmiconnector</module>
+    <module>managedelements.osgiprobes</module>
+    <module>managedelements.osgiprobes.tab</module>
+    <module>managedelements.bundlesprobes</module>
+    <module>managedelements.bundlesprobes.tab</module>
+    <module>managedelements.obrprobe</module>
+    <module>managedelements.obrprobe.tab</module>
+    <module>managedelements.memoryprobe</module>
   </modules>
 </project>