diff --git a/ci/scripts/build-smoke-tests.sh b/ci/scripts/build-smoke-tests.sh
index 9781ecf2282..cfb839c0efa 100755
--- a/ci/scripts/build-smoke-tests.sh
+++ b/ci/scripts/build-smoke-tests.sh
@@ -5,5 +5,5 @@ source $(dirname $0)/common.sh
 repository=$(pwd)/distribution-repository
 
 pushd git-repo > /dev/null
-run_maven -f spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
+run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 popd > /dev/null
diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh
index f791917a166..2ff3a71bb37 100755
--- a/ci/scripts/stage.sh
+++ b/ci/scripts/stage.sh
@@ -36,7 +36,7 @@ git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
 
 run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
-run_maven -f spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
+run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 
diff --git a/pom.xml b/pom.xml
index 8fa1949d683..9d8cc672217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,6 @@
 			<modules>
 				<module>spring-boot-project</module>
 				<!-- Smoke tests are built via the invoker plugin -->
-				<module>spring-boot-smoke-tests-invoker</module>
 				<module>spring-boot-tests</module>
 			</modules>
 		</profile>
@@ -121,7 +120,6 @@
 			</activation>
 			<modules>
 				<module>spring-boot-project</module>
-				<module>spring-boot-smoke-tests</module>
 				<module>spring-boot-tests</module>
 			</modules>
 		</profile>
diff --git a/spring-boot-tests/pom.xml b/spring-boot-tests/pom.xml
index 09d78c5bf67..9cf0415d18f 100644
--- a/spring-boot-tests/pom.xml
+++ b/spring-boot-tests/pom.xml
@@ -17,6 +17,7 @@
 	</properties>
 	<modules>
 		<!-- Deployment tests are slow so don't include by default -->
+		<module>spring-boot-smoke-tests-invoker</module>
 		<module>spring-boot-integration-tests</module>
 	</modules>
 	<profiles>
@@ -29,6 +30,7 @@
 				</property>
 			</activation>
 			<modules>
+				<module>spring-boot-smoke-tests-invoker</module>
 				<module>spring-boot-integration-tests</module>
 				<module>spring-boot-deployment-tests</module>
 			</modules>
diff --git a/spring-boot-smoke-tests-invoker/pom.xml b/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml
similarity index 87%
rename from spring-boot-smoke-tests-invoker/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml
index 7b5000a38b9..9dc633c60c3 100644
--- a/spring-boot-smoke-tests-invoker/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml
@@ -6,14 +6,14 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
 		<version>${revision}</version>
-		<relativePath>../spring-boot-project/spring-boot-parent</relativePath>
+		<relativePath>../../spring-boot-project/spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-smoke-tests-invoker</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Boot Smoke Tests Invoker</name>
 	<description>Spring Boot Smoke Tests Invoker</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<build>
 		<plugins>
@@ -23,7 +23,7 @@
 				<artifactId>maven-invoker-plugin</artifactId>
 				<inherited>false</inherited>
 				<configuration>
-					<projectsDirectory>${main.basedir}/spring-boot-smoke-tests</projectsDirectory>
+					<projectsDirectory>${main.basedir}/spring-boot-tests/spring-boot-smoke-tests</projectsDirectory>
 					<skipInvocation>${skipTests}</skipInvocation>
 					<streamLogs>true</streamLogs>
 					<pomIncludes>
@@ -54,7 +54,7 @@
 						<configuration>
 							<target>
 								<delete includeemptydirs="true">
-									<fileset dir="${main.basedir}/spring-boot-smoke-tests"
+									<fileset dir="${main.basedir}/spring-boot-tests/spring-boot-smoke-tests"
 										includes="**/target/" />
 								</delete>
 							</target>
diff --git a/spring-boot-smoke-tests/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/pom.xml
index 4e1ab147e52..390f88dbe10 100644
--- a/spring-boot-smoke-tests/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/pom.xml
@@ -6,14 +6,14 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>${revision}</version>
-		<relativePath>../spring-boot-project/spring-boot-starters/spring-boot-starter-parent</relativePath>
+		<relativePath>../../spring-boot-project/spring-boot-starters/spring-boot-starter-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-smoke-tests</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Boot Smoke Tests</name>
 	<description>Spring Boot Smoke Tests</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<java.version>1.8</java.version>
 		<disable.checks>false</disable.checks>
 	</properties>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml
index b5bc123aeba..4b7a00162f6 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot ActiveMQ Smoke Test</name>
 	<description>Spring Boot ActiveMQ Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Consumer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Consumer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Consumer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Consumer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Producer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Producer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Producer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/Producer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/SampleActiveMQApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/SampleActiveMQApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/SampleActiveMQApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/java/smoketest/activemq/SampleActiveMQApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml
index 57cc81ade8f..522c5508873 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Custom Security Smoke Test</name>
 	<description>Spring Boot Actuator Custom Security Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleRestControllerEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleRestControllerEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleRestControllerEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/ExampleRestControllerEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/error.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/error.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/error.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/error.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/home.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/home.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/home.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/main/resources/templates/home.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/CorsSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/CorsSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/CorsSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/CorsSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/SampleActuatorCustomSecurityApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/resources/application-cors.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/resources/application-cors.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/resources/application-cors.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/resources/application-cors.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml
index 8f0779761e6..0e290068198 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Log4j 2 Smoke Test</name>
 	<description>Spring Boot Actuator Log4j 2 Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/java/smoketest/actuator/log4j2/SampleActuatorLog4J2Application.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/java/smoketest/actuator/log4j2/SampleActuatorLog4J2Application.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/java/smoketest/actuator/log4j2/SampleActuatorLog4J2Application.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/java/smoketest/actuator/log4j2/SampleActuatorLog4J2Application.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/test/java/smoketest/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/test/java/smoketest/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/test/java/smoketest/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/test/java/smoketest/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml
index c270cb1b44a..bede79aab2c 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Non-Web Smoke Test</name>
 	<description>Spring Boot Actuator Non-Web Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/SampleActuatorNoWebApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/ServiceProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/ServiceProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/ServiceProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/java/smoketest/actuator/noweb/ServiceProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/banner.txt b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/banner.txt
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/banner.txt
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/main/resources/banner.txt
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/test/java/smoketest/actuator/noweb/SampleActuatorNoWebApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/test/java/smoketest/actuator/noweb/SampleActuatorNoWebApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/test/java/smoketest/actuator/noweb/SampleActuatorNoWebApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/src/test/java/smoketest/actuator/noweb/SampleActuatorNoWebApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml
index a698ff768b5..2adc145ceb8 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator UI Smoke Test</name>
 	<description>Spring Boot Actuator UI Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/java/smoketest/actuator/ui/SampleActuatorUiApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/java/smoketest/actuator/ui/SampleActuatorUiApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/java/smoketest/actuator/ui/SampleActuatorUiApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/java/smoketest/actuator/ui/SampleActuatorUiApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/error.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/error.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/error.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/error.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/home.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/home.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/home.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/main/resources/templates/home.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationPortTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationPortTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationPortTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml
index d8c4217e12c..6354934f1ba 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Smoke Test</name>
 	<description>Spring Boot Actuator Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleHealthIndicator.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleHealthIndicator.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleHealthIndicator.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleHealthIndicator.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleInfoContributor.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleInfoContributor.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleInfoContributor.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ExampleInfoContributor.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleActuatorApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ServiceProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ServiceProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ServiceProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/ServiceProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementAddressActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementAddressActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementAddressActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementAddressActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPathSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPathSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPathSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPathSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortWithLazyInitializationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortWithLazyInitializationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortWithLazyInitializationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementPortWithLazyInitializationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/NoManagementSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/NoManagementSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/NoManagementSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ServletPathSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ServletPathSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ServletPathSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ServletPathSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-endpoints.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-endpoints.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-endpoints.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-endpoints.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/docker-compose.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/docker-compose.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-amqp/docker-compose.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/docker-compose.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml
