diff --git a/.gitignore b/.gitignore
index f0e5cfbc..9a33f906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /.project
 .settings/
 target/
+/log.roo
 
diff --git a/pom.xml b/pom.xml
index 66db8cf9..8031d864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.samples.spring</groupId>
-	<artifactId>spring-shell</artifactId>
-	<version>1.0.0.CI-SNAPSHOT</version>
+	<groupId>org.springframework.shell</groupId>
+	<artifactId>core</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Spring Shell</name>
 	<url>http://www.springframework.org</url>
diff --git a/samples/helloworld/.gitignore b/samples/helloworld/.gitignore
new file mode 100644
index 00000000..9a33f906
--- /dev/null
+++ b/samples/helloworld/.gitignore
@@ -0,0 +1,6 @@
+/.classpath
+/.project
+.settings/
+target/
+/log.roo
+
diff --git a/samples/helloworld/.project b/samples/helloworld/.project
new file mode 100644
index 00000000..154540ae
--- /dev/null
+++ b/samples/helloworld/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>helloworld</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml
new file mode 100644
index 00000000..fa89c14c
--- /dev/null
+++ b/samples/helloworld/pom.xml
@@ -0,0 +1,137 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.springframework.shell.samples</groupId>
+	<artifactId>helloworld</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>helloworld</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
+		<maven.test.failure.ignore>true</maven.test.failure.ignore>
+		<spring.framework.version>3.1.1.RELEASE</spring.framework.version>
+		<spring.shell.version>1.0.0-SNAPSHOT</spring.shell.version>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.7</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.framework.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring.framework.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.shell</groupId>
+			<artifactId>core</artifactId>
+			<version>${spring.shell.version}</version>
+		</dependency>
+		
+		<!-- CGLIB needed for use of @Configuration class based extension points -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+		</dependency>
+		<!-- consider removing dependency on commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<!-- External modules -->
+		<dependency>
+			<groupId>net.sourceforge.jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>1.0.S2-B</version>
+		</dependency>
+		<dependency>
+			<groupId>org.fusesource.jansi</groupId>
+			<artifactId>jansi</artifactId>
+			<version>1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.8.5</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>${jar.mainclass}</mainClass>
+								</transformer>
+								<!-- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> 
+									<resource>META-INF/spring.handlers</resource> </transformer> <transformer 
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> 
+									<resource>META-INF/spring.schemas</resource> </transformer> -->
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<!-- jline 1.0.S2-B is here http://shrub.appspot.com/spring-roo-repository.springsource.org/release/net/sourceforge/jline/jline/1.0.S2-B/ -->
+	<repositories>
+		<repository>
+			<id>spring-roo-repository</id>
+			<name>Spring Roo Maven Repository</name>
+			<url>http://spring-roo-repository.springsource.org/release</url>
+		</repository>
+	</repositories>
+</project>
diff --git a/src/main/java/org/springframework/shell/plugin/HelloWorldPlugin.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
similarity index 83%
rename from src/main/java/org/springframework/shell/plugin/HelloWorldPlugin.java
rename to samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
index fa79f398..7d9b9674 100644
--- a/src/main/java/org/springframework/shell/plugin/HelloWorldPlugin.java
+++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
@@ -1,4 +1,4 @@
-package org.springframework.shell.plugin;
+package org.springframework.shell.samples.helloworld;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/springframework/shell/commands/HelloWorldCommands.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java
similarity index 91%
rename from src/main/java/org/springframework/shell/commands/HelloWorldCommands.java
rename to samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java
index fc127edc..21e0e5a6 100644
--- a/src/main/java/org/springframework/shell/commands/HelloWorldCommands.java
+++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/HelloWorldCommands.java
@@ -1,4 +1,4 @@
-package org.springframework.shell.commands;
+package org.springframework.shell.samples.helloworld.commands;
 
 import org.springframework.roo.shell.CliAvailabilityIndicator;
 import org.springframework.roo.shell.CliCommand;
diff --git a/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/samples/helloworld/src/main/resources/spring-shell-plugin.xml
similarity index 53%
rename from src/main/resources/META-INF/spring/spring-shell-plugin.xml
rename to samples/helloworld/src/main/resources/spring-shell-plugin.xml
index ab94e0b4..fbbbf616 100644
--- a/src/main/resources/META-INF/spring/spring-shell-plugin.xml
+++ b/samples/helloworld/src/main/resources/spring-shell-plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
   <configuration>
-    <class>org.springframework.shell.plugin.HelloWorldPlugin</class>
+    <class>org.springframework.shell.samples.helloworld.HelloWorldPlugin</class>
   </configuration>
 </plugin>
\ No newline at end of file
diff --git a/src/main/resources/META-INF/spring/test.xml b/src/main/resources/META-INF/spring/test.xml
deleted file mode 100644
index daac473b..00000000
--- a/src/main/resources/META-INF/spring/test.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-
-</beans>