diff --git a/build.versions b/build.versions
index f3cda24..bf286d0 100644
--- a/build.versions
+++ b/build.versions
@@ -1,6 +1,5 @@
 # Compile
 org.aspectj=1.6.12.RELEASE
-org.eclipse.virgo.osgi=3.6.0.D-20120711092707
 org.eclipse.virgo.medic=3.6.0.D-20120717201225
 org.eclipse.virgo.repository=3.6.0.D-20120717202028
 org.eclipse.virgo.util=3.6.0.D-20120717181632
@@ -91,4 +90,4 @@
 #Test
 org.easymock=2.3.0
 org.junit=4.7.0
-org.eclipse.virgo.teststubs=3.6.0.D-20120711092322
+org.eclipse.virgo.test=3.6.0.D-20120717182335
diff --git a/org.eclipse.virgo.deployer.api/build.xml b/org.eclipse.virgo.deployer.api/build.xml
deleted file mode 100644
index 0fadecf..0000000
--- a/org.eclipse.virgo.deployer.api/build.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.deployer.api">
-
-	<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	<import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
-</project>
diff --git a/org.eclipse.virgo.kernel.authentication/.classpath b/org.eclipse.virgo.nano.authentication/.classpath
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/.classpath
rename to org.eclipse.virgo.nano.authentication/.classpath
diff --git a/org.eclipse.virgo.kernel.authentication/.project b/org.eclipse.virgo.nano.authentication/.project
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/.project
rename to org.eclipse.virgo.nano.authentication/.project
diff --git a/org.eclipse.virgo.kernel.authentication/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.nano.authentication/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.eclipse.virgo.nano.authentication/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/org.eclipse.virgo.kernel.authentication/.springBeans b/org.eclipse.virgo.nano.authentication/.springBeans
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/.springBeans
rename to org.eclipse.virgo.nano.authentication/.springBeans
diff --git a/org.eclipse.virgo.kernel.authentication/build.xml b/org.eclipse.virgo.nano.authentication/build.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/build.xml
rename to org.eclipse.virgo.nano.authentication/build.xml
diff --git a/org.eclipse.virgo.kernel.authentication/ivy.xml b/org.eclipse.virgo.nano.authentication/ivy.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/ivy.xml
rename to org.eclipse.virgo.nano.authentication/ivy.xml
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/CredentialStore.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/KernelLoginModule.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactory.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/Role.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java b/org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java
rename to org.eclipse.virgo.nano.authentication/src/main/java/org/eclipse/virgo/kernel/authentication/User.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/resources/.gitignore b/org.eclipse.virgo.nano.authentication/src/main/resources/.gitignore
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/resources/.gitignore
rename to org.eclipse.virgo.nano.authentication/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.kernel.authentication/src/main/resources/about.html b/org.eclipse.virgo.nano.authentication/src/main/resources/about.html
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/main/resources/about.html
rename to org.eclipse.virgo.nano.authentication/src/main/resources/about.html
diff --git a/org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/KernelLoginModuleTests.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/PropertiesFileCredentialStoreFactoryTests.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java b/org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java
rename to org.eclipse.virgo.nano.authentication/src/test/java/org/eclipse/virgo/kernel/authentication/RoleTests.java
diff --git a/org.eclipse.virgo.kernel.authentication/src/test/resources/user.properties b/org.eclipse.virgo.nano.authentication/src/test/resources/user.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/src/test/resources/user.properties
rename to org.eclipse.virgo.nano.authentication/src/test/resources/user.properties
diff --git a/org.eclipse.virgo.kernel.authentication/template.mf b/org.eclipse.virgo.nano.authentication/template.mf
similarity index 100%
rename from org.eclipse.virgo.kernel.authentication/template.mf
rename to org.eclipse.virgo.nano.authentication/template.mf
diff --git a/org.eclipse.virgo.kernel.core/.classpath b/org.eclipse.virgo.nano.core/.classpath
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.classpath
rename to org.eclipse.virgo.nano.core/.classpath
diff --git a/org.eclipse.virgo.kernel.core/.project b/org.eclipse.virgo.nano.core/.project
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.project
rename to org.eclipse.virgo.nano.core/.project
diff --git a/org.eclipse.virgo.kernel.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.virgo.nano.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.virgo.nano.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.virgo.kernel.core/.settings/org.eclipse.virgo.ide.bundlor.core.prefs b/org.eclipse.virgo.nano.core/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
rename to org.eclipse.virgo.nano.core/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/org.eclipse.virgo.kernel.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.nano.core/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.eclipse.virgo.nano.core/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/org.eclipse.virgo.kernel.core/.springBeans b/org.eclipse.virgo.nano.core/.springBeans
similarity index 100%
rename from org.eclipse.virgo.kernel.core/.springBeans
rename to org.eclipse.virgo.nano.core/.springBeans
diff --git a/org.eclipse.virgo.kernel.core/build.xml b/org.eclipse.virgo.nano.core/build.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/build.xml
rename to org.eclipse.virgo.nano.core/build.xml
diff --git a/org.eclipse.virgo.kernel.core/findbugs-exclude.xml b/org.eclipse.virgo.nano.core/findbugs-exclude.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/findbugs-exclude.xml
rename to org.eclipse.virgo.nano.core/findbugs-exclude.xml
diff --git a/org.eclipse.virgo.kernel.core/ivy.xml b/org.eclipse.virgo.nano.core/ivy.xml
similarity index 94%
rename from org.eclipse.virgo.kernel.core/ivy.xml
rename to org.eclipse.virgo.nano.core/ivy.xml
index 07bceba..fb10f10 100644
--- a/org.eclipse.virgo.kernel.core/ivy.xml
+++ b/org.eclipse.virgo.nano.core/ivy.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency name='com.springsource.org.junit' rev='${org.junit}' org='org.junit' conf='test->runtime'/>
         <dependency name='com.springsource.org.easymock' rev='${org.easymock}' org='org.easymock' conf='test->runtime'/>