index e5e0a837383..f905e83a876 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot AMQP Smoke Test</name>
 	<description>Spring Boot AMQP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml
index 40fc4b4095c..46710416a88 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Animated Banner Smoke Test</name>
 	<description>Spring Boot Animated Banner Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/java/smoketest/animated/SampleAnimatedBannerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/java/smoketest/animated/SampleAnimatedBannerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/java/smoketest/animated/SampleAnimatedBannerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/java/smoketest/animated/SampleAnimatedBannerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/resources/banner.gif b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/resources/banner.gif
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/resources/banner.gif
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/src/main/resources/banner.gif
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivy.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml
index f8cd8dced4f..cf2a8c96754 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Ant Smoke Test</name>
 	<description>Spring Boot Ant Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<ant.version>1.9.3</ant.version>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/main/java/smoketest/ant/SampleAntApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/main/java/smoketest/ant/SampleAntApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/main/java/smoketest/ant/SampleAntApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/main/java/smoketest/ant/SampleAntApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml
index 7ddb4c464f1..b682162536a 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot AOP Smoke Test</name>
 	<description>Spring Boot AOP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/SampleAopApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/SampleAopApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/SampleAopApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/SampleAopApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/monitor/ServiceMonitor.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/monitor/ServiceMonitor.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/monitor/ServiceMonitor.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/monitor/ServiceMonitor.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/java/smoketest/aop/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/test/java/smoketest/aop/SampleAopApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/test/java/smoketest/aop/SampleAopApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/test/java/smoketest/aop/SampleAopApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/src/test/java/smoketest/aop/SampleAopApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml
index 91c9fd812a6..50f5dbcfc44 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Atmosphere Smoke Test</name>
 	<description>Spring Boot Atmosphere Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/ChatService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/ChatService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/ChatService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/ChatService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/Message.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/Message.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/Message.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/Message.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/SampleAtmosphereApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/SampleAtmosphereApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/SampleAtmosphereApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/java/smoketest/atmosphere/SampleAtmosphereApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/home.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/home.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/home.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/home.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/application.js b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/application.js
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/application.js
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/application.js
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/test/java/smoketest/atmosphere/SampleAtmosphereApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/test/java/smoketest/atmosphere/SampleAtmosphereApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/test/java/smoketest/atmosphere/SampleAtmosphereApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/src/test/java/smoketest/atmosphere/SampleAtmosphereApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml
index 462210765c0..7473a5426c8 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Batch Smoke Test</name>
 	<description>Spring Boot Batch Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml
index 56cbab177de..9cbb563ebfe 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Cache Smoke Test</name>
 	<description>Spring Boot Cache Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CacheManagerCheck.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CacheManagerCheck.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CacheManagerCheck.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CacheManagerCheck.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/Country.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/Country.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/Country.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/Country.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CountryRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CountryRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CountryRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/CountryRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleCacheApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleCacheApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleCacheApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleCacheApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleClient.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleClient.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleClient.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/java/smoketest/cache/SampleClient.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache3.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache3.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache3.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/ehcache3.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/hazelcast.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/main/resources/infinispan.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/test/java/smoketest/cache/SampleCacheApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/test/java/smoketest/cache/SampleCacheApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/test/java/smoketest/cache/SampleCacheApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/test/java/smoketest/cache/SampleCacheApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml
index 44660693aea..379216fde65 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Custom Layout Smoke Test</name>
 	<description>Spring Boot Custom Layout Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/pom.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/pom.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/src/main/java/org/test/SampleApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/src/main/java/org/test/SampleApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/verify.groovy b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/verify.groovy
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/verify.groovy
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/custom/verify.groovy
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/pom.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/pom.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/src/main/java/org/test/SampleApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/src/main/java/org/test/SampleApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/verify.groovy b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/verify.groovy
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/verify.groovy
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/default/verify.groovy
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/settings.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/settings.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/settings.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/it/settings.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayout.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayout.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayout.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayout.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayoutFactory.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayoutFactory.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayoutFactory.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/java/smoketest/layout/SampleLayoutFactory.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/resources/META-INF/spring.factories b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/resources/META-INF/spring.factories
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/test/java/smoketest/layout/Verify.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/test/java/smoketest/layout/Verify.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/test/java/smoketest/layout/Verify.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/src/test/java/smoketest/layout/Verify.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml
index bb274c13cb5..05d510b1ee9 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data Cassandra Smoke Test</name>
 	<description>Spring Boot Data Cassandra Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/OrderedCassandraTestExecutionListener.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/OrderedCassandraTestExecutionListener.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/OrderedCassandraTestExecutionListener.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/OrderedCassandraTestExecutionListener.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/setup.cql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/setup.cql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/setup.cql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/setup.cql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml
similarity index 95%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml
index afff777c886..58a8b51d99b 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/pom.xml
@@ -11,7 +11,7 @@
 	<name>Spring Boot Data Couchbase Smoke Test</name>
 	<description>Spring Boot Data Couchbase Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/User.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/User.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/User.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/User.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/UserRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/UserRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/UserRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/UserRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml
index 75f26158e9a..7f64a443900 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data Elasticsearch Smoke Test</name>
 	<description>Spring Boot Data Elasticsearch Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/test/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/test/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/test/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/test/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml
index e884c979f67..9071172afcb 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data JDBC Smoke Test</name>
 	<description>Spring Boot Data JDBC Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleDataJdbcApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleDataJdbcApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleDataJdbcApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/java/smoketest/data/jdbc/SampleDataJdbcApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/data.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/data.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/data.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/data.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/schema.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/schema.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/schema.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/main/resources/schema.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/CustomerRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/CustomerRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/CustomerRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/CustomerRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/SampleDataJdbcApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/SampleDataJdbcApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/SampleDataJdbcApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/src/test/java/smoketest/data/jdbc/SampleDataJdbcApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml
index a48130a26a4..25694fdfda7 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data JPA Smoke Test</name>
 	<description>Spring Boot Data JPA Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/SampleDataJpaApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/SampleDataJpaApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/SampleDataJpaApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/SampleDataJpaApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/City.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/City.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/City.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/City.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Hotel.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Hotel.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Hotel.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Hotel.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/HotelSummary.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/HotelSummary.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/HotelSummary.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/HotelSummary.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Rating.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Rating.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Rating.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Rating.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/RatingCount.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/RatingCount.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/RatingCount.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/RatingCount.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/ReviewDetails.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/ReviewDetails.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/ReviewDetails.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/ReviewDetails.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/TripType.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/TripType.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/TripType.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/TripType.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CitySearchCriteria.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CitySearchCriteria.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CitySearchCriteria.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CitySearchCriteria.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityServiceImpl.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityServiceImpl.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityServiceImpl.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/CityServiceImpl.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelServiceImpl.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelServiceImpl.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelServiceImpl.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/HotelServiceImpl.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewsSummary.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewsSummary.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewsSummary.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/service/ReviewsSummary.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/import.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/import.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/import.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/resources/import.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SampleDataJpaApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SampleDataJpaApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/SampleDataJpaApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/CityRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/CityRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/CityRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/HotelRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/HotelRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/HotelRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/java/smoketest/data/jpa/service/HotelRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/resources/application-scratch.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/resources/application-scratch.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/resources/application-scratch.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/test/resources/application-scratch.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml
