diff --git a/build-nano/bin/dmk.bat b/build-nano/bin/dmk.bat
index dac944e..9c4da07 100644
--- a/build-nano/bin/dmk.bat
+++ b/build-nano/bin/dmk.bat
@@ -175,8 +175,8 @@
       set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:+HeapDumpOnOutOfMemoryError 
       set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:ErrorFile="%KERNEL_HOME%\serviceability\error.log" 
       set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:HeapDumpPath="%KERNEL_HOME%\serviceability\heap_dump.hprof"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.security.auth.login.config="%CONFIG_DIR%\org.eclipse.virgo.kernel.authentication.config" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" 
+      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.security.auth.login.config="%CONFIG_DIR%\org.eclipse.virgo.nano.authentication.config" 
+      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.nano.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" 
       set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" 
       set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" 
 	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java6-server.profile"
@@ -266,8 +266,8 @@
     set SHUTDOWN_PARMS= %JAVA_OPTS% %JMX_OPTS%
     set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -classpath "%CLASSPATH%"
     set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% org.eclipse.virgo.kernel.shutdown.ShutdownClient
+    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.nano.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
+    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% org.eclipse.virgo.nano.shutdown.ShutdownClient
     set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% %OTHER_ARGS%
 
     rem Run Java program
diff --git a/build-nano/bin/dmk.sh b/build-nano/bin/dmk.sh
index 2dcc365..42e6774 100755
--- a/build-nano/bin/dmk.sh
+++ b/build-nano/bin/dmk.sh
@@ -144,7 +144,7 @@
 	fi
 
     ACCESS_PROPERTIES=$CONFIG_DIR/org.eclipse.virgo.kernel.jmxremote.access.properties
-    AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config
+    AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.nano.authentication.config
     AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties
     CONFIG_AREA=$KERNEL_HOME/work
     JAVA_PROFILE=$KERNEL_HOME/configuration/java6-server.profile
@@ -189,7 +189,7 @@
 			-XX:ErrorFile=$KERNEL_HOME/serviceability/error.log \
 			-XX:HeapDumpPath=$KERNEL_HOME/serviceability/heap_dump.hprof \
 			-Djava.security.auth.login.config=$AUTH_LOGIN \
-			-Dorg.eclipse.virgo.kernel.authentication.file=$AUTH_FILE \
+			-Dorg.eclipse.virgo.nano.authentication.file=$AUTH_FILE \
 			-Djava.io.tmpdir=$TMP_DIR \
 			-Dorg.eclipse.virgo.kernel.home=$KERNEL_HOME \
 			-Dorg.eclipse.virgo.kernel.config=$CONFIG_DIR \
@@ -269,8 +269,8 @@
 	exec $JAVA_HOME/bin/java $JAVA_OPTS $JMX_OPTS \
 		-classpath $CLASSPATH \
 		-Dorg.eclipse.virgo.kernel.home=$KERNEL_HOME \
-		-Dorg.eclipse.virgo.kernel.authentication.file=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties \
-		org.eclipse.virgo.kernel.shutdown.ShutdownClient $OTHER_ARGS
+		-Dorg.eclipse.virgo.nano.authentication.file=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties \
+		org.eclipse.virgo.nano.shutdown.ShutdownClient $OTHER_ARGS
 	
 else
 	echo "Unknown command: ${COMMAND}"
diff --git a/build-nano/build.xml b/build-nano/build.xml
index 9ecabbc..35463d5 100644
--- a/build-nano/build.xml
+++ b/build-nano/build.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="build-nano" xmlns:ivy="antlib:org.apache.ivy.ant">
     <path id="unit.test.bundles">
-		<pathelement location="../org.eclipse.virgo.kernel.core"/>
+		<pathelement location="../org.eclipse.virgo.nano.core"/>
         <pathelement location="../org.eclipse.virgo.nano.services.ds"/>
         <pathelement location="../org.eclipse.virgo.nano.services.concurrent"/>
-        <pathelement location="../org.eclipse.virgo.deployer.api"/>
-        <pathelement location="../org.eclipse.virgo.deployer.hot"/>
+        <pathelement location="../org.eclipse.virgo.nano.deployer.api"/>
+        <pathelement location="../org.eclipse.virgo.nano.deployer.hot"/>
         <pathelement location="../org.eclipse.virgo.nano.deployer"/>
         <pathelement location="../org.eclipse.virgo.nano.war.deployer"/>
-        <pathelement location="../org.eclipse.virgo.kernel.authentication"/>
-        <pathelement location="../org.eclipse.virgo.kernel.shutdown"/>
+        <pathelement location="../org.eclipse.virgo.nano.authentication"/>
+        <pathelement location="../org.eclipse.virgo.nano.shutdown"/>
 	</path>
     <path id="bundles">
         <path refid="unit.test.bundles" />
diff --git a/build-nano/configuration/java6-server.profile b/build-nano/configuration/java6-server.profile
index 198ca05..9bdbbd4 100644
--- a/build-nano/configuration/java6-server.profile
+++ b/build-nano/configuration/java6-server.profile
@@ -1,5 +1,4 @@
 org.osgi.framework.system.packages = \
- org.eclipse.virgo.osgi.extensions.equinox.hooks,\
  javax.accessibility,\
  javax.activation,\
  javax.activation;version="1.1.1",\
@@ -148,10 +147,8 @@
  javax.xml.ws.spi;version="2.1.1",\
  javax.xml.ws.wsaddressing;version="2.1.1",\
  javax.xml.xpath,\
- org.eclipse.virgo.osgi.extensions.equinox;version="3.6.0",\
- org.eclipse.virgo.osgi.extensions.equinox.hooks;version="3.6.0",\
- org.eclipse.virgo.osgi.launcher;version="3.6.0",\
- org.eclipse.virgo.osgi.launcher.parser;version="3.6.0",\
+ org.eclipse.virgo.test.launcher;version="3.6.0",\
+ org.eclipse.virgo.test.launcher.parser;version="3.6.0",\
  org.ietf.jgss,\
  org.omg.CORBA,\
  org.omg.CORBA_2_3,\
@@ -195,7 +192,7 @@
  org.xml.sax.ext,\
  org.xml.sax.helpers
 org.osgi.framework.bootdelegation = \
- org.eclipse.virgo.kernel.authentication,\
+ org.eclipse.virgo.nano.authentication,\
  com.sun.*,\
  javax.xml.*,\
  org.apache.xerces.jaxp.*,\
diff --git a/build-nano/configuration/org.eclipse.virgo.kernel.authentication.config b/build-nano/configuration/org.eclipse.virgo.kernel.authentication.config
index 715fd91..44c5d21 100644
--- a/build-nano/configuration/org.eclipse.virgo.kernel.authentication.config
+++ b/build-nano/configuration/org.eclipse.virgo.kernel.authentication.config
@@ -1,6 +1,6 @@
 virgo-kernel {
-	org.eclipse.virgo.kernel.authentication.KernelLoginModule REQUIRED;
+	org.eclipse.virgo.nano.authentication.KernelLoginModule REQUIRED;
 };
 equinox_console {
-	org.eclipse.virgo.kernel.authentication.KernelLoginModule REQUIRED;
+	org.eclipse.virgo.nano.authentication.KernelLoginModule REQUIRED;
 };
diff --git a/build-nano/lib-ivy.xml b/build-nano/lib-ivy.xml
index 6ee6dbb..7157311 100644
--- a/build-nano/lib-ivy.xml
+++ b/build-nano/lib-ivy.xml
@@ -11,8 +11,8 @@
     
 	<dependencies>
 		<!-- lib -->
-		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.shutdown" rev="latest.integration" conf="lib->runtime"/>
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.authentication" rev="latest.integration" conf="lib->runtime"/>
+		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.shutdown" rev="latest.integration" conf="lib->runtime"/>
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.authentication" rev="latest.integration" conf="lib->runtime"/>
 		<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.launcher" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
 		<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.extensions.equinox" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
         <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.launcher" rev="${org.eclipse.equinox.launcher}" conf="lib->runtime"/>
diff --git a/build-nano/nano-ivy.xml b/build-nano/nano-ivy.xml
index 3434264..7e39798 100644
--- a/build-nano/nano-ivy.xml
+++ b/build-nano/nano-ivy.xml
@@ -11,13 +11,13 @@
     
 	<dependencies>
 		<!-- nano runtime -->	
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="latest.integration" conf="nano-runtime->runtime" />
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.core" rev="latest.integration" conf="nano-runtime->runtime" />
         <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer" rev="latest.integration" conf="nano-runtime->runtime" />
         <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.war.deployer" rev="latest.integration" conf="nano-runtime->runtime" />
         <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.services.ds" rev="latest.integration" conf="nano-runtime->runtime" />
         <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.services.concurrent" rev="latest.integration" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.api" rev="latest.integration" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.hot" rev="latest.integration" conf="nano-runtime->runtime" />
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.api" rev="latest.integration" conf="nano-runtime->runtime" />
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.hot" rev="latest.integration" conf="nano-runtime->runtime" />
         
 		<dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="nano-runtime->runtime"/>
         <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="nano-runtime->runtime"/>