-        <dependency name='org.eclipse.virgo.teststubs.osgi' rev='${org.eclipse.virgo.teststubs}' org='org.eclipse.virgo.teststubs' conf='test->runtime'/>
+        <dependency name='org.eclipse.virgo.test.stubs' rev='${org.eclipse.virgo.test}' org='org.eclipse.virgo.test' conf='test->runtime'/>
         <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org='org.eclipse.virgo.mirrored' conf='compile->runtime'/>
 
 		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfo.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfo.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationAdminConfigurationInfo.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationAdminDumpContributor.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminExporter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationAdminExporter.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInfo.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInfo.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationInfo.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationInitialiser.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationInitialiser.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisher.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisher.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConfigurationPublisher.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/ConsoleConfigurationConvertor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ConsoleConfigurationConvertor.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfiguration.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfiguration.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/KernelConfiguration.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/KernelConfigurationPropertiesSource.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/PropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/PropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/PropertiesSource.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardConfigurationExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardConfigurationExporter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/StandardConfigurationExporter.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardKernelConfig.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/StandardKernelConfig.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/StandardKernelConfig.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/UserConfigurationPropertiesSource.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/config/internal/commandline/CommandLinePropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/commandline/CommandLinePropertiesSource.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfEnvironmentPropertiesReader.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfEnvironmentPropertiesReader.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfParseException.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfParseException.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfPropertiesSource.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/config/internal/ovf/OvfPropertiesSource.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/AbortableSignal.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingAbortableSignal.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BlockingSignal.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleStarter.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/BundleUtils.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/ConfigurationExporter.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FailureSignalledException.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/FatalKernelException.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelConfig.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/KernelException.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Shutdown.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/Signal.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/AsyncShutdownDecorator.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/AsyncShutdownDecorator.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/AsyncShutdownDecorator.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/BundleStartTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/BundleStartTracker.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/BundleStartTracker.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/CoreBundleActivator.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatus.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatus.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/KernelStatus.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatusMBean.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/KernelStatusMBean.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/KernelStatusMBean.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ServiceReferenceTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ServiceReferenceTracker.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/ServiceReferenceTracker.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ShutdownManager.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/ShutdownManager.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/ShutdownManager.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/SpringUtils.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/SpringUtils.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/SpringUtils.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StandardBundleStarter.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StandardBundleStarter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/StandardBundleStarter.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/StartupTracker.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/ApplicationContextDependencyMonitor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/ApplicationContextDependencyMonitor.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/StandardTicker.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/StandardTicker.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/Ticker.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/core/internal/blueprint/Ticker.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/diagnostics/KernelLogEvents.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/Assert.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/FatalServerException.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/LogEventDelegate.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java
