diff --git a/parent-boot-1/pom.xml b/parent-boot-1/pom.xml
index c52327a42e..7742841d07 100644
--- a/parent-boot-1/pom.xml
+++ b/parent-boot-1/pom.xml
@@ -37,16 +37,17 @@
 	</dependencies>
 
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.5.15.RELEASE</version>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>1.5.15.RELEASE</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
-
 	<properties>
 		<rest-assured.version>3.1.0</rest-assured.version>
 	</properties>
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 86a77a90db..de6cb5d068 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -36,13 +36,15 @@
     </dependencies>
 
 	<build>
-		<plugins>
-			<plugin>
-			  <groupId>org.springframework.boot</groupId>
-			  <artifactId>spring-boot-maven-plugin</artifactId>
-			  <version>2.0.4.RELEASE</version>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>2.0.4.RELEASE</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 	
     <profiles>
diff --git a/pom.xml b/pom.xml
index 0536a536c2..95c5e23e0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -579,6 +579,7 @@
 				<module>testing-modules/mockserver</module>
 				<module>testing-modules/test-containers</module>
 				<module>undertow</module>
+				<module>vaadin</module>
 				<module>vertx-and-rxjava</module>
 				<module>saas</module>
 				<module>deeplearning4j</module>
@@ -1126,6 +1127,7 @@
 				<module>testing-modules/mockserver</module>
 				<module>testing-modules/test-containers</module>
 				<module>undertow</module>
+				<module>vaadin</module>
 				<module>vertx-and-rxjava</module>
 				<module>saas</module>
 				<module>deeplearning4j</module>
diff --git a/vaadin-spring/pom.xml b/vaadin-spring/pom.xml
deleted file mode 100644
index 09f79f2676..0000000000
--- a/vaadin-spring/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>vaadin-spring</artifactId>
-    <version>0.1.0</version>
-
-    <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-bom</artifactId>
-                <version>10.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/vaadin-spring/src/main/resources/logback.xml b/vaadin-spring/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/vaadin-spring/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/vaadin/README.md b/vaadin/README.md
index 0dfeea8996..43d2cc8961 100644
--- a/vaadin/README.md
+++ b/vaadin/README.md
@@ -1,3 +1,4 @@
 ## Relevant articles:
 
 - [Introduction to Vaadin](http://www.baeldung.com/vaadin)
+- [Sample Application with Spring Boot and Vaadin](https://www.baeldung.com/spring-boot-vaadin)
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index ce2cd592d7..c34ffa3636 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -8,21 +8,30 @@
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
     <name>Vaadin</name>
-    <prerequisites>
-        <maven>3</maven>
-    </prerequisites>
-    
+
     <parent>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
     
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-bom</artifactId>
+                <version>${vaadin.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -41,6 +50,25 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-themes</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-spring-boot-starter</artifactId>
+            <version>${vaadin-spring-boot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -97,21 +125,13 @@
                     <scanIntervalSeconds>2</scanIntervalSeconds>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-bom</artifactId>
-                <version>${vaadin.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <repositories>
         <repository>
             <id>vaadin-addons</id>
@@ -166,6 +186,7 @@
         <servlet.version>3.0.1</servlet.version>
         <vaadin.version>7.7.10</vaadin.version>
         <vaadin.plugin.version>8.0.6</vaadin.plugin.version>
+        <vaadin-spring-boot-starter.version>10.0.1</vaadin-spring-boot-starter.version>
         <jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/vaadin-spring/src/main/java/com/baeldung/Application.java b/vaadin/src/main/java/com/baeldung/Application.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/baeldung/Application.java
rename to vaadin/src/main/java/com/baeldung/Application.java
diff --git a/vaadin-spring/src/main/java/com/baeldung/Employee.java b/vaadin/src/main/java/com/baeldung/Employee.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/baeldung/Employee.java
rename to vaadin/src/main/java/com/baeldung/Employee.java
diff --git a/vaadin-spring/src/main/java/com/baeldung/EmployeeEditor.java b/vaadin/src/main/java/com/baeldung/EmployeeEditor.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/baeldung/EmployeeEditor.java
rename to vaadin/src/main/java/com/baeldung/EmployeeEditor.java
diff --git a/vaadin-spring/src/main/java/com/baeldung/EmployeeRepository.java b/vaadin/src/main/java/com/baeldung/EmployeeRepository.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/baeldung/EmployeeRepository.java
rename to vaadin/src/main/java/com/baeldung/EmployeeRepository.java
diff --git a/vaadin-spring/src/main/java/com/baeldung/MainView.java b/vaadin/src/main/java/com/baeldung/MainView.java
similarity index 100%
rename from vaadin-spring/src/main/java/com/baeldung/MainView.java
rename to vaadin/src/main/java/com/baeldung/MainView.java