index 5e43bce1e78..60577bc7b8f 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data LDAP Smoke Test</name>
 	<description>Spring Boot Data LDAP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/Person.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/Person.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/Person.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/Person.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/PersonRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/PersonRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/PersonRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/PersonRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/schema.ldif b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/schema.ldif
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/schema.ldif
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/main/resources/schema.ldif
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml
index 8422a367eaa..c36960051b3 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data MongoDB Smoke Test</name>
 	<description>Spring Boot Data MongoDB Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/SampleMongoApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/SampleMongoApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/SampleMongoApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongo/SampleMongoApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml
index a21b1ba7611..30f1b19a2f9 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data Neo4j Smoke Test</name>
 	<description>Spring Boot Data Neo4j Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/SampleNeo4jApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/SampleNeo4jApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/SampleNeo4jApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/java/smoketest/data/neo4j/SampleNeo4jApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/test/java/smoketest/data/neo4j/SampleNeo4jApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/test/java/smoketest/data/neo4j/SampleNeo4jApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/test/java/smoketest/data/neo4j/SampleNeo4jApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/src/test/java/smoketest/data/neo4j/SampleNeo4jApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml
index bf1b2f9e389..5e49d835c84 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data Redis Smoke Test</name>
 	<description>Spring Boot Data Redis Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/main/java/smoketest/data/redis/SampleRedisApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/main/java/smoketest/data/redis/SampleRedisApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/main/java/smoketest/data/redis/SampleRedisApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/main/java/smoketest/data/redis/SampleRedisApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml
index 343845ace83..99a200662d8 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data REST Smoke Test</name>
 	<description>Spring Boot Data REST Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/SampleDataRestApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/SampleDataRestApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/SampleDataRestApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/SampleDataRestApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/City.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/City.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/City.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/City.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/Hotel.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/Hotel.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/Hotel.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/domain/Hotel.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CityRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CityRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CityRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CityRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CitySearchCriteria.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CitySearchCriteria.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CitySearchCriteria.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/CitySearchCriteria.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/HotelRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/HotelRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/HotelRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/java/smoketest/data/rest/service/HotelRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/import.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/import.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/import.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/main/resources/import.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/SampleDataRestApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/SampleDataRestApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/SampleDataRestApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/SampleDataRestApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/service/CityRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/service/CityRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/service/CityRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/java/smoketest/data/rest/service/CityRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/resources/application-scratch.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/resources/application-scratch.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/resources/application-scratch.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/src/test/resources/application-scratch.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml
index 72b5b035c34..5b37b610f1f 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Data Solr Smoke Test</name>
 	<description>Spring Boot Data Solr Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/ProductRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/ProductRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/ProductRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/ProductRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/SampleSolrApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/SampleSolrApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/SampleSolrApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/SampleSolrApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/test/java/smoketest/data/solr/SampleSolrApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/test/java/smoketest/data/solr/SampleSolrApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/test/java/smoketest/data/solr/SampleSolrApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/test/java/smoketest/data/solr/SampleSolrApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml
index 1fbccae1dec..27e09e4b16c 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Developer Tools Smoke Test</name>
 	<description>Spring Boot Developer Tools Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/Message.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/Message.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/Message.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/Message.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/MyController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/MyController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/MyController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/MyController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/SampleDevToolsApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/SampleDevToolsApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/SampleDevToolsApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/java/smoketest/devtools/SampleDevToolsApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/public/public.txt b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/public/public.txt
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/public/public.txt
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/public/public.txt
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/static/css/application.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/static/css/application.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/static/css/application.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/static/css/application.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/templates/hello.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/templates/hello.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/templates/hello.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/main/resources/templates/hello.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/test/java/smoketest/devtools/SampleDevToolsApplicationIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/test/java/smoketest/devtools/SampleDevToolsApplicationIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/test/java/smoketest/devtools/SampleDevToolsApplicationIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-devtools/src/test/java/smoketest/devtools/SampleDevToolsApplicationIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml
index 09471436f65..b2d51ceeffd 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Flyway Smoke Test</name>
 	<description>Spring Boot Flyway Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/PersonRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/PersonRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/PersonRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/PersonRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/SampleFlywayApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/SampleFlywayApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/SampleFlywayApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/SampleFlywayApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/db/migration/V1__init.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/db/migration/V1__init.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/db/migration/V1__init.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/main/resources/db/migration/V1__init.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml
index 8cc6349f110..e482837aefc 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Hateoas Smoke Test</name>
 	<description>Spring Boot Hateoas Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/SampleHateoasApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/SampleHateoasApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/SampleHateoasApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/SampleHateoasApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/Customer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/Customer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/Customer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/CustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/CustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/CustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/CustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/InMemoryCustomerRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/InMemoryCustomerRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/InMemoryCustomerRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/domain/InMemoryCustomerRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/web/CustomerController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/web/CustomerController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/web/CustomerController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/main/java/smoketest/hateoas/web/CustomerController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/test/java/smoketest/hateoas/SampleHateoasApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/test/java/smoketest/hateoas/SampleHateoasApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/test/java/smoketest/hateoas/SampleHateoasApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hateoas/src/test/java/smoketest/hateoas/SampleHateoasApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml
index 3b824579c9e..ec7cb63fe71 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Integration Smoke Test</name>
 	<description>Spring Boot Integration Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleApplicationRunner.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleApplicationRunner.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleApplicationRunner.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleApplicationRunner.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleIntegrationApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleIntegrationApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleIntegrationApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleIntegrationApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleMessageGateway.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleMessageGateway.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleMessageGateway.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/SampleMessageGateway.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/ServiceProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/ServiceProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/ServiceProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/java/smoketest/integration/ServiceProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/producer/ProducerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/producer/ProducerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/producer/ProducerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/producer/ProducerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml
index 75d57cf1cb5..54f604a921a 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Jersey Smoke Test</name>
 	<description>Spring Boot Jersey Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Endpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Endpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Endpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Endpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/JerseyConfig.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/JerseyConfig.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/JerseyConfig.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/JerseyConfig.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/ReverseEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/ReverseEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/ReverseEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/ReverseEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/SampleJerseyApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/SampleJerseyApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/SampleJerseyApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/SampleJerseyApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Service.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Service.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Service.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/main/java/smoketest/jersey/Service.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyApplicationPathAndManagementPortTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyApplicationPathAndManagementPortTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyApplicationPathAndManagementPortTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyApplicationPathAndManagementPortTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/SampleJerseyApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/SampleJerseyApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/SampleJerseyApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/SampleJerseyApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml
index b7e41cb18a9..ef806d8b3fb 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Jetty JSP Smoke Test</name>
 	<description>Spring Boot Jetty JSP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 		<servlet-api.version>3.1.0</servlet-api.version>
 	</properties>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyException.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyException.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyException.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyException.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyRestResponse.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyRestResponse.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyRestResponse.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/MyRestResponse.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/SampleJettyJspApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/SampleJettyJspApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/SampleJettyJspApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/SampleJettyJspApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/java/smoketest/jetty/jsp/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml
index a71d19dbecd..0a0d5cbf351 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Jetty SSL Smoke Test</name>
 	<description>Spring Boot Jetty SSL Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<servlet-api.version>3.1.0</servlet-api.version>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/SampleJettySslApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/SampleJettySslApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/SampleJettySslApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/SampleJettySslApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/java/smoketest/jetty/ssl/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/sample.jks b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/sample.jks
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/sample.jks
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/main/resources/sample.jks
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/test/java/smoketest/jetty/ssl/SampleJettySslApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/test/java/smoketest/jetty/ssl/SampleJettySslApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/test/java/smoketest/jetty/ssl/SampleJettySslApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/src/test/java/smoketest/jetty/ssl/SampleJettySslApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml
index ccdfb1d8b4f..d9bfff21360 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Jetty Smoke Test</name>
 	<description>Spring Boot Jetty Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<servlet-api.version>3.1.0</servlet-api.version>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/ExampleServletContextListener.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/ExampleServletContextListener.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/ExampleServletContextListener.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/ExampleServletContextListener.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/SampleJettyApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/SampleJettyApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/SampleJettyApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/SampleJettyApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/java/smoketest/jetty/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/test/java/smoketest/jetty/SampleJettyApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/test/java/smoketest/jetty/SampleJettyApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/test/java/smoketest/jetty/SampleJettyApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/src/test/java/smoketest/jetty/SampleJettyApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Author.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Book.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookStore.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/BookToBookStore.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/DefaultCatalog.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Keys.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Language.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Public.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/gensrc/main/java/smoketest/jooq/domain/Tables.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml
index 9e17af7bd95..7c68a4324b3 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot jOOQ Smoke Test</name>
 	<description>Spring Boot jOOQ Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/JooqExamples.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/SampleJooqApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/java/smoketest/jooq/util/TangleFreeGeneratorStrategy.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/data.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/reset.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/main/resources/schema.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/src/test/java/smoketest/jooq/SampleJooqApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml
index 0da0ed7d6e4..1bf5115ec27 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot JPA Smoke Test</name>
 	<description>Spring Boot JPA Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/SampleJpaApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/SampleJpaApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/SampleJpaApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/SampleJpaApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Note.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Note.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Note.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Note.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Tag.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Tag.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Tag.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/domain/Tag.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaNoteRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaNoteRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaNoteRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaNoteRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaTagRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaTagRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaTagRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/JpaTagRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/NoteRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/NoteRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/NoteRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/NoteRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/TagRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/TagRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/TagRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/repository/TagRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/web/IndexController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/web/IndexController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/web/IndexController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/java/smoketest/jpa/web/IndexController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/import.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/import.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/import.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/import.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/templates/index.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/templates/index.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/templates/index.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/main/resources/templates/index.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/SampleJpaApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/SampleJpaApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/SampleJpaApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/SampleJpaApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaNoteRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaNoteRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaNoteRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaNoteRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaTagRepositoryIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaTagRepositoryIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaTagRepositoryIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/src/test/java/smoketest/jpa/repository/JpaTagRepositoryIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml
index cd42b7b126b..c4b9e61c067 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Atomikos JTA Smoke Test</name>
 	<description>Spring Boot Atomikos JTA Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Account.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Account.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Account.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Account.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/AccountService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Messages.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Messages.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Messages.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/Messages.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/java/smoketest/atomikos/SampleAtomikosApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/test/java/smoketest/atomikos/SampleAtomikosApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/test/java/smoketest/atomikos/SampleAtomikosApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/test/java/smoketest/atomikos/SampleAtomikosApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-atomikos/src/test/java/smoketest/atomikos/SampleAtomikosApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml
index 40f5ba77c19..f4ada0980f1 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Bitronix JTA Smoke Test</name>
 	<description>Spring Boot Bitronix JTA Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Account.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Account.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Account.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Account.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/AccountService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Messages.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Messages.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Messages.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/Messages.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/SampleBitronixApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/SampleBitronixApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/SampleBitronixApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/java/smoketest/bitronix/SampleBitronixApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/test/java/smoketest/bitronix/SampleBitronixApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/test/java/smoketest/bitronix/SampleBitronixApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/test/java/smoketest/bitronix/SampleBitronixApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-bitronix/src/test/java/smoketest/bitronix/SampleBitronixApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml
index ade9e837851..e8b8ac54147 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/pom.xml
@@ -13,7 +13,7 @@
 	<packaging>war</packaging>
 	<description>Spring Boot JNDI JTA Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Account.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/AccountService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/Messages.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/SampleJndiInitializer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/java/smoketest/jndi/WebController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jta-jndi/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml
index 856f24e5200..5e11bf93297 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot JUnit Jupiter Smoke Test</name>
 	<description>Spring Boot JUnit Jupiter Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/MessageController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/MessageController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/MessageController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/MessageController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/SampleJUnitJupiterApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/SampleJUnitJupiterApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/SampleJUnitJupiterApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/main/java/smoketest/SampleJUnitJupiterApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/test/java/smoketest/SampleJUnitJupiterApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/test/java/smoketest/SampleJUnitJupiterApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/test/java/smoketest/SampleJUnitJupiterApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-jupiter/src/test/java/smoketest/SampleJUnitJupiterApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml
similarity index 95%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml
index d990dc7a618..9573b4312cd 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot JUnit Vintage Smoke Test</name>
 	<description>Spring Boot JUnit Vintage Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/MessageController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/MessageController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/MessageController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/MessageController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/SampleJUnitVintageApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/SampleJUnitVintageApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/SampleJUnitVintageApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/main/java/smoketest/SampleJUnitVintageApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/test/java/smoketest/SampleJUnitVintageApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/test/java/smoketest/SampleJUnitVintageApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/test/java/smoketest/SampleJUnitVintageApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/src/test/java/smoketest/SampleJUnitVintageApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml
index 7f9dd43edb1..0b28e827c47 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Kafka Smoke Test</name>
 	<description>Spring Boot Kafka Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Consumer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Consumer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Consumer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Consumer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Producer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Producer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Producer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/Producer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleKafkaApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleKafkaApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleKafkaApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleKafkaApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleMessage.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleMessage.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleMessage.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/java/smoketest/kafka/SampleMessage.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/SampleKafkaApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/SampleKafkaApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/SampleKafkaApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/SampleKafkaApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml
index 533a1e4c0ea..5f891170094 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Liquibase Smoke Test</name>
 	<description>Spring Boot Liquibase Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/java/smoketest/liquibase/SampleLiquibaseApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/java/smoketest/liquibase/SampleLiquibaseApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/java/smoketest/liquibase/SampleLiquibaseApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/java/smoketest/liquibase/SampleLiquibaseApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/db/changelog/db.changelog-master.yaml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/db/changelog/db.changelog-master.yaml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/db/changelog/db.changelog-master.yaml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/main/resources/db/changelog/db.changelog-master.yaml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml
index ff394f9ef37..b29b693087d 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Logback Smoke Test</name>
 	<description>Spring Boot Logback Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/java/smoketest/logback/SampleLogbackApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/java/smoketest/logback/SampleLogbackApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/java/smoketest/logback/SampleLogbackApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/java/smoketest/logback/SampleLogbackApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/test/java/smoketest/logback/SampleLogbackApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/test/java/smoketest/logback/SampleLogbackApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/test/java/smoketest/logback/SampleLogbackApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/test/java/smoketest/logback/SampleLogbackApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml
index 3656134a9d5..be40d3b9b7c 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot OAuth2 Client Smoke Test</name>
 	<description>Spring Boot OAuth2 Client Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/SampleOAuth2ClientApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/SampleOAuth2ClientApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/SampleOAuth2ClientApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/java/smoketest/oauth2/client/SampleOAuth2ClientApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/resources/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/resources/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/resources/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/main/resources/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/test/java/smoketest/oauth2/client/SampleOAuth2ClientApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/test/java/smoketest/oauth2/client/SampleOAuth2ClientApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/test/java/smoketest/oauth2/client/SampleOAuth2ClientApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/src/test/java/smoketest/oauth2/client/SampleOAuth2ClientApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml
index 77a5eab235f..ba99224013e 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot OAuth2 Resource Server Smoke Test</name>
 	<description>Spring Boot OAuth2 Resource Server Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/resources/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/resources/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/resources/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/main/resources/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleOauth2ResourceServerApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml
index c2897ec97a2..a44de1d4e69 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/pom.xml
@@ -13,7 +13,7 @@
 	<description>Spring Boot Parent Context Smoke Test</description>
 	<properties>
 		<start-class>smoketest.parent.SampleParentContextApplication</start-class>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleParentContextApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleParentContextApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleParentContextApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/SampleParentContextApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/ServiceProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/ServiceProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/ServiceProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/java/smoketest/parent/ServiceProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/consumer/SampleIntegrationParentApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/consumer/SampleIntegrationParentApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/consumer/SampleIntegrationParentApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/consumer/SampleIntegrationParentApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/producer/ProducerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/producer/ProducerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/producer/ProducerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/producer/ProducerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml
index 6580a96ac36..12c4f305b35 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Profile Smoke Test</name>
 	<description>Spring Boot Profile Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/SampleProfileApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/SampleProfileApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/SampleProfileApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/SampleProfileApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GenericService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GenericService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GenericService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GenericService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GoodbyeWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GoodbyeWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GoodbyeWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/GoodbyeWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/MessageService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/MessageService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/MessageService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/java/smoketest/profile/service/MessageService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/resources/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/resources/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/resources/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/main/resources/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/SampleProfileApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/SampleProfileApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/SampleProfileApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/SampleProfileApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml
index d10267d7ad6..eff07a42648 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Property Validation Smoke Test</name>
 	<description>Spring Boot Property Validation Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertiesValidator.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertiesValidator.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertiesValidator.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertiesValidator.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SamplePropertyValidationApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/test/java/smoketest/propertyvalidation/SamplePropertyValidationApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/test/java/smoketest/propertyvalidation/SamplePropertyValidationApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/test/java/smoketest/propertyvalidation/SamplePropertyValidationApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/test/java/smoketest/propertyvalidation/SamplePropertyValidationApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml
similarity index 95%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml
index bca7e67c1b0..cdb4964ece8 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Quartz Smoke Test</name>
 	<description>Spring Boot Quartz Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleJob.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleJob.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleJob.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleJob.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleQuartzApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleQuartzApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleQuartzApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/main/java/smoketest/quartz/SampleQuartzApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/test/java/smoketest/quartz/SampleQuartzApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/test/java/smoketest/quartz/SampleQuartzApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/test/java/smoketest/quartz/SampleQuartzApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/src/test/java/smoketest/quartz/SampleQuartzApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml
index f95bcf96fab..f53064c1b55 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Reactive OAuth2 Client Smoke Test</name>
 	<description>Spring Boot Reactive OAuth2 Client Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/resources/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/resources/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/resources/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/main/resources/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/test/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/test/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/test/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/src/test/java/smoketest/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml
index e85865a6893..5c6394cc733 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Reactive OAuth2 Resource Server Smoke Test</name>
 	<description>Spring Boot OAuth2 Reactive Resource Server Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/resources/application.yml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/resources/application.yml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/resources/application.yml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/main/resources/application.yml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/src/test/java/smoketest/oauth2/resource/SampleReactiveOAuth2ResourceServerApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml
index 28c32b5311e..4ca763b9786 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Secure WebFlux Smoke Test</name>
 	<description>Spring Boot Secure WebFlux Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/EchoHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/EchoHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/EchoHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/EchoHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/SampleSecureWebFluxApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/SampleSecureWebFluxApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/SampleSecureWebFluxApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/SampleSecureWebFluxApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/java/smoketest/secure/webflux/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/ManagementPortSampleSecureWebFluxTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/ManagementPortSampleSecureWebFluxTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/ManagementPortSampleSecureWebFluxTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/ManagementPortSampleSecureWebFluxTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/src/test/java/smoketest/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml
index 27ef9da43fa..cfc9711a65d 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Security Smoke Test</name>
 	<description>Spring Boot Security Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleSecureApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleSecureApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleSecureApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleSecureApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/java/smoketest/secure/SampleService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/test/java/smoketest/secure/SampleSecureApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/test/java/smoketest/secure/SampleSecureApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/test/java/smoketest/secure/SampleSecureApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure/src/test/java/smoketest/secure/SampleSecureApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml
index b014e065809..72867f57581 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Servlet Smoke Test</name>
 	<description>Spring Boot Servlet Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/java/smoketest/servlet/SampleServletApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/java/smoketest/servlet/SampleServletApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/java/smoketest/servlet/SampleServletApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/java/smoketest/servlet/SampleServletApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml
index 4d8bc5cf3aa..509c48c1689 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/pom.xml
@@ -11,7 +11,7 @@
 	<name>Spring Boot Session WebFlux Smoke Test</name>
 	<description>Spring Boot Session WebFlux Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/HelloRestController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/HelloRestController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/HelloRestController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/HelloRestController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/SampleSessionWebFluxApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/SampleSessionWebFluxApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/SampleSessionWebFluxApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/java/smoketest/session/SampleSessionWebFluxApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/test/java/smoketest/session/SampleSessionWebFluxApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/test/java/smoketest/session/SampleSessionWebFluxApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/test/java/smoketest/session/SampleSessionWebFluxApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux/src/test/java/smoketest/session/SampleSessionWebFluxApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml
index f1623d905db..6e72f0cc5da 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/pom.xml
@@ -11,7 +11,7 @@
 	<name>Spring Boot Session Smoke Test</name>
 	<description>Spring Boot Session Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/HelloRestController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/HelloRestController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/HelloRestController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/HelloRestController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/SampleSessionApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/SampleSessionApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/SampleSessionApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/java/smoketest/session/SampleSessionApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/hazelcast.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/hazelcast.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/hazelcast.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/main/resources/hazelcast.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/test/java/smoketest/session/SampleSessionApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/test/java/smoketest/session/SampleSessionApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-session/src/test/java/smoketest/session/SampleSessionApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session/src/test/java/smoketest/session/SampleSessionApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml
index e31db64c70e..397303d90dd 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Simple Smoke Test</name>
 	<description>Spring Boot Simple Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/ExitException.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/ExitException.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/ExitException.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/ExitException.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleSimpleApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleSimpleApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleSimpleApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleSimpleApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.jpg b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.jpg
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.jpg
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.jpg
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.txt b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.txt
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.txt
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/banner.txt
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SampleSimpleApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SampleSimpleApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SampleSimpleApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SampleSimpleApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SpringTestSampleSimpleApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SpringTestSampleSimpleApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SpringTestSampleSimpleApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/test/java/smoketest/simple/SpringTestSampleSimpleApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml
index ef5cd9c2f49..ed3728b122e 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Test No Mockito Smoke Test</name>
 	<description>Spring Boot Test No Mockito Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/main/java/smoketest/testnomockito/SampleTestNoMockitoApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/main/java/smoketest/testnomockito/SampleTestNoMockitoApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/main/java/smoketest/testnomockito/SampleTestNoMockitoApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/main/java/smoketest/testnomockito/SampleTestNoMockitoApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/test/java/smoketest/testnomockito/SampleTestNoMockitoApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/test/java/smoketest/testnomockito/SampleTestNoMockitoApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/test/java/smoketest/testnomockito/SampleTestNoMockitoApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test-nomockito/src/test/java/smoketest/testnomockito/SampleTestNoMockitoApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml
index 7cbe489a2ce..5a67ac1ca89 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Test Smoke Test</name>
 	<description>Spring Boot Test Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/SampleTestApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/WelcomeCommandLineRunner.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/WelcomeCommandLineRunner.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/WelcomeCommandLineRunner.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/WelcomeCommandLineRunner.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/User.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/User.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/User.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/User.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/UserRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/UserRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/UserRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/UserRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumber.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumber.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumber.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumber.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumberAttributeConverter.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumberAttributeConverter.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumberAttributeConverter.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/domain/VehicleIdentificationNumberAttributeConverter.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/RemoteVehicleDetailsService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/RemoteVehicleDetailsService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/RemoteVehicleDetailsService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/RemoteVehicleDetailsService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/ServiceProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/ServiceProperties.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/ServiceProperties.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/ServiceProperties.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetails.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetails.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetails.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetails.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetailsService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetailsService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetailsService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleDetailsService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleIdentificationNumberNotFoundException.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleIdentificationNumberNotFoundException.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleIdentificationNumberNotFoundException.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/service/VehicleIdentificationNumberNotFoundException.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserNameNotFoundException.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserNameNotFoundException.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserNameNotFoundException.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserNameNotFoundException.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/java/smoketest/test/web/UserVehicleService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/SampleTestApplicationWebIntegrationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/SampleTestApplicationWebIntegrationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/SampleTestApplicationWebIntegrationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/SampleTestApplicationWebIntegrationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserEntityTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserEntityTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserEntityTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserEntityTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserRepositoryTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserRepositoryTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserRepositoryTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/UserRepositoryTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/VehicleIdentificationNumberTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/VehicleIdentificationNumberTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/VehicleIdentificationNumberTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/domain/VehicleIdentificationNumberTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/RemoteVehicleDetailsServiceTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/RemoteVehicleDetailsServiceTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/RemoteVehicleDetailsServiceTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/RemoteVehicleDetailsServiceTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/VehicleDetailsJsonTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/VehicleDetailsJsonTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/VehicleDetailsJsonTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/service/VehicleDetailsJsonTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerHtmlUnitTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerHtmlUnitTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerHtmlUnitTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerHtmlUnitTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerSeleniumTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerSeleniumTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerSeleniumTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerSeleniumTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleServiceTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleServiceTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleServiceTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleServiceTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/data.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/data.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/data.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/data.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/smoketest/test/service/vehicledetails.json b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/smoketest/test/service/vehicledetails.json
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/smoketest/test/service/vehicledetails.json
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/resources/smoketest/test/service/vehicledetails.json
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml
index 2a0a69fde19..b13be3bb8ae 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot TestNG Smoke Test</name>
 	<description>Spring Boot TestNG Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/SampleTestNGApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/java/smoketest/testng/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/resources/public/test.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/resources/public/test.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/resources/public/test.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/main/resources/public/test.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-testng/src/test/java/smoketest/testng/SampleTestNGApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml
index 9bcd0b9a609..95e02403bcd 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Tomcat JSP Smoke Test</name>
 	<description>Spring Boot Tomcat JSP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyException.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyException.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyException.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyException.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyRestResponse.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyRestResponse.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyRestResponse.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/MyRestResponse.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/SampleTomcatJspApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/SampleTomcatJspApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/SampleTomcatJspApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/SampleTomcatJspApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/java/smoketest/tomcat/jsp/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/META-INF/resources/favicon.ico b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/META-INF/resources/favicon.ico
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/META-INF/resources/favicon.ico
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/META-INF/resources/favicon.ico
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/test/java/smoketest/tomcat/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/test/java/smoketest/tomcat/jsp/SampleWebJspApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/test/java/smoketest/tomcat/jsp/SampleWebJspApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/src/test/java/smoketest/tomcat/jsp/SampleWebJspApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml
index 28027c3f7f3..af96ce99cbe 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Multi-Connector Tomcat Smoke Test</name>
 	<description>Spring Boot Multi-Connector Tomcat Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/java/smoketest/tomcat/multiconnector/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/sample.jks b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/sample.jks
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/sample.jks
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/main/resources/sample.jks
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml
index 61a6d43e804..43353548ccb 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Tomcat SSL Smoke Test</name>
 	<description>Spring Boot Tomcat SSL Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/SampleTomcatSslApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/SampleTomcatSslApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/SampleTomcatSslApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/SampleTomcatSslApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/java/smoketest/tomcat/ssl/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/sample.jks b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/sample.jks
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/sample.jks
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/main/resources/sample.jks
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/test/java/smoketest/tomcat/ssl/SampleTomcatSslApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/test/java/smoketest/tomcat/ssl/SampleTomcatSslApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/test/java/smoketest/tomcat/ssl/SampleTomcatSslApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/src/test/java/smoketest/tomcat/ssl/SampleTomcatSslApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml
index 975bc4d086d..b376dd27cf3 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Tomcat Smoke Test</name>
 	<description>Spring Boot Tomcat Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/SampleTomcatApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/SampleTomcatApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/SampleTomcatApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/SampleTomcatApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/java/smoketest/tomcat/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/SampleTomcatApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/SampleTomcatApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/SampleTomcatApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat/src/test/java/smoketest/tomcat/SampleTomcatApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml
index 91c48707d38..a2fd0a9a394 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Traditional Smoke Test</name>
 	<description>Spring Boot Traditional Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/SampleTraditionalApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/SampleTraditionalApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/SampleTraditionalApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/SampleTraditionalApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/config/WebConfig.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/config/WebConfig.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/config/WebConfig.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/java/smoketest/traditional/config/WebConfig.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/views/home.jsp
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/views/home.jsp
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/views/home.jsp
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/index.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/index.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/index.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/index.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/java/smoketest/traditional/SampleTraditionalApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/java/smoketest/traditional/SampleTraditionalApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/java/smoketest/traditional/SampleTraditionalApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/java/smoketest/traditional/SampleTraditionalApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/resources/log4j.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/resources/log4j.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/resources/log4j.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/test/resources/log4j.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml
index b2ea1b76cef..2cafdd9f524 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Undertow SSL Smoke Test</name>
 	<description>Spring Boot Undertow SSL Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/SampleUndertowSslApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/SampleUndertowSslApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/SampleUndertowSslApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/SampleUndertowSslApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/java/smoketest/undertow/ssl/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/sample.jks b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/sample.jks
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/sample.jks
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/main/resources/sample.jks
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/test/java/smoketest/undertow/ssl/SampleUndertowSslApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/test/java/smoketest/undertow/ssl/SampleUndertowSslApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/test/java/smoketest/undertow/ssl/SampleUndertowSslApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/src/test/java/smoketest/undertow/ssl/SampleUndertowSslApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml
index 684fa993627..b19afe60e8a 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Undertow Smoke Test</name>
 	<description>Spring Boot Undertow Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/SampleUndertowApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/SampleUndertowApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/SampleUndertowApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/SampleUndertowApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/web/SampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/web/SampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/web/SampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/java/smoketest/undertow/web/SampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/test/java/smoketest/undertow/SampleUndertowApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/test/java/smoketest/undertow/SampleUndertowApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/test/java/smoketest/undertow/SampleUndertowApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow/src/test/java/smoketest/undertow/SampleUndertowApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml
similarity index 98%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml
index 7763c60ab9c..594be15cce6 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot War Smoke Test</name>
 	<description>Spring Boot War Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/MyController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/MyController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/MyController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/MyController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/SampleWarApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/SampleWarApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/SampleWarApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/java/smoketest/war/SampleWarApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/WEB-INF/custom.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/WEB-INF/custom.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/WEB-INF/custom.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/WEB-INF/custom.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/webapp.txt b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/webapp.txt
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/webapp.txt
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/main/webapp/webapp.txt
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/test/java/smoketest/war/WarApplicationResourceTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/test/java/smoketest/war/WarApplicationResourceTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-war/src/test/java/smoketest/war/WarApplicationResourceTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/src/test/java/smoketest/war/WarApplicationResourceTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml
index 6442f91dc1f..528cd4f21f5 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web FreeMarker Smoke Test</name>
 	<description>Spring Boot Web FreeMarker Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/SampleWebFreeMarkerApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/SampleWebFreeMarkerApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/SampleWebFreeMarkerApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/SampleWebFreeMarkerApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/java/smoketest/freemarker/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/error.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/error.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/error.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/error.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/welcome.ftlh b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/welcome.ftlh
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/welcome.ftlh
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/main/resources/templates/welcome.ftlh
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/test/java/smoketest/freemarker/SampleWebFreeMarkerApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/test/java/smoketest/freemarker/SampleWebFreeMarkerApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/test/java/smoketest/freemarker/SampleWebFreeMarkerApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/src/test/java/smoketest/freemarker/SampleWebFreeMarkerApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml
index aa085d8f358..f182e02b529 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Groovy Templates Smoke Test</name>
 	<description>Spring Boot Web Groovy Templates Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/InMemoryMessageRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/InMemoryMessageRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/InMemoryMessageRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/InMemoryMessageRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/Message.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/Message.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/Message.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/Message.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/MessageRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/MessageRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/MessageRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/MessageRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/SampleGroovyTemplateApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/mvc/MessageController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/mvc/MessageController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/mvc/MessageController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/java/smoketest/groovytemplates/mvc/MessageController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery.validate.js b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery.validate.js
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery.validate.js
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/static/js/jquery.validate.js
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/layout.tpl b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/layout.tpl
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/layout.tpl
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/layout.tpl
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/form.tpl b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/form.tpl
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/form.tpl
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/form.tpl
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/list.tpl b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/list.tpl
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/list.tpl
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/list.tpl
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/view.tpl b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/view.tpl
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/view.tpl
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/main/resources/templates/messages/view.tpl
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/MessageControllerWebTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/MessageControllerWebTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/MessageControllerWebTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/MessageControllerWebTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/SampleGroovyTemplateApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/SampleGroovyTemplateApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/SampleGroovyTemplateApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/src/test/java/smoketest/groovytemplates/SampleGroovyTemplateApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml
index cdd248ac357..66ef461b764 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Web JSP Smoke Test</name>
 	<description>Spring Boot Web JSP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/SampleWebJspApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/SampleWebJspApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/SampleWebJspApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/SampleWebJspApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/java/smoketest/jsp/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/error.jsp b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/error.jsp
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/error.jsp
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/error.jsp
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/test/java/smoketest/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/test/java/smoketest/jsp/SampleWebJspApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/test/java/smoketest/jsp/SampleWebJspApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/src/test/java/smoketest/jsp/SampleWebJspApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml
index fb484c8b39e..53e0e36dcc4 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Method Security Smoke Test</name>
 	<description>Spring Boot Web Method Security Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/access.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/access.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/access.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/access.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/error.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/error.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/error.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/error.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/home.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/home.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/home.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/home.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/login.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/login.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/login.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/main/resources/templates/login.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/test/java/smoketest/security/method/SampleMethodSecurityApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/test/java/smoketest/security/method/SampleMethodSecurityApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/test/java/smoketest/security/method/SampleMethodSecurityApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/test/java/smoketest/security/method/SampleMethodSecurityApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml
index 1128fd1e8c9..67d5f40065a 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Mustache Smoke Test</name>
 	<description>Spring Boot Web Mustache Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/SampleWebMustacheApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/SampleWebMustacheApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/SampleWebMustacheApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/SampleWebMustacheApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/java/smoketest/mustache/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/503.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/503.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/503.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/503.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/5xx.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/5xx.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/5xx.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/public/error/5xx.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error.mustache b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error.mustache
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error.mustache
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error.mustache
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error/507.mustache b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error/507.mustache
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error/507.mustache
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/error/507.mustache
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/welcome.mustache b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/welcome.mustache
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/welcome.mustache
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/main/resources/templates/welcome.mustache
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/test/java/smoketest/mustache/SampleWebMustacheApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/test/java/smoketest/mustache/SampleWebMustacheApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/test/java/smoketest/mustache/SampleWebMustacheApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/src/test/java/smoketest/mustache/SampleWebMustacheApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml
index d69e108f788..e08a2f29e44 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Secure Custom Smoke Test</name>
 	<description>Spring Boot Web Secure Custom Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/error.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/error.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/error.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/error.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/home.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/home.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/home.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/home.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/login.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/login.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/login.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/main/resources/templates/login.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml
index db607772c9e..e1718821913 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Secure JDBC Smoke Test</name>
 	<description>Spring Boot Web Secure JDBC Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/data.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/data.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/data.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/data.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/schema.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/schema.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/schema.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/schema.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/error.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/error.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/error.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/error.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/home.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/home.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/home.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/home.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/login.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/login.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/login.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/main/resources/templates/login.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml
index b6f700e81a5..11b43971186 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Secure Smoke Test</name>
 	<description>Spring Boot Web Secure Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/java/smoketest/web/secure/SampleWebSecureApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/java/smoketest/web/secure/SampleWebSecureApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/java/smoketest/web/secure/SampleWebSecureApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/java/smoketest/web/secure/SampleWebSecureApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/schema.sql b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/schema.sql
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/schema.sql
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/schema.sql
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/error.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/error.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/error.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/error.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/home.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/home.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/home.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/home.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/login.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/login.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/login.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/main/resources/templates/login.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleSecureApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleSecureApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleSecureApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleSecureApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml
index 208b6c163b6..77ec4dcd797 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Boot Web Static Smoke Test</name>
 	<description>Spring Boot Web Static Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/java/smoketest/web/staticcontent/SampleWebStaticApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/java/smoketest/web/staticcontent/SampleWebStaticApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/java/smoketest/web/staticcontent/SampleWebStaticApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/java/smoketest/web/staticcontent/SampleWebStaticApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html
index 03a317ed605..332bf4c4905 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/main/resources/static/index.html
@@ -22,7 +22,7 @@
 		</div>
 		<div class="navbar-collapse collapse">
 			<ul class="nav navbar-nav">
