diff --git a/spring-boot-starters/.gitignore b/spring-boot-starters/.gitignore
deleted file mode 100644
index b83d22266a..0000000000
--- a/spring-boot-starters/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/spring-boot-starters/README.MD b/spring-boot-starters/README.MD
deleted file mode 100644
index 2a87b46021..0000000000
--- a/spring-boot-starters/README.MD
+++ /dev/null
@@ -1,2 +0,0 @@
-###The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
deleted file mode 100644
index ae5d9c6617..0000000000
--- a/spring-boot-starters/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<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>com.baeldung</groupId>
-    <artifactId>spring-boot-starters</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>Spring Boot Starters</name>
-    <description>This is simple boot application for Spring boot starters</description>
-
-    <!-- Inherit defaults from Spring Boot -->
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.3.RELEASE</version>
-        <relativePath/>
-    </parent>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp</artifactId>
-            <version>3.1.7</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-boot</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/spring-boot-starters/src/main/resources/application.properties b/spring-boot-starters/src/main/resources/application.properties
deleted file mode 100644
index 6b0388e0c3..0000000000
--- a/spring-boot-starters/src/main/resources/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-server.port=8080
-server.contextPath=/springbootapp
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 368dfa19c1..4ac008cfc8 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -60,6 +60,26 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>3.1.7</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot-starters/src/main/java/org/baeldung/Application.java b/spring-boot/src/main/java/org/baeldung/Application.java
similarity index 84%
rename from spring-boot-starters/src/main/java/org/baeldung/Application.java
rename to spring-boot/src/main/java/org/baeldung/Application.java
index 453264820f..aae0c427a9 100644
--- a/spring-boot-starters/src/main/java/org/baeldung/Application.java
+++ b/spring-boot/src/main/java/org/baeldung/Application.java
@@ -2,9 +2,6 @@ package org.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-
-import java.util.Queue;
 
 @org.springframework.boot.autoconfigure.SpringBootApplication
 public class Application {
diff --git a/spring-boot-starters/src/main/java/org/baeldung/controller/GenericEntityController.java b/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java
similarity index 100%
rename from spring-boot-starters/src/main/java/org/baeldung/controller/GenericEntityController.java
rename to spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java
diff --git a/spring-boot-starters/src/main/java/org/baeldung/domain/GenericEntity.java b/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java
similarity index 100%
rename from spring-boot-starters/src/main/java/org/baeldung/domain/GenericEntity.java
rename to spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java
diff --git a/spring-boot-starters/src/main/java/org/baeldung/repository/GenericEntityRepository.java b/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java
similarity index 100%
rename from spring-boot-starters/src/main/java/org/baeldung/repository/GenericEntityRepository.java
rename to spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java
diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties
index 8ee0ed29bc..78bcf4cc05 100644
--- a/spring-boot/src/main/resources/application.properties
+++ b/spring-boot/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8083
+server.port=8080
 server.contextPath=/springbootapp
 management.port=8081
 management.address=127.0.0.1
diff --git a/spring-boot-starters/src/test/java/org/baeldung/SpringBootApplicationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootApplicationTest.java
similarity index 100%
rename from spring-boot-starters/src/test/java/org/baeldung/SpringBootApplicationTest.java
rename to spring-boot/src/test/java/org/baeldung/SpringBootApplicationTest.java
diff --git a/spring-boot-starters/src/test/java/org/baeldung/SpringBootJPATest.java b/spring-boot/src/test/java/org/baeldung/SpringBootJPATest.java
similarity index 100%
rename from spring-boot-starters/src/test/java/org/baeldung/SpringBootJPATest.java
rename to spring-boot/src/test/java/org/baeldung/SpringBootJPATest.java
diff --git a/spring-boot-starters/src/test/java/org/baeldung/SpringBootMailTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootMailTest.java
similarity index 100%
rename from spring-boot-starters/src/test/java/org/baeldung/SpringBootMailTest.java
rename to spring-boot/src/test/java/org/baeldung/SpringBootMailTest.java
diff --git a/spring-boot-starters/src/test/resources/application.properties b/spring-boot/src/test/resources/application.properties
similarity index 100%
rename from spring-boot-starters/src/test/resources/application.properties
rename to spring-boot/src/test/resources/application.properties