diff --git a/spring-shell/src/main/java/org/baeldung/shell/Main.java b/spring-shell/src/main/java/com/baeldung/shell/Main.java
similarity index 87%
rename from spring-shell/src/main/java/org/baeldung/shell/Main.java
rename to spring-shell/src/main/java/com/baeldung/shell/Main.java
index 3d9f7a5860..97871394f7 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/Main.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/Main.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell;
+package com.baeldung.shell;
 
 import java.io.IOException;
 import org.springframework.shell.Bootstrap;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
similarity index 96%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
index df7a48cd32..dbfde76f8e 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleBannerProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
similarity index 98%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
index f73d9bda00..d8a0aef838 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleCLI.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
similarity index 93%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
index cef53adc69..5936006f11 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
similarity index 93%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
index 9a84954e05..a795d19eed 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimplePromptProvider.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
similarity index 96%
rename from spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
rename to spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
index 4824cfbf05..7615f31ace 100644
--- a/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
+++ b/spring-shell/src/main/java/com/baeldung/shell/simple/SimpleURLConverter.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
index 1b97ab3b59..3ff60f3c08 100644
--- a/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
+++ b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
@@ -8,6 +8,6 @@
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <context:component-scan base-package="org.baeldung.shell.simple"/>
+    <context:component-scan base-package="com.baeldung.shell.simple"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java b/spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
similarity index 98%
rename from spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
rename to spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
index 3ec756e238..53627700c5 100644
--- a/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
+++ b/spring-shell/src/test/java/com/baeldung/shell/simple/SimpleCLIIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.shell.simple;
+package com.baeldung.shell.simple;
 
 import org.junit.AfterClass;
 import org.junit.Assert;