-				<li><a href="./"> Home </a></li>
+				<li><a href=""> Home </a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/test/java/smoketest/web/staticcontent/SampleWebStaticApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/test/java/smoketest/web/staticcontent/SampleWebStaticApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/test/java/smoketest/web/staticcontent/SampleWebStaticApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/src/test/java/smoketest/web/staticcontent/SampleWebStaticApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml
index 039f82f3320..c8529ae3cd9 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web UI Smoke Test</name>
 	<description>Spring Boot Web UI Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/InMemoryMessageRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/InMemoryMessageRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/InMemoryMessageRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/InMemoryMessageRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/Message.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/Message.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/Message.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/Message.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/MessageRepository.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/MessageRepository.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/MessageRepository.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/MessageRepository.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/SampleWebUiApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/SampleWebUiApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/SampleWebUiApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/SampleWebUiApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/mvc/MessageController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/mvc/MessageController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/mvc/MessageController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/java/smoketest/web/ui/mvc/MessageController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/logback.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/logback.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/logback.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/messages.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/messages.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/messages.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/messages.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/css/bootstrap.min.css b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/css/bootstrap.min.css
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/favicon.ico b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/favicon.ico
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/favicon.ico
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/static/favicon.ico
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/fragments.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/fragments.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/fragments.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/fragments.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/form.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/form.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/form.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/form.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html
similarity index 93%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html
index 3560899411f..c467c68fd00 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/list.html
@@ -27,7 +27,7 @@
 						<td th:text="${#calendars.format(message.created)}">July 11,
 							2012 2:17:16 PM CDT</td>
 						<td><a href="view.html" th:href="@{'/' + ${message.id}}"
-							th:text="${message.summary}"> The summary </a></td>
+                               th:text="${message.summary}"> The summary </a></td>
 					</tr>
 				</tbody>
 			</table>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/view.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/view.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/view.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/main/resources/templates/messages/view.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/MessageControllerWebTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/MessageControllerWebTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/MessageControllerWebTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/MessageControllerWebTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/SampleWebUiApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/SampleWebUiApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/SampleWebUiApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/src/test/java/smoketest/web/ui/SampleWebUiApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml
index f0b7b169fe2..6295a108929 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot WebFlux Smoke Test</name>
 	<description>Spring Boot WebFlux Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/EchoHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/EchoHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/EchoHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/EchoHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/ExampleController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/ExampleController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/ExampleController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/ExampleController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/SampleWebFluxApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/SampleWebFluxApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/SampleWebFluxApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/SampleWebFluxApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/WelcomeController.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/WelcomeController.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/WelcomeController.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/main/java/smoketest/webflux/WelcomeController.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/test/java/smoketest/webflux/SampleWebFluxApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/test/java/smoketest/webflux/SampleWebFluxApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/test/java/smoketest/webflux/SampleWebFluxApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/test/java/smoketest/webflux/SampleWebFluxApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml
similarity index 97%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml
index 2d0388c87a7..e9670f4cb63 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot Web Services Smoke Test</name>
 	<description>Spring Boot Web Services Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/SampleWebServicesApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/SampleWebServicesApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/SampleWebServicesApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/SampleWebServicesApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/META-INF/schemas/hr.xsd b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/META-INF/schemas/hr.xsd
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/META-INF/schemas/hr.xsd
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/META-INF/schemas/hr.xsd
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/application.properties
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/resources/application.properties
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml
index c67d7df46e2..ea47d8f3656 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot WebSocket Jetty Smoke Test</name>
 	<description>Spring Boot WebSocket Jetty Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/SampleJettyWebSocketsApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/SampleJettyWebSocketsApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/SampleJettyWebSocketsApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/SampleJettyWebSocketsApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/GreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/GreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/GreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/GreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleClientWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleClientWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleClientWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleClientWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleGreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleGreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleGreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/client/SimpleGreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/DefaultEchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/DefaultEchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/DefaultEchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/DefaultEchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/echo/EchoWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/reverse/ReverseWebSocketEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/reverse/ReverseWebSocketEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/reverse/ReverseWebSocketEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/reverse/ReverseWebSocketEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Direction.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Direction.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Direction.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Direction.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Location.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Location.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Location.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Location.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeUtils.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeUtils.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeUtils.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeUtils.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/echo.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/echo.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/echo.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/echo.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/index.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/index.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/index.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/index.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/reverse.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/reverse.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/reverse.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/reverse.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/snake.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/snake.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/snake.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/resources/static/snake.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/SampleWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/SampleWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/SampleWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/SampleWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/snake/SnakeTimerTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/snake/SnakeTimerTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/snake/SnakeTimerTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/test/java/smoketest/websocket/jetty/snake/SnakeTimerTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml
index 32a04f14299..331478bc0e4 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot WebSocket Tomcat Smoke Test</name>
 	<description>Spring Boot WebSocket Tomcat Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/SampleTomcatWebSocketApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/SampleTomcatWebSocketApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/SampleTomcatWebSocketApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/SampleTomcatWebSocketApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/GreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/GreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/GreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/GreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleClientWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleClientWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleClientWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleClientWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleGreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleGreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleGreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/client/SimpleGreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/DefaultEchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/DefaultEchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/DefaultEchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/DefaultEchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/echo/EchoWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Direction.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Direction.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Direction.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Direction.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Location.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Location.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Location.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Location.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeUtils.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeUtils.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeUtils.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeUtils.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/echo.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/echo.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/echo.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/echo.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/index.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/index.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/index.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/index.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/reverse.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/reverse.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/reverse.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/reverse.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/snake.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/snake.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/snake.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/resources/static/snake.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/SampleWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/SampleWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/SampleWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/SampleWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/snake/SnakeTimerTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/snake/SnakeTimerTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/snake/SnakeTimerTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/test/java/smoketest/websocket/tomcat/snake/SnakeTimerTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml
similarity index 96%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml
index 8d97a869994..ee87bdb4de3 100755
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot WebSocket Undertow Smoke Test</name>
 	<description>Spring Boot WebSocket Undertow Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/SampleUndertowWebSocketsApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/SampleUndertowWebSocketsApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/SampleUndertowWebSocketsApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/SampleUndertowWebSocketsApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/GreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/GreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/GreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/GreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleClientWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleClientWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleClientWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleClientWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleGreetingService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleGreetingService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleGreetingService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/client/SimpleGreetingService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/DefaultEchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/DefaultEchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/DefaultEchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/DefaultEchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/echo/EchoWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/reverse/ReverseWebSocketEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/reverse/ReverseWebSocketEndpoint.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/reverse/ReverseWebSocketEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/reverse/ReverseWebSocketEndpoint.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Direction.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Direction.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Direction.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Direction.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Location.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Location.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Location.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Location.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeUtils.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeUtils.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeUtils.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeUtils.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/echo.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/echo.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/echo.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/echo.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/index.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/index.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/index.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/index.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/reverse.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/reverse.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/reverse.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/reverse.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/snake.html b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/snake.html
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/snake.html
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/resources/static/snake.html
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/SampleWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/SampleWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/SampleWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/SampleWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/snake/SnakeTimerTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/snake/SnakeTimerTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/snake/SnakeTimerTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/snake/SnakeTimerTests.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml
similarity index 95%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml
index d93daf947f9..137714c7dac 100644
--- a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/pom.xml
@@ -12,7 +12,7 @@
 	<name>Spring Boot XML Smoke Test</name>
 	<description>Spring Boot XML Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/SampleSpringXmlApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/SampleSpringXmlApplication.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/SampleSpringXmlApplication.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/SampleSpringXmlApplication.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/service/HelloWorldService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/service/HelloWorldService.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/service/HelloWorldService.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/java/smoketest/xml/service/HelloWorldService.java
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/resources/META-INF/application-context.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/resources/META-INF/application-context.xml
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/resources/META-INF/application-context.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/main/resources/META-INF/application-context.xml
diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/test/java/smoketest/xml/SampleSpringXmlApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/test/java/smoketest/xml/SampleSpringXmlApplicationTests.java
similarity index 100%
rename from spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/test/java/smoketest/xml/SampleSpringXmlApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-xml/src/test/java/smoketest/xml/SampleSpringXmlApplicationTests.java