diff --git a/upnp.doc/config.properties.core b/upnp.doc/config.properties.core
index 28a5b57..a977159 100644
--- a/upnp.doc/config.properties.core
+++ b/upnp.doc/config.properties.core
@@ -19,32 +19,32 @@
  file:../log/target/org.apache.felix.log-0.8.0-SNAPSHOT.jar \
  file:../javax.servlet/target/javax.servlet-0.8.0-SNAPSHOT.jar \
  file:../org.osgi.compendium/target/org.osgi.compendium-0.8.0-SNAPSHOT.jar \
- file:../mosgi.jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-SNAPSHOT.jar \
- file:../mosgi.jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-SNAPSHOT.jar \
- file:../mosgi.jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-SNAPSHOT.jar \
- file:../mosgi.jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-SNAPSHOT.jar \
- file:../mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-SNAPSHOT.jar \
- file:../mosgi.managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-SNAPSHOT.jar \
- file:../mosgi.managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-SNAPSHOT.jar \
- file:../mosgi.managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-SNAPSHOT.jar \
- file:../upnp.extra/target/org.apache.felix.upnp.extra-0.1.0-SNAPSHOT.jar \
- file:../upnp.basedriver/target/org.apache.felix.upnp.basedriver-0.1.0-SNAPSHOT.jar \
- file:../upnp.tester/target/org.apache.felix.upnp.tester-0.1.0-SNAPSHOT.jar \
- file:../upnp.sample.tv/target/org.apache.felix.upnp.sample.tv-0.1.0-SNAPSHOT.jar \
- file:../upnp.sample.clock/target/org.apache.felix.upnp.sample.clock-0.1.0-SNAPSHOT.jar \
+ file:../mosgi/jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-SNAPSHOT.jar \
+ file:../upnp/upnp.extra/target/org.apache.felix.upnp.extra-0.1.0-SNAPSHOT.jar \
+ file:../upnp/upnp.basedriver/target/org.apache.felix.upnp.basedriver-0.1.0-SNAPSHOT.jar \
+ file:../upnp/upnp.tester/target/org.apache.felix.upnp.tester-0.1.0-SNAPSHOT.jar \
+ file:../upnp/samples/upnp.sample.tv/target/org.apache.felix.upnp.sample.tv-0.1.0-SNAPSHOT.jar \
+ file:../upnp/samples/upnp.sample.clock/target/org.apache.felix.upnp.sample.clock-0.1.0-SNAPSHOT.jar \
  file:../../sandbox/furfari/upnp.jmxbridge/target/org.apache.felix.upnp.jmxbridge-0.2.0-SNAPSHOT.jar
 
-# file:../mosgi.managedelements.memoryprobe/target/org.apache.felix.mosgi.managedelements.memoryprobe-0.9.0-SNAPSHOT.jar \
+# file:../mosgi/managedelements.memoryprobe/target/org.apache.felix.mosgi.managedelements.memoryprobe-0.9.0-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
 
 # if we need the http jmx connector
-# file:../mosgi.jmx.httpconnector/target/org.apache.felix.mosgi.jmx.httpconnector-0.8.0-SNAPSHOT.jar
+# file:../mosgi/jmx.httpconnector/target/org.apache.felix.mosgi.jmx.httpconnector-0.8.0-SNAPSHOT.jar
 
 
-mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi.managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi.managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi.managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi/managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi/managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi/managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-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
 mosgi.jmxconsole.tab.url.upnptab= file:../../sandbox/furfari/upnp.jmxbridge.tab/target/org.apache.felix.upnp.jmxbridge.tab-0.2.0-SNAPSHOT.jar
diff --git a/upnp.doc/config.properties.jmxconsole b/upnp.doc/config.properties.jmxconsole
index 43cd367..73dae90 100644
--- a/upnp.doc/config.properties.jmxconsole
+++ b/upnp.doc/config.properties.jmxconsole
@@ -15,9 +15,9 @@
  file:bundle/org.apache.felix.shell-0.8.0-SNAPSHOT.jar \
  file:bundle/org.apache.felix.shell.tui-0.8.0-SNAPSHOT.jar \
  file:bundle/org.apache.felix.bundlerepository-0.8.0-SNAPSHOT.jar \
- file:../mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-SNAPSHOT.jar \
- file:../mosgi.console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-SNAPSHOT.jar \
- file:../mosgi.console.component/target/org.apache.felix.mosgi.console.component-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-SNAPSHOT.jar \
+ file:../mosgi/console.component/target/org.apache.felix.mosgi.console.component-0.9.0-SNAPSHOT.jar \
  file:../javax.servlet/target/javax.servlet-0.8.0-SNAPSHOT.jar \
  file:../org.osgi.compendium/target/org.osgi.compendium-0.8.0-SNAPSHOT.jar \
  file:../../sandbox/furfari/upnp.jmxbridge.tab/target/org.apache.felix.upnp.jmxbridge.tab-0.2.0-SNAPSHOT.jar
diff --git a/upnp.doc/core.sh b/upnp.doc/core.sh
index 8d46428..dcb9660 100644
--- a/upnp.doc/core.sh
+++ b/upnp.doc/core.sh
@@ -2,8 +2,8 @@
 
 
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with core gateway properties"
-java -Dfelix.config.properties=file:../mosgi.doc/config.properties.core -jar bin/felix.jar
+java -Dfelix.config.properties=file:../mosgi/doc/config.properties.core -jar bin/felix.jar
 
diff --git a/upnp.doc/core.sh.bat b/upnp.doc/core.sh.bat
index c7c5a62..59f26f6 100644
--- a/upnp.doc/core.sh.bat
+++ b/upnp.doc/core.sh.bat
@@ -2,8 +2,8 @@
 
 
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with core gateway properties"
-java -Dfelix.config.properties=file:../upnp.doc/config.properties.core -jar bin/felix.jar
+java -Dfelix.config.properties=file:../upnp/upnp.doc/config.properties.core -jar bin/felix.jar
 
diff --git a/upnp.doc/jmxconsole.sh b/upnp.doc/jmxconsole.sh
index b27dc23..07cfcd5 100644
--- a/upnp.doc/jmxconsole.sh
+++ b/upnp.doc/jmxconsole.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with jmxconsole properties"
-java -Dfelix.config.properties=file:../mosgi.doc/config.properties.jmxconsole -jar bin/felix.jar
+java -Dfelix.config.properties=file:../mosgi/doc/config.properties.jmxconsole -jar bin/felix.jar
diff --git a/upnp.doc/jmxconsole.sh.bat b/upnp.doc/jmxconsole.sh.bat
index 6c1dc51..8f8e2b7 100644
--- a/upnp.doc/jmxconsole.sh.bat
+++ b/upnp.doc/jmxconsole.sh.bat
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with jmxconsole properties"
 java -Dfelix.config.properties=file:../upnp.doc/config.properties.jmxconsole -jar bin/felix.jar