diff --git a/build-nano/publish_resources/features/org.eclipse.virgo.core/feature.xml b/build-nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
index ffa1204..5ebcdec 100755
--- a/build-nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
+++ b/build-nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
@@ -23,20 +23,20 @@
    </requires>
 
    <plugin
-         id="org.eclipse.virgo.kernel.core"
+         id="org.eclipse.virgo.nano.core"
          download-size="0"
          install-size="0"
          version="@NANO.VERSION@"
          unpack="false"
          autostart="true"/>
     <plugin
-         id="org.eclipse.virgo.deployer.api"
+         id="org.eclipse.virgo.nano.deployer.api"
          download-size="0"
          install-size="0"
          version="@NANO.VERSION@"
          unpack="false"/>
     <plugin
-         id="org.eclipse.virgo.deployer.hot"
+         id="org.eclipse.virgo.nano.deployer.hot"
          download-size="0"
          install-size="0"
          version="@NANO.VERSION@"
diff --git a/build-nano/publish_resources/products/virgo-nano/virgo-nano.product b/build-nano/publish_resources/products/virgo-nano/virgo-nano.product
index ed30186..852d668 100755
--- a/build-nano/publish_resources/products/virgo-nano/virgo-nano.product
+++ b/build-nano/publish_resources/products/virgo-nano/virgo-nano.product
@@ -84,9 +84,9 @@
 	  <plugin id="org.sat4j.core"/>
 	  <plugin id="org.sat4j.pb"/>
 	  <plugin id="org.eclipse.equinox.region"/>
-	  <plugin id="org.eclipse.virgo.kernel.core"/>
-      <plugin id="org.eclipse.virgo.deployer.api"/>
-      <plugin id="org.eclipse.virgo.deployer.hot"/>
+	  <plugin id="org.eclipse.virgo.nano.core"/>
+      <plugin id="org.eclipse.virgo.nano.deployer.api"/>
+      <plugin id="org.eclipse.virgo.nano.deployer.hot"/>
       <plugin id="org.eclipse.virgo.medic"/>
 	  <plugin id="org.eclipse.virgo.medic.core"/>
       <plugin id="org.eclipse.virgo.medic.logbackcorefragment"/>
@@ -114,7 +114,7 @@
 		<plugin id="org.eclipse.gemini.web.core" autoStart="true" />
 		<plugin id="org.eclipse.gemini.web.extender" autoStart="true" />
 		<plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" />
-		<plugin id="org.eclipse.virgo.kernel.core" autoStart="true" />
+		<plugin id="org.eclipse.virgo.nano.core" autoStart="true" />
 		<plugin id="org.eclipse.virgo.medic" autoStart="true" startLevel="3"/>
 		<plugin id="org.eclipse.virgo.medic.core" autoStart="true" startLevel="3"/>
 		<plugin id="org.eclipse.virgo.util.osgi" autoStart="true"/>
diff --git a/build.versions b/build.versions
index bf286d0..23a9c07 100644
--- a/build.versions
+++ b/build.versions
@@ -1,7 +1,6 @@
 # Compile
 org.aspectj=1.6.12.RELEASE
-org.eclipse.virgo.medic=3.6.0.D-20120717201225
-org.eclipse.virgo.repository=3.6.0.D-20120717202028
+org.eclipse.virgo.medic=3.6.0.BUILD-20120806143138
 org.eclipse.virgo.util=3.6.0.D-20120717181632
 org.eclipse.virgo.build.tools=1.3.0.RELEASE
 org.eclipse.gemini.blueprint=1.0.0.RELEASE
@@ -90,4 +89,4 @@
 #Test
 org.easymock=2.3.0
 org.junit=4.7.0
-org.eclipse.virgo.test=3.6.0.D-20120717182335
+org.eclipse.virgo.test=3.6.0.BUILD-20120806123712
diff --git a/org.eclipse.virgo.nano.authentication/.project b/org.eclipse.virgo.nano.authentication/.project
index c9a6e29..609b962 100644
--- a/org.eclipse.virgo.nano.authentication/.project
+++ b/org.eclipse.virgo.nano.authentication/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.virgo.kernel.authentication</name>
+	<name>org.eclipse.virgo.nano.authentication</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.virgo.nano.authentication/build.xml b/org.eclipse.virgo.nano.authentication/build.xml
index 9bf3d65..99acbf3 100644
--- a/org.eclipse.virgo.nano.authentication/build.xml
+++ b/org.eclipse.virgo.nano.authentication/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.kernel.authentication">
+<project name="org.eclipse.virgo.nano.authentication">
 
 	<property file="${basedir}/../build.properties"/>
 	<property file="${basedir}/../build.versions"/>
