diff --git a/petclinic-data/pom.xml b/petclinic-data/pom.xml
index 3653958b4..deccf5292 100644
--- a/petclinic-data/pom.xml
+++ b/petclinic-data/pom.xml
@@ -10,6 +10,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>petclinic-data</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <properties>
+    <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+  </properties>
 <dependencies>
   <dependency>
     <groupId>org.springframework.boot</groupId>
@@ -30,6 +34,17 @@
     <artifactId>mysql-connector-java</artifactId>
     <scope>runtime</scope>
   </dependency>
+  <dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-test</artifactId>
+    <scope>test</scope>
+    <exclusions>
+      <exclusion>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+      </exclusion>
+    </exclusions>
+  </dependency>
 </dependencies>
   <build>
     <plugins>
diff --git a/petclinic-web/pom.xml b/petclinic-web/pom.xml
index 069f32dab..fc49e1243 100644
--- a/petclinic-web/pom.xml
+++ b/petclinic-web/pom.xml
@@ -14,6 +14,7 @@
   <dependency>
     <groupId>guru.springframework</groupId>
     <artifactId>petclinic-data</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
   </dependency>
   <dependency>
     <groupId>org.springframework.boot</groupId>
@@ -40,6 +41,11 @@
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-thymeleaf</artifactId>
   </dependency>
+  <dependency>
+    <groupId>junit</groupId>
+    <artifactId>junit</artifactId>
+    <scope>test</scope>
+  </dependency>
   <dependency>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-web</artifactId>
diff --git a/src/main/resources/application.properties b/petclinic-web/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to petclinic-web/src/main/resources/application.properties
diff --git a/src/test/java/guru/springframework/springpetclinic/SpringPetclinicApplicationTests.java b/petclinic-web/src/test/java/guru/springframework/springpetclinic/SpringPetclinicApplicationTests.java
similarity index 100%
rename from src/test/java/guru/springframework/springpetclinic/SpringPetclinicApplicationTests.java
rename to petclinic-web/src/test/java/guru/springframework/springpetclinic/SpringPetclinicApplicationTests.java
diff --git a/pom.xml b/pom.xml
index 7a9b7cb34..fec033f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <modules>
-        <module>petclinic-data</module>
+      <module>petclinic-data</module>
       <module>petclinic-web</module>
     </modules>
     <parent>
@@ -24,11 +24,6 @@
   </properties>
 
   <dependencies>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-      </dependency>
   </dependencies>
 
   <build>