rename to org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/NonNull.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/DumpCoordinator.aj b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/DumpCoordinator.aj
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/DumpCoordinator.aj
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionState.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionState.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/FFDCExceptionState.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/RegionDigraphDumpContributor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/RegionDigraphDumpContributor.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/ResolutionDumpContributor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/ResolutionDumpContributor.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/ResolutionStateDumper.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/ResolutionStateDumper.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StandardStateWriter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StandardStateWriter.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StandardSystemStateAccessor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StandardSystemStateAccessor.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StateWriter.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/StateWriter.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/SystemStateAccessor.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/dump/internal/SystemStateAccessor.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/serviceability/enforcement/NonNullAssertionEnforcer.aj
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/Scope.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/Scope.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/shim/scope/Scope.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/ScopeFactory.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/scope/ScopeFactory.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/shim/scope/ScopeFactory.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/shim/scope/internal/StandardScopeFactory.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/shim/scope/internal/StandardScopeFactory.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/TracingService.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/kernel/shim/serviceability/TracingService.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/shim/serviceability/TracingService.java
diff --git a/org.eclipse.virgo.kernel.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/kernel/shim/serviceability/internal/Slf4jTracingService.java
similarity index 100%
rename from org.eclipse.virgo.kernel.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/kernel/shim/serviceability/internal/Slf4jTracingService.java
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/EventLogMessages.properties b/org.eclipse.virgo.nano.core/src/main/resources/EventLogMessages.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/resources/EventLogMessages.properties
rename to org.eclipse.virgo.nano.core/src/main/resources/EventLogMessages.properties
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernel_config.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernel_config.xml
rename to org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernel_config.xml
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernelcore.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/resources/OSGI-INF/kernelcore.xml
rename to org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/kernelcore.xml
diff --git a/org.eclipse.virgo.kernel.core/src/main/resources/about.html b/org.eclipse.virgo.nano.core/src/main/resources/about.html
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/main/resources/about.html
rename to org.eclipse.virgo.nano.core/src/main/resources/about.html
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/StubConfiguration.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/StubConfiguration.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/StubConfiguration.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/StubConfiguration.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/StubConfigurationAdmin.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/StubConfigurationAdmin.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/StubConfigurationAdmin.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/StubConfigurationAdmin.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminConfigurationInfoTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationAdminDumpContributorTests.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisherTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisherTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisherTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ConfigurationPublisherTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationPropertiesSourceTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/KernelConfigurationTests.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSourceTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSourceTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSourceTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/UserConfigurationPropertiesSourceTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/commandline/CommandLinePropertiesSourceTests.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReaderTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReaderTests.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReaderTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfEnvironmentPropertiesReaderTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/config/internal/ovf/OvfPropertiesSourceTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/BlockingSignalTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/BundleStartTrackerTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivatorTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/ShutdownManagerTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SpringUtilsTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/SyncTaskExecutor.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/ApplicationContextDependencyMonitorTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/core/internal/blueprint/TickerTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/AssertTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/FFDCExceptionStateTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/dump/internal/ResolutionStateDumperTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java
rename to org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/kernel/serviceability/enforcement/NonNullAssertionEnforcerTests.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/test/AssertingService.java b/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/java/test/AssertingService.java
rename to org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_badprops/noprops.properties b/org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_badprops/noprops.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_badprops/noprops.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_badprops/noprops.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise.config b/org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise.config
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise.config
rename to org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise.config
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise2.config b/org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise2.config
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise2.config
rename to org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_noprops/noise2.config
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_props1/dup.properties b/org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_props1/dup.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_props1/dup.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_props1/dup.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_props2/dup.properties b/org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_props2/dup.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ConfigBundleTests/config_tests_props2/dup.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/ConfigBundleTests/config_tests_props2/dup.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryOne.properties b/org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryOne.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryOne.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryOne.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryTwo.properties b/org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryTwo.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryTwo.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/factoryTwo.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/one.properties b/org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/one.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/one.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/one.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/two.properties b/org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/two.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/two.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/two.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/withServicePid.properties b/org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/withServicePid.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/UserConfigurationPropertiesSourceTests/withServicePid.properties
rename to org.eclipse.virgo.nano.core/src/test/resources/UserConfigurationPropertiesSourceTests/withServicePid.properties
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ovf/environment.xml b/org.eclipse.virgo.nano.core/src/test/resources/ovf/environment.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ovf/environment.xml
rename to org.eclipse.virgo.nano.core/src/test/resources/ovf/environment.xml
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ovf/invalid.xml b/org.eclipse.virgo.nano.core/src/test/resources/ovf/invalid.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ovf/invalid.xml
rename to org.eclipse.virgo.nano.core/src/test/resources/ovf/invalid.xml
diff --git a/org.eclipse.virgo.kernel.core/src/test/resources/ovf/valid.xml b/org.eclipse.virgo.nano.core/src/test/resources/ovf/valid.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.core/src/test/resources/ovf/valid.xml
rename to org.eclipse.virgo.nano.core/src/test/resources/ovf/valid.xml
diff --git a/org.eclipse.virgo.kernel.core/template.mf b/org.eclipse.virgo.nano.core/template.mf
similarity index 100%
rename from org.eclipse.virgo.kernel.core/template.mf
rename to org.eclipse.virgo.nano.core/template.mf
diff --git a/org.eclipse.virgo.deployer.api/.classpath b/org.eclipse.virgo.nano.deployer.api/.classpath
similarity index 100%
rename from org.eclipse.virgo.deployer.api/.classpath
rename to org.eclipse.virgo.nano.deployer.api/.classpath
diff --git a/org.eclipse.virgo.deployer.api/.project b/org.eclipse.virgo.nano.deployer.api/.project
similarity index 100%
rename from org.eclipse.virgo.deployer.api/.project
rename to org.eclipse.virgo.nano.deployer.api/.project
diff --git a/org.eclipse.virgo.deployer.api/.springBeans b/org.eclipse.virgo.nano.deployer.api/.springBeans
similarity index 100%
rename from org.eclipse.virgo.deployer.api/.springBeans
rename to org.eclipse.virgo.nano.deployer.api/.springBeans
diff --git a/org.eclipse.virgo.deployer.api/build.properties b/org.eclipse.virgo.nano.deployer.api/build.properties
similarity index 100%
rename from org.eclipse.virgo.deployer.api/build.properties
rename to org.eclipse.virgo.nano.deployer.api/build.properties
diff --git a/org.eclipse.virgo.deployer.hot/build.xml b/org.eclipse.virgo.nano.deployer.api/build.xml
similarity index 84%
rename from org.eclipse.virgo.deployer.hot/build.xml
rename to org.eclipse.virgo.nano.deployer.api/build.xml
index b868c37..7ef5c4c 100644
--- a/org.eclipse.virgo.deployer.hot/build.xml
+++ b/org.eclipse.virgo.nano.deployer.api/build.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.deployer.hot">
-
-	<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	<import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.nano.deployer.api">
+
+	<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/weaving/default.xml"/>
+
+</project>
diff --git a/org.eclipse.virgo.deployer.api/findbugs-exclude.xml b/org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml
similarity index 100%
rename from org.eclipse.virgo.deployer.api/findbugs-exclude.xml
rename to org.eclipse.virgo.nano.deployer.api/findbugs-exclude.xml
diff --git a/org.eclipse.virgo.deployer.api/ivy.xml b/org.eclipse.virgo.nano.deployer.api/ivy.xml
similarity index 95%
rename from org.eclipse.virgo.deployer.api/ivy.xml
rename to org.eclipse.virgo.nano.deployer.api/ivy.xml
index 3b27304..0c0be11 100644
--- a/org.eclipse.virgo.deployer.api/ivy.xml
+++ b/org.eclipse.virgo.nano.deployer.api/ivy.xml
@@ -14,7 +14,7 @@
 
 	<dependencies>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" 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.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.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/ArtifactIdentity.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/ArtifactIdentity.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentity.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/DeployedArtefactInfo.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/DeployedArtefactInfo.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/DeployedArtefactInfo.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/Deployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/Deployer.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/Deployer.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/RecoveryMonitor.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/RecoveryMonitor.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/RecoveryMonitor.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/config/ConfigurationDeployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/config/ConfigurationDeployer.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/config/ConfigurationDeployer.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/ApplicationDeployer.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/ApplicationDeployer.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/ApplicationDeployer.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployUriNormaliser.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployUriNormaliser.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployUriNormaliser.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployerConfiguration.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployerConfiguration.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerConfiguration.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployerLogEvents.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeployerLogEvents.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeployerLogEvents.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentException.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentException.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentException.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentIdentity.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentIdentity.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentIdentity.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentOptions.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/DeploymentOptions.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptions.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/FatalDeploymentException.java b/org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/java/org/eclipse/virgo/kernel/deployer/core/FatalDeploymentException.java