diff --git a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/CredentialStore.java
similarity index 95%
rename from org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/CredentialStore.java
index 46e3d59..ec92a89 100644
--- a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java
+++ b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/CredentialStore.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 /**
  * A container encapsulating a collection of credentials
diff --git a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/KernelLoginModule.java
similarity index 97%
rename from org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/KernelLoginModule.java
index dd3bead..2b8fad1 100644
--- a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java
+++ b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/KernelLoginModule.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import java.io.IOException;
 import java.io.FileReader;
@@ -29,7 +29,7 @@
 
 /**
  * An implementation of {@link LoginModule} that reads a properties file for authentication information. The location of
- * the properties file is read from the system property <code>org.eclipse.virgo.kernel.authentication.file</code>. If
+ * the properties file is read from the system property <code>org.eclipse.virgo.nano.authentication.file</code>. If
  * this property is not set, then instantiation of this {@link LoginModule} will fail.
  * <p />
  * 
@@ -40,7 +40,7 @@
  */
 public final class KernelLoginModule implements LoginModule {
 
-    public static final String FILE_LOCATION = "org.eclipse.virgo.kernel.authentication.file";
+    public static final String FILE_LOCATION = "org.eclipse.virgo.nano.authentication.file";
 
     private final CredentialStore credentialStore;
 
diff --git a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactory.java
similarity index 98%
rename from org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactory.java
index 642da7e..941fe0b 100644
--- a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java
+++ b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactory.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/Role.java
similarity index 96%
rename from org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/Role.java
index 9afa088..d808d02 100644
--- a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java
+++ b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/Role.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import java.security.Principal;
 
diff --git a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/User.java
similarity index 98%
rename from org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/User.java
index 3159ce8..6fc69df 100644
--- a/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java
+++ b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/nano/authentication/User.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import javax.security.auth.Subject;
 import java.security.Principal;
diff --git a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/KernelLoginModuleTests.java
similarity index 95%
rename from org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/KernelLoginModuleTests.java
index 73c6037..ca5c60b 100644
--- a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java
+++ b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/KernelLoginModuleTests.java
@@ -9,11 +9,11 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
-import org.eclipse.virgo.kernel.authentication.CredentialStore;
-import org.eclipse.virgo.kernel.authentication.KernelLoginModule;
-import org.eclipse.virgo.kernel.authentication.User;
+import org.eclipse.virgo.nano.authentication.CredentialStore;
+import org.eclipse.virgo.nano.authentication.KernelLoginModule;
+import org.eclipse.virgo.nano.authentication.User;
 import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 
diff --git a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactoryTests.java
similarity index 90%
rename from org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactoryTests.java
index ddae92f..bdb153d 100644
--- a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java
+++ b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/PropertiesFileCredentialStoreFactoryTests.java
@@ -9,14 +9,14 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import static org.junit.Assert.*;
 
-import org.eclipse.virgo.kernel.authentication.CredentialStore;
-import org.eclipse.virgo.kernel.authentication.PropertiesFileCredentialStoreFactory;
-import org.eclipse.virgo.kernel.authentication.Role;
-import org.eclipse.virgo.kernel.authentication.User;
+import org.eclipse.virgo.nano.authentication.CredentialStore;
+import org.eclipse.virgo.nano.authentication.PropertiesFileCredentialStoreFactory;
+import org.eclipse.virgo.nano.authentication.Role;
+import org.eclipse.virgo.nano.authentication.User;
 import org.junit.Test;
 
 import javax.security.auth.Subject;
diff --git a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/RoleTests.java
similarity index 97%
rename from org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/RoleTests.java
index ff54d2b..d8f5b2a 100644
--- a/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java
+++ b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/nano/authentication/RoleTests.java
@@ -8,7 +8,7 @@
  *   Olivier Girardot - initial contribution
  */
 
-package org.eclipse.virgo.kernel.authentication;
+package org.eclipse.virgo.nano.authentication;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.eclipse.virgo.nano.authentication/template.mf b/org.eclipse.virgo.nano.authentication/template.mf
index e2a60f9..cada94e 100644
--- a/org.eclipse.virgo.nano.authentication/template.mf
+++ b/org.eclipse.virgo.nano.authentication/template.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Authentication
-Bundle-SymbolicName: org.eclipse.virgo.kernel.authentication
+Bundle-SymbolicName: org.eclipse.virgo.nano.authentication
 Bundle-Version: ${version}
 Import-Template: javax.security.*;version="0"
 Excluded-Exports: *.internal.*
diff --git a/org.eclipse.virgo.nano.core/.classpath b/org.eclipse.virgo.nano.core/.classpath
index 9dc8ffe..a2da5d5 100644
--- a/org.eclipse.virgo.nano.core/.classpath
+++ b/org.eclipse.virgo.nano.core/.classpath
@@ -25,17 +25,17 @@
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar">
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-3.6.0.D-20120711092322.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-sources-3.1.0.D-20111205151812.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120717201225/org.eclipse.virgo.medic.core-3.6.0.D-20120717201225.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.test-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.core-3.6.0.BUILD-20120806143138.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
diff --git a/org.eclipse.virgo.nano.core/.project b/org.eclipse.virgo.nano.core/.project
index 0488fa8..d34f8c7 100644
--- a/org.eclipse.virgo.nano.core/.project
+++ b/org.eclipse.virgo.nano.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.virgo.kernel.core</name>
+	<name>org.eclipse.virgo.nano.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.virgo.nano.core/build.xml b/org.eclipse.virgo.nano.core/build.xml
index da67db0..f6053ad 100644
--- a/org.eclipse.virgo.nano.core/build.xml
+++ b/org.eclipse.virgo.nano.core/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.kernel.core">
+<project name="org.eclipse.virgo.nano.core">
 
 	<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
 	<property file="${basedir}/../build.properties"/>
diff --git a/org.eclipse.virgo.nano.core/findbugs-exclude.xml b/org.eclipse.virgo.nano.core/findbugs-exclude.xml
index ceeb784..155cb8c 100644
--- a/org.eclipse.virgo.nano.core/findbugs-exclude.xml
+++ b/org.eclipse.virgo.nano.core/findbugs-exclude.xml
@@ -3,7 +3,7 @@
 	<!-- Exclusions -->
 	<Match>
 		<Bug pattern="DM_EXIT"/>
-		<Class name="org.eclipse.virgo.kernel.core.internal.ShutdownManager"/>
+		<Class name="org.eclipse.virgo.nano.core.internal.ShutdownManager"/>
 		<Method name="immediateShutdown"/>
 	</Match>
 </FindBugsFilter>
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfo.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminConfigurationInfo.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfo.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminConfigurationInfo.java
index b5c34ea..a1da319 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfo.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminConfigurationInfo.java
@@ -17,7 +17,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributor.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributor.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminExporter.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminExporter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminExporter.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInfo.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationInfo.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInfo.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationInfo.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationInitialiser.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationInitialiser.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisher.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationPublisher.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisher.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationPublisher.java
index 13a4eeb..74218e1 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisher.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConfigurationPublisher.java
@@ -24,8 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.eclipse.virgo.kernel.core.ConfigurationExporter;
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.core.ConfigurationExporter;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 import org.eclipse.virgo.util.common.IterableEnumeration;
 import org.eclipse.virgo.util.common.StringUtils;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConsoleConfigurationConvertor.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ConsoleConfigurationConvertor.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfiguration.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfiguration.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfiguration.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfiguration.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSource.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/PropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/PropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/PropertiesSource.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/PropertiesSource.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardConfigurationExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardConfigurationExporter.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardConfigurationExporter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardConfigurationExporter.java
index 4960654..9ef362d 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardConfigurationExporter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardConfigurationExporter.java
@@ -2,7 +2,7 @@
 
 import java.util.Dictionary;
 
-import org.eclipse.virgo.kernel.core.ConfigurationExporter;
+import org.eclipse.virgo.nano.core.ConfigurationExporter;
 import org.osgi.service.cm.Configuration;
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardKernelConfig.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardKernelConfig.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardKernelConfig.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardKernelConfig.java
index 65c5ba8..a4ab997 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardKernelConfig.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/StandardKernelConfig.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.virgo.kernel.config.internal;
 
-import org.eclipse.virgo.kernel.core.KernelConfig;
+import org.eclipse.virgo.nano.core.KernelConfig;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/UserConfigurationPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSource.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/UserConfigurationPropertiesSource.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/commandline/CommandLinePropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSource.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/commandline/CommandLinePropertiesSource.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReader.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfEnvironmentPropertiesReader.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReader.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfEnvironmentPropertiesReader.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfParseException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfParseException.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfParseException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfParseException.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSource.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/ovf/OvfPropertiesSource.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/AbortableSignal.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/AbortableSignal.java
index 7519e5b..8b776c6 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/AbortableSignal.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 /**
  * {@link AbortableSignal} is an interface for signalling successful or unsuccessful completion.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingAbortableSignal.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingAbortableSignal.java
index 260ca0e..b0334b3 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingAbortableSignal.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   VMware Inc. - initial contribution
  *******************************************************************************/
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingSignal.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingSignal.java
index 48560a4..e04d1fc 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BlockingSignal.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleStarter.java
similarity index 98%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleStarter.java
index f02d90b..945a69b 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleStarter.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleUtils.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleUtils.java
index ddffb57..b64e063 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/BundleUtils.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import org.eclipse.virgo.util.common.StringUtils;
 import org.osgi.framework.Bundle;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/ConfigurationExporter.java
similarity index 93%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/ConfigurationExporter.java
index 86673d1..af8b9a7 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/ConfigurationExporter.java
@@ -1,4 +1,4 @@
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import java.util.Dictionary;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FailureSignalledException.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FailureSignalledException.java
index d3aa8b3..b83cd3c 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FailureSignalledException.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FatalKernelException.java
similarity index 92%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FatalKernelException.java
index 7c9197a..d15c832 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/FatalKernelException.java
@@ -9,9 +9,9 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
-import org.eclipse.virgo.kernel.serviceability.FatalServerException;
+import org.eclipse.virgo.nano.serviceability.FatalServerException;
 
 //TODO: merge this with FatalServerException
 /**
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelConfig.java
similarity index 95%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelConfig.java
index a69feec..e18dad5 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelConfig.java
@@ -9,7 +9,7 @@
  *   SAP AG - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 /**
  * 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelException.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelException.java
index 880bab8..ffcd153 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/KernelException.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 /**
  * Signals an error detected by the kernel.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Shutdown.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Shutdown.java
index a11a1d7..a6eb8d1 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Shutdown.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import javax.management.MXBean;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Signal.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Signal.java
index ea49b51..faa3174 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/Signal.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 /**
  * {@link Signal} is an interface for signalling successful or unsuccessful completion.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/AsyncShutdownDecorator.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/AsyncShutdownDecorator.java
similarity index 93%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/AsyncShutdownDecorator.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/AsyncShutdownDecorator.java
index 3f25306..f3b90c1 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/AsyncShutdownDecorator.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/AsyncShutdownDecorator.java
@@ -9,9 +9,9 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
-import org.eclipse.virgo.kernel.core.Shutdown;
+import org.eclipse.virgo.nano.core.Shutdown;
 
 /**
  * Decorator for a {@link Shutdown} implementation that performs all operations asynchronously.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/BundleStartTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/BundleStartTracker.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/BundleStartTracker.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/BundleStartTracker.java
index 31e1d97..bf9324f 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/BundleStartTracker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/BundleStartTracker.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,9 +18,9 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.eclipse.virgo.kernel.core.AbortableSignal;
-import org.eclipse.virgo.kernel.core.BundleUtils;
-import org.eclipse.virgo.kernel.core.Signal;
+import org.eclipse.virgo.nano.core.AbortableSignal;
+import org.eclipse.virgo.nano.core.BundleUtils;
+import org.eclipse.virgo.nano.core.Signal;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
similarity index 95%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
index 1997736..edfb4f5 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.lang.management.ManagementFactory;
 import java.util.Dictionary;
@@ -32,11 +32,11 @@
 
 import org.eclipse.virgo.kernel.config.internal.ConfigurationInitialiser;
 import org.eclipse.virgo.kernel.config.internal.KernelConfiguration;
-import org.eclipse.virgo.kernel.core.BundleStarter;
-import org.eclipse.virgo.kernel.core.Shutdown;
-import org.eclipse.virgo.kernel.core.internal.blueprint.ApplicationContextDependencyMonitor;
-import org.eclipse.virgo.kernel.serviceability.dump.internal.RegionDigraphDumpContributor;
-import org.eclipse.virgo.kernel.serviceability.dump.internal.ResolutionDumpContributor;
+import org.eclipse.virgo.nano.core.BundleStarter;
+import org.eclipse.virgo.nano.core.Shutdown;
+import org.eclipse.virgo.nano.core.internal.blueprint.ApplicationContextDependencyMonitor;
+import org.eclipse.virgo.nano.serviceability.dump.internal.RegionDigraphDumpContributor;
+import org.eclipse.virgo.nano.serviceability.dump.internal.ResolutionDumpContributor;
 import org.eclipse.virgo.kernel.shim.scope.ScopeFactory;
 import org.eclipse.virgo.kernel.shim.scope.internal.StandardScopeFactory;
 import org.eclipse.virgo.kernel.shim.serviceability.TracingService;
@@ -184,7 +184,7 @@
 
     private Shutdown initializeShutdownManager(BundleContext context, EventLogger eventLogger, KernelConfiguration configuration) {
         Shutdown shutdown = createShutdown(context, eventLogger);
-        this.tracker.track(context.registerService(org.eclipse.virgo.kernel.core.Shutdown.class.getName(), shutdown, null));
+        this.tracker.track(context.registerService(org.eclipse.virgo.nano.core.Shutdown.class.getName(), shutdown, null));
 
         registerShutdownMBean(configuration, shutdown);
         return shutdown;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatus.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatus.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatus.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatus.java
index 40bdccb..6ab1d37 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatus.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatus.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 final class KernelStatus implements KernelStatusMBean {
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatusMBean.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatusMBean.java
similarity index 92%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatusMBean.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatusMBean.java
index 58647b6..9c9275e 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatusMBean.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/KernelStatusMBean.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 /**
  * MBean for kernel status.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ServiceReferenceTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ServiceReferenceTracker.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ServiceReferenceTracker.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ServiceReferenceTracker.java
index 18f91d7..db7b159 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ServiceReferenceTracker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ServiceReferenceTracker.java
@@ -11,7 +11,7 @@
  *    SpringSource, a division of VMware - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ShutdownManager.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ShutdownManager.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ShutdownManager.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ShutdownManager.java
index cc0bfef..2e75f92 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ShutdownManager.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/ShutdownManager.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -24,7 +24,7 @@
 import org.slf4j.LoggerFactory;
 
 
-import org.eclipse.virgo.kernel.core.Shutdown;
+import org.eclipse.virgo.nano.core.Shutdown;
 import org.eclipse.virgo.kernel.diagnostics.KernelLogEvents;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/SpringUtils.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/SpringUtils.java
similarity index 98%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/SpringUtils.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/SpringUtils.java
index 3ece4c7..ce6f528 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/SpringUtils.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/SpringUtils.java
@@ -1,5 +1,5 @@
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StandardBundleStarter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StandardBundleStarter.java
similarity index 92%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StandardBundleStarter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StandardBundleStarter.java
index a354a9b..a99128e 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StandardBundleStarter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StandardBundleStarter.java
@@ -9,11 +9,11 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
-import org.eclipse.virgo.kernel.core.AbortableSignal;
-import org.eclipse.virgo.kernel.core.BundleStarter;
-import org.eclipse.virgo.kernel.core.BundleUtils;
+import org.eclipse.virgo.nano.core.AbortableSignal;
+import org.eclipse.virgo.nano.core.BundleStarter;
+import org.eclipse.virgo.nano.core.BundleUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
index 9355c20..bcc32db 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import java.lang.management.ManagementFactory;
 import java.util.Map;
@@ -21,11 +21,11 @@
 import javax.management.ObjectName;
 
 import org.eclipse.virgo.kernel.config.internal.KernelConfiguration;
-import org.eclipse.virgo.kernel.core.BlockingAbortableSignal;
-import org.eclipse.virgo.kernel.core.BundleUtils;
-import org.eclipse.virgo.kernel.core.FailureSignalledException;
-import org.eclipse.virgo.kernel.core.FatalKernelException;
-import org.eclipse.virgo.kernel.core.Shutdown;
+import org.eclipse.virgo.nano.core.BlockingAbortableSignal;
+import org.eclipse.virgo.nano.core.BundleUtils;
+import org.eclipse.virgo.nano.core.FailureSignalledException;
+import org.eclipse.virgo.nano.core.FatalKernelException;
+import org.eclipse.virgo.nano.core.Shutdown;
 import org.eclipse.virgo.kernel.diagnostics.KernelLogEvents;
 import org.eclipse.virgo.medic.dump.DumpGenerator;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/ApplicationContextDependencyMonitor.java
similarity index 99%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/ApplicationContextDependencyMonitor.java
index 96bd918..ab049d2 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitor.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/ApplicationContextDependencyMonitor.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal.blueprint;
+package org.eclipse.virgo.nano.core.internal.blueprint;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/StandardTicker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/StandardTicker.java
similarity index 99%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/StandardTicker.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/StandardTicker.java
index 736d0b8..db989be 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/StandardTicker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/StandardTicker.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal.blueprint;
+package org.eclipse.virgo.nano.core.internal.blueprint;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/Ticker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/Ticker.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/Ticker.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/Ticker.java
index 26664a3..af74bf9 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/blueprint/Ticker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/blueprint/Ticker.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal.blueprint;
+package org.eclipse.virgo.nano.core.internal.blueprint;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/diagnostics/KernelLogEvents.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/diagnostics/KernelLogEvents.java
index 67b0fb6..0b20378 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/diagnostics/KernelLogEvents.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.virgo.kernel.diagnostics;
 
-import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.nano.serviceability.LogEventDelegate;
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/Assert.java
similarity index 99%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/Assert.java
index 5357694..29124f0 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/Assert.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability;
+package org.eclipse.virgo.nano.serviceability;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/FatalServerException.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/FatalServerException.java
index 3230e40..a25863a 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/FatalServerException.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability;
+package org.eclipse.virgo.nano.serviceability;
 
 // TODO This exception doesn't cause a crash
 /**
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/LogEventDelegate.java
similarity index 95%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/LogEventDelegate.java
index 3ed3888..4975549 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/LogEventDelegate.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability;
+package org.eclipse.virgo.nano.serviceability;
 
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/NonNull.java
similarity index 95%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/NonNull.java
index 15f0be5..1981eb1 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/NonNull.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability;
+package org.eclipse.virgo.nano.serviceability;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/DumpCoordinator.aj b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/DumpCoordinator.aj
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/DumpCoordinator.aj
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/DumpCoordinator.aj
index 4308ae8..61aa41b 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/DumpCoordinator.aj
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/DumpCoordinator.aj
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump;
+package org.eclipse.virgo.nano.serviceability.dump;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -35,7 +35,7 @@
 
     private final Object monitor = new Object();
 
-    pointcut serviceability() : within(org.eclipse.virgo.kernel.serviceability..*);
+    pointcut serviceability() : within(org.eclipse.virgo.nano.serviceability..*);
 
     pointcut dumpCandidate() : (execution(* *(..)) || initialization(*.new(..))) && !serviceability();
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionState.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/FFDCExceptionState.java
similarity index 96%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionState.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/FFDCExceptionState.java
index c81d467..fdd79bd 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionState.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/FFDCExceptionState.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump;
+package org.eclipse.virgo.nano.serviceability.dump;
 
 /**
  * Maintains state about which {@link Throwable} was last seen for the current thread.
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/RegionDigraphDumpContributor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/RegionDigraphDumpContributor.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/RegionDigraphDumpContributor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/RegionDigraphDumpContributor.java
index ec5f117..016210b 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/RegionDigraphDumpContributor.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/RegionDigraphDumpContributor.java
@@ -9,14 +9,14 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 
 import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 import org.eclipse.virgo.medic.dump.Dump;
 import org.eclipse.virgo.medic.dump.DumpContributionFailedException;
 import org.eclipse.virgo.medic.dump.DumpContributor;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionDumpContributor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionDumpContributor.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionDumpContributor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionDumpContributor.java
index 5ddf5b8..e92b03c 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionDumpContributor.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionDumpContributor.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import java.io.File;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumper.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumper.java
similarity index 97%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumper.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumper.java
index e52e303..754e1bf 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumper.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumper.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardStateWriter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardStateWriter.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardStateWriter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardStateWriter.java
index 221b07c..a73fc04 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardStateWriter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardStateWriter.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardSystemStateAccessor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardSystemStateAccessor.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardSystemStateAccessor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardSystemStateAccessor.java
index 9522640..8cfd104 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StandardSystemStateAccessor.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StandardSystemStateAccessor.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import org.eclipse.osgi.internal.baseadaptor.StateManager;
 import org.eclipse.osgi.service.resolver.PlatformAdmin;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StateWriter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StateWriter.java
similarity index 94%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StateWriter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StateWriter.java
index 3f5502b..b7a4424 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/StateWriter.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/StateWriter.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/SystemStateAccessor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/SystemStateAccessor.java
similarity index 93%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/SystemStateAccessor.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/SystemStateAccessor.java
index 48209ad..cf6e5f3 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/internal/SystemStateAccessor.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/dump/internal/SystemStateAccessor.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import org.eclipse.osgi.service.resolver.State;
 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcer.aj
similarity index 92%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcer.aj
index d1290bc..6acd72a 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcer.aj
@@ -9,11 +9,11 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.enforcement;
+package org.eclipse.virgo.nano.serviceability.enforcement;
 
 import org.aspectj.lang.annotation.SuppressAjWarnings;
-import org.eclipse.virgo.kernel.serviceability.Assert;
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.serviceability.Assert;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 
 
 /**
@@ -27,7 +27,7 @@
  */
 public final aspect NonNullAssertionEnforcer {
 
-    pointcut serviceability() : within(org.eclipse.virgo.kernel.serviceability..*);
+    pointcut serviceability() : within(org.eclipse.virgo.nano.serviceability..*);
 
     pointcut executingOperationWithNonNullFirstParameter(Object obj) :
     	!serviceability() && 
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/Scope.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/Scope.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/Scope.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/Scope.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/ScopeFactory.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/ScopeFactory.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/ScopeFactory.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/ScopeFactory.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/internal/StandardScopeFactory.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/internal/StandardScopeFactory.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/internal/StandardScopeFactory.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/scope/internal/StandardScopeFactory.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/TracingService.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/serviceability/TracingService.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/TracingService.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/serviceability/TracingService.java
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/internal/Slf4jTracingService.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/serviceability/internal/Slf4jTracingService.java
similarity index 100%
rename from org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/internal/Slf4jTracingService.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/shim/serviceability/internal/Slf4jTracingService.java
diff --git a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernel_config.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernel_config.xml
deleted file mode 100644
index d07c2dd..0000000
--- a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernel_config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
-	 immediate="true" name="org.eclipse.virgo.kernel" configuration-policy="require">
-	<implementation
-		class="org.eclipse.virgo.kernel.config.internal.StandardKernelConfig" />
-	<service>
-		<provide interface="org.eclipse.virgo.kernel.core.KernelConfig" />
-	</service>
-</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml
new file mode 100644
index 0000000..4f0b3b8
--- /dev/null
+++ b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
+	 immediate="true" name="org.eclipse.virgo.nano" configuration-policy="require">
+	<implementation
+		class="org.eclipse.virgo.nano.config.internal.StandardKernelConfig" />
+	<service>
+		<provide interface="org.eclipse.virgo.nano.core.KernelConfig" />
+	</service>
+</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernelcore.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml
similarity index 86%
rename from org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernelcore.xml
rename to org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml
index 86d91f7..44670ee 100644
--- a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernelcore.xml
+++ b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component name="kernelcore" immediate="true" xmlns:src="http://www.osgi.org/xmlns/src/v1.1.0">
-	<implementation class="org.eclipse.virgo.kernel.core.internal.CoreBundleActivator"/>
+	<implementation class="org.eclipse.virgo.nano.core.internal.CoreBundleActivator"/>
 	
 	<reference name="EventLogger"
 		interface="org.eclipse.virgo.medic.eventlog.EventLogger"
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java
index db2b7c0..15de465 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.eclipse.virgo.kernel.StubConfigurationAdmin;
-import org.eclipse.virgo.kernel.serviceability.Assert.FatalAssertionException;
+import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java
index c6bb548..b317116 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java
@@ -30,8 +30,8 @@
 import org.eclipse.virgo.medic.dump.Dump;
 import org.eclipse.virgo.medic.dump.DumpContributionFailedException;
 import org.eclipse.virgo.medic.dump.DumpContributor;
-import org.eclipse.virgo.teststubs.osgi.service.cm.StubConfiguration;
-import org.eclipse.virgo.teststubs.osgi.service.cm.StubConfigurationAdmin;
+import org.eclipse.virgo.test.stubs..service.cm.StubConfiguration;
+import org.eclipse.virgo.test.stubs..service.cm.StubConfigurationAdmin;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java
index ed6e2db..2430738 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java
index b801a54..07fb139 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java
@@ -18,7 +18,7 @@
 
 import org.junit.Test;
 
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java
index 977fbe1..ea5ba32 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java
@@ -26,7 +26,7 @@
 import org.eclipse.virgo.kernel.config.internal.commandline.CommandLinePropertiesSource;
 import org.eclipse.virgo.medic.test.eventlog.LoggedEvent;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 public class CommandLinePropertiesSourceTests {
 	
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java
index f6e3243..c00cb43 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java
@@ -25,7 +25,7 @@
 import org.eclipse.virgo.kernel.diagnostics.KernelLogEvents;
 import org.eclipse.virgo.medic.test.eventlog.LoggedEvent;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java
index 362a924..4337c3d 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java
@@ -9,7 +9,7 @@
  *   Olivier Girardot - initial contribution
  */
 
-package org.eclipse.virgo.kernel.core;
+package org.eclipse.virgo.nano.core;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java
index e1f166d..e844da1 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -26,10 +26,10 @@
 import org.osgi.framework.BundleListener;
 import org.osgi.service.event.Event;
 
-import org.eclipse.virgo.kernel.core.AbortableSignal;
-import org.eclipse.virgo.kernel.core.internal.BundleStartTracker;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.nano.core.AbortableSignal;
+import org.eclipse.virgo.nano.core.internal.BundleStartTracker;
+import org.eclipse.virgo.test.stubs..framework.StubBundle;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java
index 20e351d..f52807b 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.easymock.EasyMock.createNiceMock;
 
@@ -24,15 +24,15 @@
 
 import org.eclipse.osgi.service.resolver.PlatformAdmin;
 import org.eclipse.virgo.kernel.StubConfigurationAdmin;
-import org.eclipse.virgo.kernel.core.Shutdown;
-import org.eclipse.virgo.kernel.core.internal.CoreBundleActivator;
-import org.eclipse.virgo.kernel.core.internal.StartupTracker;
+import org.eclipse.virgo.nano.core.Shutdown;
+import org.eclipse.virgo.nano.core.internal.CoreBundleActivator;
+import org.eclipse.virgo.nano.core.internal.StartupTracker;
 import org.eclipse.virgo.medic.dump.DumpGenerator;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.service.component.StubComponentContext;
-import org.eclipse.virgo.teststubs.osgi.service.event.StubEventAdmin;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..service.component.StubComponentContext;
+import org.eclipse.virgo.test.stubs..service.event.StubEventAdmin;
 
 /**
  * Test the logic of {@link CoreBundleActivator}
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java
index e07fee7..c7347b4 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -27,11 +27,11 @@
 import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.launch.Framework;
 
-import org.eclipse.virgo.kernel.core.internal.ShutdownManager;
+import org.eclipse.virgo.nano.core.internal.ShutdownManager;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..framework.StubBundle;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
 
 public class ShutdownManagerTests {
 	
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java
index 647a13e..21a1795 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -18,7 +18,7 @@
 import java.util.Dictionary;
 import java.util.Properties;
 
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
+import org.eclipse.virgo.test.stubs..framework.StubBundle;
 import org.junit.Test;
 import org.osgi.framework.Version;
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
index b90df94..edbab5a 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
@@ -33,14 +33,14 @@
 
 
 import org.eclipse.virgo.kernel.config.internal.KernelConfiguration;
-import org.eclipse.virgo.kernel.core.Shutdown;
-import org.eclipse.virgo.kernel.core.internal.BundleStartTracker;
-import org.eclipse.virgo.kernel.core.internal.StartupTracker;
+import org.eclipse.virgo.nano.core.Shutdown;
+import org.eclipse.virgo.nano.core.internal.BundleStartTracker;
+import org.eclipse.virgo.nano.core.internal.StartupTracker;
 import org.eclipse.virgo.medic.dump.DumpGenerator;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.eclipse.virgo.teststubs.osgi.service.event.StubEventAdmin;
-import org.eclipse.virgo.teststubs.osgi.support.ObjectClassFilter;
+import org.eclipse.virgo.test.stubs..framework.StubBundle;
+import org.eclipse.virgo.test.stubs..framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs..service.event.StubEventAdmin;
+import org.eclipse.virgo.test.stubs..support.ObjectClassFilter;
 
 public class StartupTrackerTests {
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java
index d2744f9..cceb079 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java
@@ -1,4 +1,4 @@
-package org.eclipse.virgo.kernel.core.internal;
+package org.eclipse.virgo.nano.core.internal;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java
index 9659ad5..171493b 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal.blueprint;
+package org.eclipse.virgo.nano.core.internal.blueprint;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,10 +25,10 @@
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
 
-import org.eclipse.virgo.kernel.core.internal.blueprint.ApplicationContextDependencyMonitor;
+import org.eclipse.virgo.nano.core.internal.blueprint.ApplicationContextDependencyMonitor;
 import org.eclipse.virgo.medic.test.eventlog.LoggedEvent;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
-import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
+import org.eclipse.virgo.test.stubs..framework.StubBundle;
 
 /**
  */
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java
index 3ea4606..768e6f2 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java
@@ -9,14 +9,14 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.core.internal.blueprint;
+package org.eclipse.virgo.nano.core.internal.blueprint;
 
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
-import org.eclipse.virgo.kernel.core.internal.blueprint.StandardTicker;
-import org.eclipse.virgo.kernel.core.internal.blueprint.Ticker;
+import org.eclipse.virgo.nano.core.internal.blueprint.StandardTicker;
+import org.eclipse.virgo.nano.core.internal.blueprint.Ticker;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java
index 431d75c..3976b27 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability;
+package org.eclipse.virgo.nano.serviceability;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -17,8 +17,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.virgo.kernel.serviceability.Assert;
-import org.eclipse.virgo.kernel.serviceability.Assert.FatalAssertionException;
+import org.eclipse.virgo.nano.serviceability.Assert;
+import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
 import org.junit.Test;
 
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java
index d67bbef..1876782 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java
@@ -9,14 +9,14 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump;
+package org.eclipse.virgo.nano.serviceability.dump;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.eclipse.virgo.kernel.serviceability.dump.FFDCExceptionState;
+import org.eclipse.virgo.nano.serviceability.dump.FFDCExceptionState;
 import org.junit.Test;
 
 
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java
index fc94b28..59a0c6c 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.dump.internal;
+package org.eclipse.virgo.nano.serviceability.dump.internal;
 
 import static org.easymock.EasyMock.createNiceMock;
 import static org.junit.Assert.assertArrayEquals;
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java
index 413359b..d182a7d 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.serviceability.enforcement;
+package org.eclipse.virgo.nano.serviceability.enforcement;
 
 import java.util.Map;
 
@@ -18,8 +18,8 @@
 
 import test.AssertingService;
 
-import org.eclipse.virgo.kernel.serviceability.Assert;
-import org.eclipse.virgo.kernel.serviceability.dump.DumpCoordinator;
+import org.eclipse.virgo.nano.serviceability.Assert;
+import org.eclipse.virgo.nano.serviceability.dump.DumpCoordinator;
 import org.eclipse.virgo.medic.dump.DumpGenerator;
 
 public class NonNullAssertionEnforcerTests {
diff --git a/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java b/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
index 006c96b..073811d 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
@@ -11,7 +11,7 @@
 
 package test;
 
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.core/template.mf b/org.eclipse.virgo.nano.core/template.mf
index ddd0b29..8205f7d 100644
--- a/org.eclipse.virgo.nano.core/template.mf
+++ b/org.eclipse.virgo.nano.core/template.mf
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Virgo Kernel Core
-Bundle-SymbolicName: org.eclipse.virgo.kernel.core
+Bundle-Name: Virgo Nano Core
+Bundle-SymbolicName: org.eclipse.virgo.nano.core
 Bundle-Version: ${version}
-Service-Component: OSGI-INF/kernel_config.xml,OSGI-INF/kernelcore.xml
+Service-Component: OSGI-INF/nano_config.xml,OSGI-INF/nanocore.xml
 Import-Template: 
  org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
@@ -18,4 +18,3 @@
  org.xml.sax;version="0"
 Excluded-Exports: 
  *.internal.*
-Excluded-Imports: org.eclipse.virgo.osgi.extensions.*
diff --git a/org.eclipse.virgo.nano.deployer.api/.classpath b/org.eclipse.virgo.nano.deployer.api/.classpath
index adc8b00..190f169 100644
--- a/org.eclipse.virgo.nano.deployer.api/.classpath
+++ b/org.eclipse.virgo.nano.deployer.api/.classpath
@@ -22,10 +22,10 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.nano.deployer.api/.project b/org.eclipse.virgo.nano.deployer.api/.project
index a8e4b42..22f5339 100644
--- a/org.eclipse.virgo.nano.deployer.api/.project
+++ b/org.eclipse.virgo.nano.deployer.api/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.virgo.deployer.api</name>
+	<name>org.eclipse.virgo.nano.deployer.api</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml b/org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml
index 9bbf399..82aef2f 100644
--- a/org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml
+++ b/org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml
@@ -2,7 +2,7 @@
      <!-- Exclusions -->
      <Match>
        	<Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
-        <Class name="org.eclipse.virgo.kernel.deployer.core.module.StandardModule"/>
+        <Class name="org.eclipse.virgo.nano.deployer.core.module.StandardModule"/>
         <Method name="unwrapNull"/>
      </Match>	
 </FindBugsFilter>
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java
index 1a0a3c7..e5a5303 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer;
+package org.eclipse.virgo.nano.deployer;
 
 import java.beans.ConstructorProperties;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java
index bad7c0c..9ef5576 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer;
+package org.eclipse.virgo.nano.deployer;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java
index d956c33..4132347 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java
@@ -10,13 +10,13 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer;
+package org.eclipse.virgo.nano.deployer;
 
 import javax.management.MXBean;
 import javax.management.openmbean.CompositeData;
 
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentException;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java
index ca75863..4bf9460 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer;
+package org.eclipse.virgo.nano.deployer;
 
 import javax.management.MXBean;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java
index 227d053..19d7710 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java
@@ -1,9 +1,9 @@
-package org.eclipse.virgo.kernel.deployer.config;
+package org.eclipse.virgo.nano.deployer.config;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 
 /**
  * Publishes and Deletes configurations from the config admin that is present in the implementor's region
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java
index f0f32cc..8b35e6f 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import java.net.URI;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java
index e3cdea3..507b309 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import java.net.URI;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java
index 6d11892..fe29658 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import org.eclipse.virgo.util.io.PathReference;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java
index cc928ba..59c7537 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java
@@ -10,9 +10,9 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
-import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.nano.serviceability.LogEventDelegate;
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java
index a0a938a..3c399cd 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 /**
  * Signals a checked exception to the caller of the deployer subsystem.
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java
index ba1b26e..f2c8b73 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java
@@ -10,7 +10,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import java.io.Serializable;
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java
index 4f243dc..c60af1d 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java
@@ -1,4 +1,4 @@
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import java.net.URI;
 
@@ -67,12 +67,12 @@
      * synchronously.
      * <p/>
      * Deploying synchronously means that control does not return to the caller of the
-     * {@link org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer#deploy(URI, DeploymentOptions) deploy}
+     * {@link org.eclipse.virgo.nano.deployer.core.ApplicationDeployer#deploy(URI, DeploymentOptions) deploy}
      * method until any application contexts for the application have been built and published in the service
      * registry or deployment fails or times out.
      * <p/>
      * Deploying asynchronously means that control returns to the caller of the
-     * {@link org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer#deploy(URI, DeploymentOptions) deploy}
+     * {@link org.eclipse.virgo.nano.deployer.core.ApplicationDeployer#deploy(URI, DeploymentOptions) deploy}
      * method once the application has been started, but not necessarily before any application contexts have been
      * built and published.
      * 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java
index f75e944..acfe71c 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java
@@ -10,9 +10,9 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
-import org.eclipse.virgo.kernel.serviceability.FatalServerException;
+import org.eclipse.virgo.nano.serviceability.FatalServerException;
 
 /**
  * Signals a fatal exception in the deployer subsystem.<p/>
diff --git a/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java
index a796a41..47e44e2 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java
@@ -9,11 +9,11 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer;
+package org.eclipse.virgo.nano.deployer;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.virgo.kernel.deployer.ArtifactIdentity;
+import org.eclipse.virgo.nano.deployer.ArtifactIdentity;
 import org.junit.Test;
 
 
diff --git a/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java
index 9cef7b9..5eee307 100644
--- a/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java
+++ b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java
@@ -9,11 +9,11 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.core;
+package org.eclipse.virgo.nano.deployer.core;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
 import org.junit.Test;
 
 
diff --git a/org.eclipse.virgo.nano.deployer.api/template.mf b/org.eclipse.virgo.nano.deployer.api/template.mf
index c1b0da2..59a6622 100644
--- a/org.eclipse.virgo.nano.deployer.api/template.mf
+++ b/org.eclipse.virgo.nano.deployer.api/template.mf
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Deployer API
-Bundle-SymbolicName: org.eclipse.virgo.deployer.api
+Bundle-SymbolicName: org.eclipse.virgo.nano.deployer.api
 Bundle-Version: ${version}
 Import-Template: 
- org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
  org.osgi.framework.*;version="0",
diff --git a/org.eclipse.virgo.nano.deployer.hot/.classpath b/org.eclipse.virgo.nano.deployer.hot/.classpath
index 9392d42..077b355 100644
--- a/org.eclipse.virgo.nano.deployer.hot/.classpath
+++ b/org.eclipse.virgo.nano.deployer.hot/.classpath
@@ -5,13 +5,13 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.api"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-3.6.0.D-20120717201225.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.test-3.6.0.BUILD-20120806143138.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.deployer.api"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.virgo.nano.deployer.hot/.project b/org.eclipse.virgo.nano.deployer.hot/.project
index 50356ab..7793677 100644
--- a/org.eclipse.virgo.nano.deployer.hot/.project
+++ b/org.eclipse.virgo.nano.deployer.hot/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.virgo.deployer.hot</name>
+	<name>org.eclipse.virgo.nano.deployer.hot</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.virgo.nano.deployer.hot/ivy.xml b/org.eclipse.virgo.nano.deployer.hot/ivy.xml
index 58e337d..44f4953 100644
--- a/org.eclipse.virgo.nano.deployer.hot/ivy.xml
+++ b/org.eclipse.virgo.nano.deployer.hot/ivy.xml
@@ -23,7 +23,7 @@
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
 		<!-- runtime deps -->
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/>
-		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="latest.integration" conf="compile->runtime"/>
+		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.core" rev="latest.integration" conf="compile->runtime"/>
 		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.api" rev="latest.integration" conf="compile->runtime"/>	
 		<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
 		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java
index 76b7c76..c33dbe5 100644
--- a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java
+++ b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java
@@ -9,13 +9,13 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.hot;
+package org.eclipse.virgo.nano.deployer.hot;
 
 import java.io.File;
 
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeployerConfiguration;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.util.io.FileSystemChecker;
 import org.eclipse.virgo.util.io.PathReference;
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java
index 68b89eb..bc94880 100644
--- a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java
+++ b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java
@@ -1,4 +1,4 @@
-package org.eclipse.virgo.kernel.deployer.hot;
+package org.eclipse.virgo.nano.deployer.hot;
 
 import java.io.File;
 import java.net.URI;
@@ -8,12 +8,12 @@
 import org.slf4j.LoggerFactory;
 
 
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
-import org.eclipse.virgo.kernel.deployer.core.FatalDeploymentException;
-import org.eclipse.virgo.kernel.serviceability.NonNull;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeploymentException;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.deployer.core.FatalDeploymentException;
+import org.eclipse.virgo.nano.serviceability.NonNull;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 import org.eclipse.virgo.util.io.FileSystemEvent;
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java
index d8e7620..513b486 100644
--- a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java
+++ b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java
@@ -1,7 +1,7 @@
 
-package org.eclipse.virgo.kernel.deployer.hot;
+package org.eclipse.virgo.nano.deployer.hot;
 
-import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.nano.serviceability.LogEventDelegate;
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java
index be01e4c..f70cfa2 100644
--- a/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java
+++ b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java
@@ -1,5 +1,5 @@
 
-package org.eclipse.virgo.kernel.deployer.hot;
+package org.eclipse.virgo.nano.deployer.hot;
 
 import java.io.File;
 
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java b/org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java
index 9de4975..0a7030d 100644
--- a/org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java
+++ b/org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.deployer.hot;
+package org.eclipse.virgo.nano.deployer.hot;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
@@ -23,10 +23,10 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
-import org.eclipse.virgo.kernel.deployer.hot.HotDeploymentFileSystemListener;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.deployer.hot.HotDeploymentFileSystemListener;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
 import org.eclipse.virgo.util.io.FileSystemEvent;
 
diff --git a/org.eclipse.virgo.nano.deployer.hot/template.mf b/org.eclipse.virgo.nano.deployer.hot/template.mf
index bbfca03..88d68bd 100644
--- a/org.eclipse.virgo.nano.deployer.hot/template.mf
+++ b/org.eclipse.virgo.nano.deployer.hot/template.mf
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Hot Deployer
 Bundle-Version: ${version}
-Bundle-SymbolicName: org.eclipse.virgo.deployer.hot
+Bundle-SymbolicName: org.eclipse.virgo.nano.deployer.hot
 Import-Template: org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.virgo.kernel.serviceability.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.kernel.deployer.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.serviceability.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.deployer.*;version="${version:[=.=.=, =.+1)}",
  org.slf4j.*;version="0"
 Excluded-Exports: 
  *.internal.*
diff --git a/org.eclipse.virgo.nano.deployer/.classpath b/org.eclipse.virgo.nano.deployer/.classpath
index cde224a..19c742d 100644
--- a/org.eclipse.virgo.nano.deployer/.classpath
+++ b/org.eclipse.virgo.nano.deployer/.classpath
@@ -23,18 +23,18 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.hot"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120717201225/org.eclipse.virgo.medic.core-3.6.0.D-20120717201225.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.core-3.6.0.BUILD-20120806143138.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator.manipulator/2.0.0.v20110808-1657/org.eclipse.equinox.simpleconfigurator.manipulator-2.0.0.v20110808-1657.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator/1.0.300.v20110815-1744/org.eclipse.equinox.simpleconfigurator-1.0.300.v20110815-1744.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.simpleconfigurator/1.0.300.v20110815-1744/org.eclipse.equinox.simpleconfigurator-sources-1.0.300.v20110815-1744.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.test-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.deployer.api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.deployer.hot"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.nano.deployer/findbugs-exclude.xml b/org.eclipse.virgo.nano.deployer/findbugs-exclude.xml
index 9bbf399..82aef2f 100644
--- a/org.eclipse.virgo.nano.deployer/findbugs-exclude.xml
+++ b/org.eclipse.virgo.nano.deployer/findbugs-exclude.xml
@@ -2,7 +2,7 @@
      <!-- Exclusions -->
      <Match>
        	<Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
-        <Class name="org.eclipse.virgo.kernel.deployer.core.module.StandardModule"/>
+        <Class name="org.eclipse.virgo.nano.deployer.core.module.StandardModule"/>
         <Method name="unwrapNull"/>
      </Match>	
 </FindBugsFilter>
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/NanoDeployerLogEvents.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/NanoDeployerLogEvents.java
index 8870538..2318f1b 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/NanoDeployerLogEvents.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/NanoDeployerLogEvents.java
@@ -1,6 +1,6 @@
 package org.eclipse.virgo.nano.deployer;
 
-import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.nano.serviceability.LogEventDelegate;
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/SimpleDeployer.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/SimpleDeployer.java
index 85faca1..8344626 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/SimpleDeployer.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/SimpleDeployer.java
@@ -4,7 +4,7 @@
 import java.net.URI;
 import java.util.List;
 
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
 import org.osgi.framework.Bundle;
 
 
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/StandardDeploymentIdentity.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/StandardDeploymentIdentity.java
index a453ac7..c9caadd 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/StandardDeploymentIdentity.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/StandardDeploymentIdentity.java
@@ -12,7 +12,7 @@
  *   SAP AG - re-factoring
  *******************************************************************************/
 
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
 import org.osgi.framework.Version;
 
 /**
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerEnabler.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerEnabler.java
index 1cac1e4..fe04bce 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerEnabler.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerEnabler.java
@@ -1,8 +1,8 @@
 package org.eclipse.virgo.nano.deployer.hot;
 
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
-import org.eclipse.virgo.kernel.deployer.hot.HotDeployer;
+import org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.api.core.DeployerConfiguration;
+import org.eclipse.virgo.nano.deployer.hot.HotDeployer;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 
 public class HotDeployerEnabler {
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/BundleDeployer.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/BundleDeployer.java
index da677df..1b95243 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/BundleDeployer.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/BundleDeployer.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.jar.JarFile;
 
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.nano.deployer.NanoDeployerLogEvents;
 import org.eclipse.virgo.nano.deployer.SimpleDeployer;
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardApplicationDeployer.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardApplicationDeployer.java
index 49339f8..b8d7557 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardApplicationDeployer.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardApplicationDeployer.java
@@ -6,12 +6,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.virgo.kernel.core.KernelConfig;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.core.KernelConfig;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeployerConfiguration;
+import org.eclipse.virgo.nano.deployer.core.DeploymentException;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.nano.deployer.NanoDeployerLogEvents;
 import org.eclipse.virgo.nano.deployer.SimpleDeployer;
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardDeployerConfiguration.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardDeployerConfiguration.java
index 173139d..ec04e4a 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardDeployerConfiguration.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/internal/StandardDeployerConfiguration.java
@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
+import org.eclipse.virgo.nano.deployer.core.DeployerConfiguration;
 import org.eclipse.virgo.util.io.PathReference;
 
 /**
diff --git a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/management/StandardDeployer.java b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/management/StandardDeployer.java
index db6cbc8..273a200 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/management/StandardDeployer.java
+++ b/org.eclipse.virgo.nano.deployer/src/main/java/org/eclipse/virgo/nano/deployer/management/StandardDeployer.java
@@ -16,12 +16,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.eclipse.virgo.kernel.deployer.ArtifactIdentity;
-import org.eclipse.virgo.kernel.deployer.Deployer;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.deployer.ArtifactIdentity;
+import org.eclipse.virgo.nano.deployer.Deployer;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeploymentException;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
 
 
 /**
diff --git a/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml b/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml
index 95121c1..50b31c1 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml
+++ b/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml
@@ -17,7 +17,7 @@
 		unbind="unbindPackageAdmin"/>
 		
 	<reference name="KernelConfig"
-		interface="org.eclipse.virgo.kernel.core.KernelConfig"  
+		interface="org.eclipse.virgo.nano.core.KernelConfig"  
 		policy="static" 
 		cardinality="1..1" 
 		bind="bindKernelConfig" 
diff --git a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
index ae0db98..c7fcbc6 100644
--- a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
+++ b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
@@ -21,10 +21,10 @@
 
 import java.net.URI;
 
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentOptions;
+import org.eclipse.virgo.nano.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.core.DeployerConfiguration;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.deployer.core.DeploymentOptions;
 import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
 import org.eclipse.virgo.util.io.PathReference;
 import org.junit.After;
diff --git a/org.eclipse.virgo.nano.deployer/template.mf b/org.eclipse.virgo.nano.deployer/template.mf
index b429870..3976b7b 100644
--- a/org.eclipse.virgo.nano.deployer/template.mf
+++ b/org.eclipse.virgo.nano.deployer/template.mf
@@ -5,10 +5,9 @@
 Bundle-Version: ${version}
 Service-Component: OSGI-INF/virgo.nano.deployer.component.xml
 Import-Template: 
- org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.virgo.deployer.*;version="${version:[=.=.=, =.+1)}",
  org.osgi.framework.*;version="0",
  javax.management.*;version="0",
  javax.xml.*;version="0",
@@ -20,4 +19,7 @@
  org.eclipse.osgi.util;version="0",
  org.slf4j;version="0"
 Excluded-Exports:
- *.internal.*
+ *.internal.*,
+ org.eclipse.virgo.nano.deployer.hot
+Excluded-Imports: 
+ org.eclipse.virgo.nano.deployer
diff --git a/org.eclipse.virgo.nano.services.concurrent/.classpath b/org.eclipse.virgo.nano.services.concurrent/.classpath
index 352d64a..c925030 100644
--- a/org.eclipse.virgo.nano.services.concurrent/.classpath
+++ b/org.eclipse.virgo.nano.services.concurrent/.classpath
@@ -23,7 +23,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120717181632/org.eclipse.virgo.util.math-3.6.0.D-20120717181632.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.nano.services.ds/.classpath b/org.eclipse.virgo.nano.services.ds/.classpath
index d0e3a37..75763a1 100644
--- a/org.eclipse.virgo.nano.services.ds/.classpath
+++ b/org.eclipse.virgo.nano.services.ds/.classpath
@@ -23,7 +23,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.nano.services.ds/src/test/java/.gitignore b/org.eclipse.virgo.nano.services.ds/src/test/java/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.nano.services.ds/src/test/java/.gitignore
diff --git a/org.eclipse.virgo.nano.shutdown/.project b/org.eclipse.virgo.nano.shutdown/.project
index a3d5110..ddc1516 100644
--- a/org.eclipse.virgo.nano.shutdown/.project
+++ b/org.eclipse.virgo.nano.shutdown/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.virgo.kernel.shutdown</name>
+	<name>org.eclipse.virgo.nano.shutdown</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.virgo.nano.shutdown/build.xml b/org.eclipse.virgo.nano.shutdown/build.xml
index 619e29a..c4715fc 100644
--- a/org.eclipse.virgo.nano.shutdown/build.xml
+++ b/org.eclipse.virgo.nano.shutdown/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.kernel.shutdown">
+<project name="org.eclipse.virgo.nano.shutdown">
 
 	<property name="disable.bundlor" value="true" />
 	<property file="${basedir}/../build.properties"/>
diff --git a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java
index 7f30af0..0e65b95 100644
--- a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java
+++ b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java
@@ -11,7 +11,7 @@
  *    SpringSource, a division of VMware - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -30,7 +30,7 @@
  */
 final class KernelAuthenticationConfiguration {
 
-    public static final String FILE_LOCATION_PROPERTY = "org.eclipse.virgo.kernel.authentication.file";
+    public static final String FILE_LOCATION_PROPERTY = "org.eclipse.virgo.nano.authentication.file";
 
     public static final String DEFAULT_USERNAME = "admin";
 
diff --git a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java
index 4dd4a63..ab4680a 100644
--- a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java
+++ b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java
index 4d4bc1b..eb8a170 100644
--- a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java
+++ b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 /**
  * A <code>ShutdownCommand</code> is created by a {@link ShutdownCommandParser} to encapsulate
diff --git a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java
index 713f3df..27ba37c 100644
--- a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java
+++ b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 /**
  * A <code>ShutdownCommandParser</code> is used to parse a series of arguments
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java
index 5d29d43..ee029a8 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java
@@ -11,7 +11,7 @@
  *    SpringSource, a division of VMware - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import java.util.Properties;
 
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java
index 70ed946..cd72082 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import javax.management.MXBean;
 
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java
index de9d42d..2ce03c8 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -35,8 +35,8 @@
 import javax.management.remote.JMXServiceURL;
 import javax.management.remote.rmi.RMIConnectorServer;
 
-import org.eclipse.virgo.kernel.shutdown.ShutdownClient;
-import org.eclipse.virgo.kernel.shutdown.ShutdownCommand;
+import org.eclipse.virgo.nano.shutdown.ShutdownClient;
+import org.eclipse.virgo.nano.shutdown.ShutdownCommand;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java
index c057d7d..d0c68df 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java
@@ -9,7 +9,7 @@
  *   VMware Inc. - initial contribution
  *******************************************************************************/
 
-package org.eclipse.virgo.kernel.shutdown;
+package org.eclipse.virgo.nano.shutdown;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -17,8 +17,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.eclipse.virgo.kernel.shutdown.ShutdownCommand;
-import org.eclipse.virgo.kernel.shutdown.ShutdownCommandParser;
+import org.eclipse.virgo.nano.shutdown.ShutdownCommand;
+import org.eclipse.virgo.nano.shutdown.ShutdownCommandParser;
 import org.junit.Test;
 
 public class ShutdownCommandParserTests {
diff --git a/org.eclipse.virgo.nano.war.deployer/.classpath b/org.eclipse.virgo.nano.war.deployer/.classpath
index 8df6cbc..c566e15 100644
--- a/org.eclipse.virgo.nano.war.deployer/.classpath
+++ b/org.eclipse.virgo.nano.war.deployer/.classpath
@@ -23,17 +23,17 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120717201225/org.eclipse.virgo.medic.core-3.6.0.D-20120717201225.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic-3.6.0.BUILD-20120806143138.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.BUILD-20120806143138/org.eclipse.virgo.medic.core-3.6.0.BUILD-20120806143138.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120525195844/org.eclipse.gemini.web.core-sources-2.1.0.BUILD-20120525195844.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator.manipulator/2.0.0.v20110808-1657/org.eclipse.equinox.simpleconfigurator.manipulator-2.0.0.v20110808-1657.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.simpleconfigurator/1.0.300.v20110815-1744/org.eclipse.equinox.simpleconfigurator-1.0.300.v20110815-1744.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.simpleconfigurator/1.0.300.v20110815-1744/org.eclipse.equinox.simpleconfigurator-sources-1.0.300.v20110815-1744.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.deployer"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.api"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.nano.deployer.api"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.nano.war.deployer/findbugs-exclude.xml b/org.eclipse.virgo.nano.war.deployer/findbugs-exclude.xml
index 9bbf399..82aef2f 100644
--- a/org.eclipse.virgo.nano.war.deployer/findbugs-exclude.xml
+++ b/org.eclipse.virgo.nano.war.deployer/findbugs-exclude.xml
@@ -2,7 +2,7 @@
      <!-- Exclusions -->
      <Match>
        	<Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
-        <Class name="org.eclipse.virgo.kernel.deployer.core.module.StandardModule"/>
+        <Class name="org.eclipse.virgo.nano.deployer.core.module.StandardModule"/>
         <Method name="unwrapNull"/>
      </Match>	
 </FindBugsFilter>
diff --git a/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/NanoWARDeployerLogEvents.java b/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/NanoWARDeployerLogEvents.java
index 28a4a1d..5913e26 100644
--- a/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/NanoWARDeployerLogEvents.java
+++ b/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/NanoWARDeployerLogEvents.java
@@ -1,6 +1,6 @@
 package org.eclipse.virgo.nano.war.deployer;
 
-import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.nano.serviceability.LogEventDelegate;
 import org.eclipse.virgo.medic.eventlog.Level;
 import org.eclipse.virgo.medic.eventlog.LogEvent;
 
diff --git a/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/WARDeployer.java b/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/WARDeployer.java
index 452fce8..5e2bd04 100644
--- a/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/WARDeployer.java
+++ b/org.eclipse.virgo.nano.war.deployer/src/main/java/org/eclipse/virgo/nano/war/deployer/WARDeployer.java
@@ -25,8 +25,8 @@
 
 import org.eclipse.gemini.web.core.InstallationOptions;
 import org.eclipse.gemini.web.core.WebBundleManifestTransformer;
-import org.eclipse.virgo.kernel.core.KernelConfig;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.nano.core.KernelConfig;
+import org.eclipse.virgo.nano.deployer.core.DeploymentIdentity;
 import org.eclipse.virgo.medic.eventlog.EventLogger;
 import org.eclipse.virgo.nano.deployer.SimpleDeployer;
 import org.eclipse.virgo.nano.deployer.StandardDeploymentIdentity;
diff --git a/org.eclipse.virgo.nano.war.deployer/src/main/resources/OSGI-INF/virgo.nano.war.deployer.component.xml b/org.eclipse.virgo.nano.war.deployer/src/main/resources/OSGI-INF/virgo.nano.war.deployer.component.xml
index fdb8fc2..5f76f9b 100644
--- a/org.eclipse.virgo.nano.war.deployer/src/main/resources/OSGI-INF/virgo.nano.war.deployer.component.xml
+++ b/org.eclipse.virgo.nano.war.deployer/src/main/resources/OSGI-INF/virgo.nano.war.deployer.component.xml
@@ -24,7 +24,7 @@
 		unbind="unbindWebBundleManifestTransformer"/>
 		
 	<reference name="KernelConfig"
-		interface="org.eclipse.virgo.kernel.core.KernelConfig"  
+		interface="org.eclipse.virgo.nano.core.KernelConfig"  
 		policy="static" 
 		cardinality="1..1" 
 		bind="bindKernelConfig"