diff --git a/pom.xml b/pom.xml
index 8031d864..85fd6cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.shell</groupId>
-	<artifactId>core</artifactId>
+	<artifactId>spring-shell</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Spring Shell</name>
@@ -14,12 +14,13 @@
       This project is a minimal jar utility with Spring configuration.
     ]]>
 	</description>
-	
+
 	<properties>
-	 	<jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
+		<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>
-	</properties>	<dependencies>
+	</properties>
+	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -38,8 +39,7 @@
 			<version>${spring.framework.version}</version>
 		</dependency>
 
-                <!-- CGLIB needed for use of @Configuration class based 
-		     extension points -->
+		<!-- CGLIB needed for use of @Configuration class based extension points -->
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib</artifactId>
@@ -50,30 +50,30 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.14</version>
 		</dependency>
-		<!--  consider removing dependency on commons-io -->
+		<!-- 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>    
+			<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>
@@ -86,54 +86,49 @@
 					<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>
+			<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> 
+	</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/
-	-->
+	<!-- 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>
+			<id>spring-roo-repository</id>
+			<name>Spring Roo Maven Repository</name>
+			<url>http://spring-roo-repository.springsource.org/release</url>
 		</repository>
 	</repositories>
 
diff --git a/samples/helloworld/build.gradle b/samples/helloworld/build.gradle
index ac180071..bf013318 100644
--- a/samples/helloworld/build.gradle
+++ b/samples/helloworld/build.gradle
@@ -15,7 +15,9 @@ repositories {
 }
 
 dependencies {
-    compile "org.springframework.shell:core:$springShellVersion"    
+    compile "org.springframework.shell:spring-shell:$springShellVersion" 
+    compile "org.springframework:spring-core:$springVersion"   
+    compile "org.springframework:spring-context-support:$springVersion"
 }
 
 
diff --git a/samples/helloworld/gradle.properties b/samples/helloworld/gradle.properties
index 5f6a31db..b373393d 100644
--- a/samples/helloworld/gradle.properties
+++ b/samples/helloworld/gradle.properties
@@ -1 +1,2 @@
+springVersion = 3.1.1.RELEASE
 springShellVersion=1.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/helloworld/lib/spring-shell-1.0.0-SNAPSHOT.jar b/samples/helloworld/lib/spring-shell-1.0.0-SNAPSHOT.jar
new file mode 100644
index 00000000..34e094d8
Binary files /dev/null and b/samples/helloworld/lib/spring-shell-1.0.0-SNAPSHOT.jar differ
diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml
index c8e0a346..2df9160f 100644
--- a/samples/helloworld/pom.xml
+++ b/samples/helloworld/pom.xml
@@ -11,9 +11,6 @@
 	<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>
 	
@@ -21,7 +18,7 @@
 				
 		<dependency>
 			<groupId>org.springframework.shell</groupId>
-			<artifactId>core</artifactId>
+			<artifactId>spring-shell</artifactId>
 			<version>${spring.shell.version}</version>
 		</dependency>		
 				
@@ -71,7 +68,63 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-install-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>install-spring-shell-core</id>
+                  <phase>validate</phase>
+                  <goals>
+                     <goal>install-file</goal>
+                  </goals>
+                  <configuration>
+                     <file>lib/spring-shell-1.0.0-SNAPSHOT.jar</file>
+                     <groupId>org.springframework.shell</groupId>
+                     <artifactId>spring-shell</artifactId>
+                     <version>${spring.shell.version}</version>
+                     <packaging>jar</packaging>
+                     <generatePom>true</generatePom>
+                  </configuration>
+               </execution>
+             </executions>
+             </plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-install-plugin
+										</artifactId>
+										<versionRange>
+											[2.3.1,)
+										</versionRange>
+										<goals>
+											<goal>install-file</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</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/ -->
diff --git a/samples/helloworld/readme.txt b/samples/helloworld/readme.txt
index 16c9e77c..de2f24fd 100644
--- a/samples/helloworld/readme.txt
+++ b/samples/helloworld/readme.txt
@@ -1,11 +1,20 @@
 Maven:
 
 1.Build the project
+  $>mvn validate
   $>mvn package
   
 2.run spring shell
   $>java -jar target/helloworld-1.0.0-SNAPSHOT.jar
   
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
   
 Gradle: