diff --git a/.gitignore b/.gitignore
index 2edea19340..52c0ca0295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,4 +82,5 @@ jta/transaction-logs/
 software-security/sql-injection-samples/derby.log
 spring-soap/src/main/java/com/baeldung/springsoap/gen/
 /report-*.json
-transaction.log
\ No newline at end of file
+transaction.log
+*-shell.log
\ No newline at end of file
diff --git a/spring-shell/.gitignore b/spring-shell/.gitignore
new file mode 100644
index 0000000000..786d76230c
--- /dev/null
+++ b/spring-shell/.gitignore
@@ -0,0 +1,15 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+*-shell.log
\ No newline at end of file
diff --git a/spring-shell/README.md b/spring-shell/README.md
new file mode 100644
index 0000000000..2762f3a9c0
--- /dev/null
+++ b/spring-shell/README.md
@@ -0,0 +1,3 @@
+### Relevant articles:
+
+- [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
diff --git a/spring-shell/pom.xml b/spring-shell/pom.xml
new file mode 100644
index 0000000000..8d13e4af5e
--- /dev/null
+++ b/spring-shell/pom.xml
@@ -0,0 +1,28 @@
+<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>
+    <artifactId>spring-core-2</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-core-2</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.shell</groupId>
+            <artifactId>spring-shell</artifactId>
+            <version>${org.springframework.shell.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
+    </properties>
+
+</project>
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/Main.java b/spring-shell/src/main/java/org/baeldung/shell/Main.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/Main.java
rename to spring-shell/src/main/java/org/baeldung/shell/Main.java
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleCLI.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
diff --git a/spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
similarity index 100%
rename from spring-core-2/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
diff --git a/spring-core-2/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
similarity index 100%
rename from spring-core-2/src/main/resources/META-INF/spring/spring-shell-plugin.xml
rename to spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
diff --git a/spring-core-2/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java b/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
rename to spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
diff --git a/spring-shell/src/test/resources/.gitignore b/spring-shell/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-shell/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file