diff --git a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
index 7d9b9674..07477c1a 100644
--- a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
+++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/HelloWorldPlugin.java
@@ -4,7 +4,9 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan({"org.springframework.shell.commands", "org.springframework.shell.converters"})
+@ComponentScan({"org.springframework.shell.commands", 
+				"org.springframework.shell.converters",
+				"org.springframework.shell.samples.helloworld.commands"})
 public class HelloWorldPlugin {
 	
 
diff --git a/samples/helloworld/src/main/resources/spring-shell-plugin.xml b/samples/helloworld/src/main/resources/META-INF/spring/spring-shell-plugin.xml
similarity index 100%
rename from samples/helloworld/src/main/resources/spring-shell-plugin.xml
rename to samples/helloworld/src/main/resources/META-INF/spring/spring-shell-plugin.xml