rename to org.eclipse.virgo.nano.deployer.api/src/main/java/org/eclipse/virgo/nano/deployer/api/core/FatalDeploymentException.java
diff --git a/org.eclipse.virgo.deployer.api/src/main/resources/.gitignore b/org.eclipse.virgo.nano.deployer.api/src/main/resources/.gitignore
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/resources/.gitignore
rename to org.eclipse.virgo.nano.deployer.api/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.deployer.api/src/main/resources/about.html b/org.eclipse.virgo.nano.deployer.api/src/main/resources/about.html
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/main/resources/about.html
rename to org.eclipse.virgo.nano.deployer.api/src/main/resources/about.html
diff --git a/org.eclipse.virgo.deployer.api/src/test/java/.gitignore b/org.eclipse.virgo.nano.deployer.api/src/test/java/.gitignore
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/test/java/.gitignore
rename to org.eclipse.virgo.nano.deployer.api/src/test/java/.gitignore
diff --git a/org.eclipse.virgo.deployer.api/src/test/java/org/eclipse/virgo/kernel/deployer/ArtifactIdentityTests.java b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/test/java/org/eclipse/virgo/kernel/deployer/ArtifactIdentityTests.java
rename to org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/ArtifactIdentityTests.java
diff --git a/org.eclipse.virgo.deployer.api/src/test/java/org/eclipse/virgo/kernel/deployer/core/DeploymentOptionsTests.java b/org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/test/java/org/eclipse/virgo/kernel/deployer/core/DeploymentOptionsTests.java
rename to org.eclipse.virgo.nano.deployer.api/src/test/java/org/eclipse/virgo/nano/deployer/api/core/DeploymentOptionsTests.java
diff --git a/org.eclipse.virgo.deployer.api/src/test/resources/.gitignore b/org.eclipse.virgo.nano.deployer.api/src/test/resources/.gitignore
similarity index 100%
rename from org.eclipse.virgo.deployer.api/src/test/resources/.gitignore
rename to org.eclipse.virgo.nano.deployer.api/src/test/resources/.gitignore
diff --git a/org.eclipse.virgo.deployer.api/template.mf b/org.eclipse.virgo.nano.deployer.api/template.mf
similarity index 100%
rename from org.eclipse.virgo.deployer.api/template.mf
rename to org.eclipse.virgo.nano.deployer.api/template.mf
diff --git a/org.eclipse.virgo.deployer.hot/.classpath b/org.eclipse.virgo.nano.deployer.hot/.classpath
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/.classpath
rename to org.eclipse.virgo.nano.deployer.hot/.classpath
diff --git a/org.eclipse.virgo.deployer.hot/.project b/org.eclipse.virgo.nano.deployer.hot/.project
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/.project
rename to org.eclipse.virgo.nano.deployer.hot/.project
diff --git a/org.eclipse.virgo.deployer.hot/build.xml b/org.eclipse.virgo.nano.deployer.hot/build.xml
similarity index 84%
copy from org.eclipse.virgo.deployer.hot/build.xml
copy to org.eclipse.virgo.nano.deployer.hot/build.xml
index b868c37..f270d30 100644
--- a/org.eclipse.virgo.deployer.hot/build.xml
+++ b/org.eclipse.virgo.nano.deployer.hot/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.deployer.hot">
+<project name="org.eclipse.virgo.nano.deployer.hot">
 
 	<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
 	<property file="${basedir}/../build.properties"/>
diff --git a/org.eclipse.virgo.deployer.hot/findbugs-exclude.xml b/org.eclipse.virgo.nano.deployer.hot/findbugs-exclude.xml
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/findbugs-exclude.xml
rename to org.eclipse.virgo.nano.deployer.hot/findbugs-exclude.xml
diff --git a/org.eclipse.virgo.deployer.hot/ivy.xml b/org.eclipse.virgo.nano.deployer.hot/ivy.xml
similarity index 95%
rename from org.eclipse.virgo.deployer.hot/ivy.xml
rename to org.eclipse.virgo.nano.deployer.hot/ivy.xml
index 5ca127b..58e337d 100644
--- a/org.eclipse.virgo.deployer.hot/ivy.xml
+++ b/org.eclipse.virgo.nano.deployer.hot/ivy.xml
@@ -24,7 +24,7 @@
 		<!-- 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.deployer.api" 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"/>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployer.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployer.java
rename to org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployer.java
diff --git a/org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerFileSystemListener.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerFileSystemListener.java
rename to org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListener.java
diff --git a/org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerLogEvents.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerLogEvents.java
rename to org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerLogEvents.java
diff --git a/org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/WatchTask.java b/org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/java/org/eclipse/virgo/kernel/deployer/hot/WatchTask.java
rename to org.eclipse.virgo.nano.deployer.hot/src/main/java/org/eclipse/virgo/nano/deployer/hot/WatchTask.java
diff --git a/org.eclipse.virgo.deployer.hot/src/main/resources/.gitignore b/org.eclipse.virgo.nano.deployer.hot/src/main/resources/.gitignore
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/resources/.gitignore
rename to org.eclipse.virgo.nano.deployer.hot/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.deployer.hot/src/main/resources/about.html b/org.eclipse.virgo.nano.deployer.hot/src/main/resources/about.html
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/main/resources/about.html
rename to org.eclipse.virgo.nano.deployer.hot/src/main/resources/about.html
diff --git a/org.eclipse.virgo.deployer.hot/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerFileSystemListenerTests.java b/org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerFileSystemListenerTests.java
rename to org.eclipse.virgo.nano.deployer.hot/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerFileSystemListenerTests.java
diff --git a/org.eclipse.virgo.deployer.hot/template.mf b/org.eclipse.virgo.nano.deployer.hot/template.mf
similarity index 100%
rename from org.eclipse.virgo.deployer.hot/template.mf
rename to org.eclipse.virgo.nano.deployer.hot/template.mf
diff --git a/org.eclipse.virgo.nano.deployer/ivy.xml b/org.eclipse.virgo.nano.deployer/ivy.xml
index a8778e9..5841763 100644
--- a/org.eclipse.virgo.nano.deployer/ivy.xml
+++ b/org.eclipse.virgo.nano.deployer/ivy.xml
@@ -20,9 +20,9 @@
 		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
         <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.simpleconfigurator.manipulator" rev="${org.eclipse.equinox.simpleconfigurator.manipulator}" conf="compile->runtime"/>
         <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.simpleconfigurator" rev="${org.eclipse.equinox.simpleconfigurator}" 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.deployer.api" rev="latest.integration" conf="compile->runtime"/>
-		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.hot" 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.nano" name="org.eclipse.virgo.nano.deployer.hot" 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.util" name="org.eclipse.virgo.util.osgi.manifest" 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.kernel.shutdown/.classpath b/org.eclipse.virgo.nano.shutdown/.classpath
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/.classpath
rename to org.eclipse.virgo.nano.shutdown/.classpath
diff --git a/org.eclipse.virgo.kernel.shutdown/.project b/org.eclipse.virgo.nano.shutdown/.project
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/.project
rename to org.eclipse.virgo.nano.shutdown/.project
diff --git a/org.eclipse.virgo.kernel.shutdown/build.xml b/org.eclipse.virgo.nano.shutdown/build.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/build.xml
rename to org.eclipse.virgo.nano.shutdown/build.xml
diff --git a/org.eclipse.virgo.kernel.shutdown/ivy.xml b/org.eclipse.virgo.nano.shutdown/ivy.xml
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/ivy.xml
rename to org.eclipse.virgo.nano.shutdown/ivy.xml
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java
rename to org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfiguration.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java
rename to org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownClient.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java
rename to org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommand.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java
rename to org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParser.java
diff --git a/org.eclipse.virgo.kernel.shutdown/src/main/resources/.gitignore b/org.eclipse.virgo.nano.shutdown/src/main/resources/.gitignore
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/resources/.gitignore
rename to org.eclipse.virgo.nano.shutdown/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.kernel.shutdown/src/main/resources/about.html b/org.eclipse.virgo.nano.shutdown/src/main/resources/about.html
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/main/resources/about.html
rename to org.eclipse.virgo.nano.shutdown/src/main/resources/about.html
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java
rename to org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/KernelAuthenticationConfigurationTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java
rename to org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/Shutdown.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java
rename to org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownClientTests.java
diff --git a/org.eclipse.virgo.kernel.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
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java
rename to org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/kernel/shutdown/ShutdownCommandParserTests.java
diff --git a/org.eclipse.virgo.kernel.shutdown/src/test/resources/test.users.properties b/org.eclipse.virgo.nano.shutdown/src/test/resources/test.users.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.shutdown/src/test/resources/test.users.properties
rename to org.eclipse.virgo.nano.shutdown/src/test/resources/test.users.properties
diff --git a/org.eclipse.virgo.nano.war.deployer/ivy.xml b/org.eclipse.virgo.nano.war.deployer/ivy.xml
index bf8a07a..86521a5 100644
--- a/org.eclipse.virgo.nano.war.deployer/ivy.xml
+++ b/org.eclipse.virgo.nano.war.deployer/ivy.xml
@@ -14,7 +14,7 @@
 
 	<dependencies>
 		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
-		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.api" 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.nano" name="org.eclipse.virgo.nano.deployer" 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.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>