diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6186a8a..24a058d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         id: publish_package
         uses: gradle/gradle-build-action@v2.9.0
         with:
-          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publish closeAndReleaseStagingRepository -x publishStandaloneJarPublicationToGitHubPackagesRepository -x publishStandaloneJarPublicationToSonatypeRepository
+          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publish closeAndReleaseStagingRepository
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OSSRH_USERNAME: ${{ vars.MAVEN_CENTRAL_USERNAME }}
diff --git a/build.gradle b/build.gradle
index 5b16552..fee6aa9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,58 +1,83 @@
 plugins {
-	id "se.bjurr.gradle.java-convention" version "0.+"
-	id "org.wiremock.tools.gradle.publishing" version "0.5.1"
-	id "org.wiremock.tools.gradle.java" version "0.5.1"
-	id "project-report"
+	id "se.bjurr.gradle.bundle-jar" version "1.4.4"
 }
 
-sourceCompatibility = 17
-targetCompatibility = 17
-
-group 'org.wiremock.integrations'
+allprojects {
+	javaExtension {
+		javaVersion = 17
+	}
 
-jar {
-	manifest {
-		attributes 'name': project.name
-		attributes 'Automatic-Module-Name': project.group + "." + project.name
+	tasks.withType(Test).configureEach {
+		useJUnitPlatform()
 	}
 }
 
-// Because older version is set in wiremock-extension-convention
-def wiremockVersion = "3.13.1"
+releaseExtension {
+	nexusUsernameEnvOrProp = "OSSRH_USERNAME"
+	nexusPasswordEnvOrProp = "OSSRH_TOKEN"
+}
 
-configurations {
-	all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
-	all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlets'
-	all*.exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
-	all*.exclude group: 'org.eclipse.jetty.http2', module: 'http2-server'
+signExtension {
+	signingKeyEnvOrProp = "OSSRH_GPG_SECRET_KEY"
+	signingPasswordEnvOrProp = "OSSRH_GPG_SECRET_KEY_PASSWORD"
 }
 
-dependencies {
-	implementation platform("org.eclipse.jetty:jetty-bom:12.0.15")
-	api "org.wiremock:wiremock-jetty12:${wiremockVersion}"
-	api "org.springframework.boot:spring-boot-test:3.4.1"
-	api "org.springframework:spring-test:6.1.13"
-	api "org.slf4j:slf4j-api:2.0.16"
-	api 'org.junit.jupiter:junit-jupiter-api:5.11.2'
-
-	testImplementation "org.wiremock:wiremock-jetty12:${wiremockVersion}"
-	testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.1"
-	testImplementation 'org.assertj:assertj-core:3.27.4'
-	testImplementation platform('org.junit:junit-bom:5.11.2')
-	testImplementation 'org.junit.jupiter:junit-jupiter'
-	testImplementation 'org.junit.platform:junit-platform-launcher'
-	testImplementation 'io.rest-assured:rest-assured:5.5.0'
-	testImplementation 'io.rest-assured:rest-assured:5.5.0'
-	testImplementation "org.springframework.boot:spring-boot-starter-web:3.4.1"
-	testImplementation 'io.cucumber:cucumber-java:7.20.1'
-	testImplementation 'io.cucumber:cucumber-spring:7.20.1'
-	testImplementation 'io.cucumber:cucumber-junit-platform-engine:7.20.1'
-	testImplementation 'org.junit.platform:junit-platform-suite:1.11.4'
-	testImplementation 'org.assertj:assertj-core:3.27.4'
-
-	constraints {
-		implementation('org.apache.commons:commons-compress:1.26.0') {
-			because 'version 1.24.0 has a vulnerability'
+project("wiremock-spring-boot", {
+	dependencies {
+		implementation platform("org.eclipse.jetty:jetty-bom:12.1.3")
+		implementation "org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.3"
+		api "org.wiremock:wiremock-jetty12:3.13.1"
+		api "org.springframework.boot:spring-boot-test:3.5.7"
+		api "org.springframework:spring-test:6.2.12"
+		api "org.slf4j:slf4j-api:2.0.17"
+		api "org.junit.jupiter:junit-jupiter-api:6.0.1"
+
+		testImplementation "org.wiremock:wiremock-jetty12:3.13.1"
+		testImplementation "org.springframework.boot:spring-boot-starter-test:3.5.7"
+		testImplementation "org.assertj:assertj-core:3.27.6"
+		testImplementation platform("org.junit:junit-bom:6.0.1")
+		testImplementation 'org.junit.jupiter:junit-jupiter'
+		testImplementation 'org.junit.platform:junit-platform-launcher'
+		testImplementation "io.rest-assured:rest-assured:5.5.6"
+		testImplementation "io.rest-assured:rest-assured:5.5.6"
+		testImplementation "org.springframework.boot:spring-boot-starter-web:3.5.7"
+		testImplementation "io.cucumber:cucumber-java:7.31.0"
+		testImplementation "io.cucumber:cucumber-spring:7.31.0"
+		testImplementation "io.cucumber:cucumber-junit-platform-engine:7.31.0"
+		testImplementation "org.junit.platform:junit-platform-suite:6.0.1"
+		testImplementation "org.assertj:assertj-core:3.27.6"
+
+		constraints {
+			implementation('org.apache.commons:commons-compress:1.26.0') {
+				because 'version 1.24.0 has a vulnerability'
+			}
 		}
 	}
-}
+})
+
+project("wiremock-spring-boot-standalone", {
+	apply plugin: 'se.bjurr.gradle.shadow'
+
+	shadowJar {
+		relocate "org.wiremock", 'wiremock.org.wiremock'
+		relocate "org", 'wiremock.org'
+		relocate "com.google", 'wiremock.com'
+		relocate "net.minidev", 'wiremock.net'
+		relocate "jakarta.servlet", "wiremock.jakarta"
+		relocate "joptsimple", "wiremock.joptsimple"
+		exclude 'joptsimple/HelpFormatterMessages.properties'
+
+		mergeServiceFiles()
+
+		exclude 'META-INF/maven/**'
+		exclude 'META-INF/versions/17/**'
+		exclude 'META-INF/versions/21/**'
+		exclude 'META-INF/versions/22/**'
+		exclude 'module-info.class'
+		exclude 'handlebars-*.js'
+	}
+
+	dependencies {
+		implementation project(":wiremock-spring-boot")
+	}
+})
diff --git a/gradle.properties b/gradle.properties
index 99bea88..7e76c20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,4 @@
 #Sun Oct 06 08:21:20 CEST 2024
 description=WireMock integration for Spring Boot.
-sourceCompatibility=17
-targetCompatibility=17
+group=org.wiremock.integrations
 version=3.0.0
-baseArtifact=wiremock-spring-boot
-githubRepo=wiremock-spring-boot
-developer.id=tomasbjerre
-developer.name=Tomas Bjerre
-developer.email=tomas.bjerre85@gmail.com
-useShadowJar=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..8bdaf60 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22c..bad7c24 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..adff685 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e..e509b2d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -68,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle b/settings.gradle
index 73f23dc..3993e19 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,4 +6,10 @@ pluginManagement {
 	}
 }
 
-rootProject.name = 'wiremock-spring-boot'
+plugins {
+	id "se.bjurr.gradle.include-virtual" version "1.0.0"
+}
+
+rootProject.name = 'wiremock-spring-boot-base'
+
+includeVirtual "wiremock-spring-boot", "wiremock-spring-boot-standalone"
\ No newline at end of file
diff --git a/src/main/java/org/wiremock/spring/ConfigureWireMock.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/ConfigureWireMock.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/ConfigureWireMock.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/ConfigureWireMock.java
diff --git a/src/main/java/org/wiremock/spring/EnableWireMock.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMock.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/EnableWireMock.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMock.java
diff --git a/src/main/java/org/wiremock/spring/EnableWireMocks.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMocks.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/EnableWireMocks.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMocks.java
diff --git a/src/main/java/org/wiremock/spring/InjectWireMock.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/InjectWireMock.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/InjectWireMock.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/InjectWireMock.java
diff --git a/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java
diff --git a/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java
diff --git a/src/main/java/org/wiremock/spring/internal/Store.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Store.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/Store.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Store.java
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java
similarity index 100%
rename from src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java
rename to wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java
diff --git a/src/main/resources/META-INF/spring.factories b/wiremock-spring-boot/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from src/main/resources/META-INF/spring.factories
rename to wiremock-spring-boot/src/main/resources/META-INF/spring.factories
diff --git a/src/test/files-under-directory/mappings/get.json b/wiremock-spring-boot/src/test/files-under-directory/mappings/get.json
similarity index 100%
rename from src/test/files-under-directory/mappings/get.json
rename to wiremock-spring-boot/src/test/files-under-directory/mappings/get.json
diff --git a/src/test/java/test/ConfigurationValidationTest.java b/wiremock-spring-boot/src/test/java/test/ConfigurationValidationTest.java
similarity index 100%
rename from src/test/java/test/ConfigurationValidationTest.java
rename to wiremock-spring-boot/src/test/java/test/ConfigurationValidationTest.java
diff --git a/src/test/java/test/ExtensionFactoriesTest.java b/wiremock-spring-boot/src/test/java/test/ExtensionFactoriesTest.java
similarity index 100%
rename from src/test/java/test/ExtensionFactoriesTest.java
rename to wiremock-spring-boot/src/test/java/test/ExtensionFactoriesTest.java
diff --git a/src/test/java/test/ExtensionsTest.java b/wiremock-spring-boot/src/test/java/test/ExtensionsTest.java
similarity index 100%
rename from src/test/java/test/ExtensionsTest.java
rename to wiremock-spring-boot/src/test/java/test/ExtensionsTest.java
diff --git a/src/test/java/test/LoggingTest.java b/wiremock-spring-boot/src/test/java/test/LoggingTest.java
similarity index 100%
rename from src/test/java/test/LoggingTest.java
rename to wiremock-spring-boot/src/test/java/test/LoggingTest.java
diff --git a/src/test/java/test/MultiplePropertiesBindingTest.java b/wiremock-spring-boot/src/test/java/test/MultiplePropertiesBindingTest.java
similarity index 100%
rename from src/test/java/test/MultiplePropertiesBindingTest.java
rename to wiremock-spring-boot/src/test/java/test/MultiplePropertiesBindingTest.java
diff --git a/src/test/java/test/NestedClassSingleWireMockTest.java b/wiremock-spring-boot/src/test/java/test/NestedClassSingleWireMockTest.java
similarity index 100%
rename from src/test/java/test/NestedClassSingleWireMockTest.java
rename to wiremock-spring-boot/src/test/java/test/NestedClassSingleWireMockTest.java
diff --git a/src/test/java/test/NestedClassWireMockSpringExtensionTest.java b/wiremock-spring-boot/src/test/java/test/NestedClassWireMockSpringExtensionTest.java
similarity index 100%
rename from src/test/java/test/NestedClassWireMockSpringExtensionTest.java
rename to wiremock-spring-boot/src/test/java/test/NestedClassWireMockSpringExtensionTest.java
diff --git a/src/test/java/test/SinglePropertyBindingTest.java b/wiremock-spring-boot/src/test/java/test/SinglePropertyBindingTest.java
similarity index 100%
rename from src/test/java/test/SinglePropertyBindingTest.java
rename to wiremock-spring-boot/src/test/java/test/SinglePropertyBindingTest.java
diff --git a/src/test/java/test/WireMockSpringExtensionTest.java b/wiremock-spring-boot/src/test/java/test/WireMockSpringExtensionTest.java
similarity index 100%
rename from src/test/java/test/WireMockSpringExtensionTest.java
rename to wiremock-spring-boot/src/test/java/test/WireMockSpringExtensionTest.java
diff --git a/src/test/java/usecases/App.java b/wiremock-spring-boot/src/test/java/usecases/App.java
similarity index 100%
rename from src/test/java/usecases/App.java
rename to wiremock-spring-boot/src/test/java/usecases/App.java
diff --git a/src/test/java/usecases/AutowireNamedWireMockServerTest.java b/wiremock-spring-boot/src/test/java/usecases/AutowireNamedWireMockServerTest.java
similarity index 100%
rename from src/test/java/usecases/AutowireNamedWireMockServerTest.java
rename to wiremock-spring-boot/src/test/java/usecases/AutowireNamedWireMockServerTest.java
diff --git a/src/test/java/usecases/CustomPropertiesTest.java b/wiremock-spring-boot/src/test/java/usecases/CustomPropertiesTest.java
similarity index 100%
rename from src/test/java/usecases/CustomPropertiesTest.java
rename to wiremock-spring-boot/src/test/java/usecases/CustomPropertiesTest.java
diff --git a/src/test/java/usecases/DefaultDirectoryTest.java b/wiremock-spring-boot/src/test/java/usecases/DefaultDirectoryTest.java
similarity index 100%
rename from src/test/java/usecases/DefaultDirectoryTest.java
rename to wiremock-spring-boot/src/test/java/usecases/DefaultDirectoryTest.java
diff --git a/src/test/java/usecases/DefaultInstanceTest.java b/wiremock-spring-boot/src/test/java/usecases/DefaultInstanceTest.java
similarity index 100%
rename from src/test/java/usecases/DefaultInstanceTest.java
rename to wiremock-spring-boot/src/test/java/usecases/DefaultInstanceTest.java
diff --git a/src/test/java/usecases/DefaultPropertiesTest.java b/wiremock-spring-boot/src/test/java/usecases/DefaultPropertiesTest.java
similarity index 100%
rename from src/test/java/usecases/DefaultPropertiesTest.java
rename to wiremock-spring-boot/src/test/java/usecases/DefaultPropertiesTest.java
diff --git a/src/test/java/usecases/EnableWireMockOnSuperClassAndSubClassTest.java b/wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassAndSubClassTest.java
similarity index 100%
rename from src/test/java/usecases/EnableWireMockOnSuperClassAndSubClassTest.java
rename to wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassAndSubClassTest.java
diff --git a/src/test/java/usecases/EnableWireMockOnSuperClassOnlyTest.java b/wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassOnlyTest.java
similarity index 100%
rename from src/test/java/usecases/EnableWireMockOnSuperClassOnlyTest.java
rename to wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassOnlyTest.java
diff --git a/src/test/java/usecases/EnableWireMockOnSuperClassTestSuperClass.java b/wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassTestSuperClass.java
similarity index 100%
rename from src/test/java/usecases/EnableWireMockOnSuperClassTestSuperClass.java
rename to wiremock-spring-boot/src/test/java/usecases/EnableWireMockOnSuperClassTestSuperClass.java
diff --git a/src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java b/wiremock-spring-boot/src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java
similarity index 98%
rename from src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java
rename to wiremock-spring-boot/src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java
index 7a3019b..d128360 100644
--- a/src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java
+++ b/wiremock-spring-boot/src/test/java/usecases/FilesUnderClasspathOverDefaultDirectoryTest.java
@@ -33,7 +33,7 @@ void usesStubFiles() {
             .asPrettyString();
     assertThat(actual)
         .isEqualToIgnoringWhitespace(
-            """
+"""
 [
     {
         "id": 1,
diff --git a/src/test/java/usecases/FilesUnderClasspathTest.java b/wiremock-spring-boot/src/test/java/usecases/FilesUnderClasspathTest.java
similarity index 100%
rename from src/test/java/usecases/FilesUnderClasspathTest.java
rename to wiremock-spring-boot/src/test/java/usecases/FilesUnderClasspathTest.java
diff --git a/src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java b/wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java
similarity index 98%
rename from src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java
rename to wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java
index eb7f843..9be9ce5 100644
--- a/src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java
+++ b/wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryOverDefaultDirectoryTest.java
@@ -34,7 +34,7 @@ void usesStubFiles() {
             .asPrettyString();
     assertThat(actual)
         .isEqualToIgnoringWhitespace(
-            """
+"""
 [
     {
         "id": 1,
diff --git a/src/test/java/usecases/FilesUnderDirectoryTests.java b/wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryTests.java
similarity index 92%
rename from src/test/java/usecases/FilesUnderDirectoryTests.java
rename to wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryTests.java
index 47c3017..5fbfc8c 100644
--- a/src/test/java/usecases/FilesUnderDirectoryTests.java
+++ b/wiremock-spring-boot/src/test/java/usecases/FilesUnderDirectoryTests.java
@@ -27,7 +27,9 @@ void test() {
             .extract()
             .asPrettyString();
 
-    assertThat(actual).isEqualToIgnoringWhitespace("""
+    assertThat(actual)
+        .isEqualToIgnoringWhitespace(
+            """
 				{"wiremockmappingsmock":"yes"}
 				""");
   }
diff --git a/src/test/java/usecases/HttpsAndHttpTest.java b/wiremock-spring-boot/src/test/java/usecases/HttpsAndHttpTest.java
similarity index 100%
rename from src/test/java/usecases/HttpsAndHttpTest.java
rename to wiremock-spring-boot/src/test/java/usecases/HttpsAndHttpTest.java
diff --git a/src/test/java/usecases/HttpsOnlyTest.java b/wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java
similarity index 100%
rename from src/test/java/usecases/HttpsOnlyTest.java
rename to wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java
diff --git a/src/test/java/usecases/InjectDefaultWireMockTest.java b/wiremock-spring-boot/src/test/java/usecases/InjectDefaultWireMockTest.java
similarity index 100%
rename from src/test/java/usecases/InjectDefaultWireMockTest.java
rename to wiremock-spring-boot/src/test/java/usecases/InjectDefaultWireMockTest.java
diff --git a/src/test/java/usecases/InjectNamedWireMockTest.java b/wiremock-spring-boot/src/test/java/usecases/InjectNamedWireMockTest.java
similarity index 100%
rename from src/test/java/usecases/InjectNamedWireMockTest.java
rename to wiremock-spring-boot/src/test/java/usecases/InjectNamedWireMockTest.java
diff --git a/src/test/java/usecases/JavaStubbingTest.java b/wiremock-spring-boot/src/test/java/usecases/JavaStubbingTest.java
similarity index 100%
rename from src/test/java/usecases/JavaStubbingTest.java
rename to wiremock-spring-boot/src/test/java/usecases/JavaStubbingTest.java
diff --git a/src/test/java/usecases/MetaAnnotationRepeatableTest.java b/wiremock-spring-boot/src/test/java/usecases/MetaAnnotationRepeatableTest.java
similarity index 100%
rename from src/test/java/usecases/MetaAnnotationRepeatableTest.java
rename to wiremock-spring-boot/src/test/java/usecases/MetaAnnotationRepeatableTest.java
diff --git a/src/test/java/usecases/MetaAnnotationTest.java b/wiremock-spring-boot/src/test/java/usecases/MetaAnnotationTest.java
similarity index 100%
rename from src/test/java/usecases/MetaAnnotationTest.java
rename to wiremock-spring-boot/src/test/java/usecases/MetaAnnotationTest.java
diff --git a/src/test/java/usecases/MultipleWireMocksTest.java b/wiremock-spring-boot/src/test/java/usecases/MultipleWireMocksTest.java
similarity index 96%
rename from src/test/java/usecases/MultipleWireMocksTest.java
rename to wiremock-spring-boot/src/test/java/usecases/MultipleWireMocksTest.java
index 255f0af..44cf993 100644
--- a/src/test/java/usecases/MultipleWireMocksTest.java
+++ b/wiremock-spring-boot/src/test/java/usecases/MultipleWireMocksTest.java
@@ -45,7 +45,8 @@ void returnsTodos() {
             .willReturn(
                 aResponse()
                     .withHeader("Content-Type", "application/json")
-                    .withBody("""
+                    .withBody(
+                        """
 						{ "id": 1, "name": "Amy" }
 						""")));
 
@@ -54,7 +55,8 @@ void returnsTodos() {
             .willReturn(
                 aResponse()
                     .withHeader("Content-Type", "application/json")
-                    .withBody("""
+                    .withBody(
+                        """
 						{ "id": 2, "name": "John" }
 						""")));
 
diff --git a/src/test/java/usecases/NotEnabledTest.java b/wiremock-spring-boot/src/test/java/usecases/NotEnabledTest.java
similarity index 100%
rename from src/test/java/usecases/NotEnabledTest.java
rename to wiremock-spring-boot/src/test/java/usecases/NotEnabledTest.java
diff --git a/src/test/java/usecases/ResetWireMockBetweenTest.java b/wiremock-spring-boot/src/test/java/usecases/ResetWireMockBetweenTest.java
similarity index 100%
rename from src/test/java/usecases/ResetWireMockBetweenTest.java
rename to wiremock-spring-boot/src/test/java/usecases/ResetWireMockBetweenTest.java
diff --git a/src/test/java/usecases/ResetWireMockDisabledBetweenTest.java b/wiremock-spring-boot/src/test/java/usecases/ResetWireMockDisabledBetweenTest.java
similarity index 100%
rename from src/test/java/usecases/ResetWireMockDisabledBetweenTest.java
rename to wiremock-spring-boot/src/test/java/usecases/ResetWireMockDisabledBetweenTest.java
diff --git a/src/test/java/usecases/ResponseTemplatingGlobalTest.java b/wiremock-spring-boot/src/test/java/usecases/ResponseTemplatingGlobalTest.java
similarity index 100%
rename from src/test/java/usecases/ResponseTemplatingGlobalTest.java
rename to wiremock-spring-boot/src/test/java/usecases/ResponseTemplatingGlobalTest.java
diff --git a/src/test/java/usecases/ResponseTemplatingLocalTest.java b/wiremock-spring-boot/src/test/java/usecases/ResponseTemplatingLocalTest.java
similarity index 93%
rename from src/test/java/usecases/ResponseTemplatingLocalTest.java
rename to wiremock-spring-boot/src/test/java/usecases/ResponseTemplatingLocalTest.java
index 2cfc4ff..9cbdef8 100644
--- a/src/test/java/usecases/ResponseTemplatingLocalTest.java
+++ b/wiremock-spring-boot/src/test/java/usecases/ResponseTemplatingLocalTest.java
@@ -24,7 +24,8 @@ void testLocal() {
     final String actual =
         RestAssured.when().get("/local-templating").then().extract().asPrettyString();
     assertThat(actual)
-        .isEqualToIgnoringWhitespace("""
+        .isEqualToIgnoringWhitespace(
+"""
 {
     "name": "Resolved: local-templating"
 }
@@ -37,7 +38,8 @@ void testGlobal() {
     final String actual =
         RestAssured.when().get("/global-templating").then().extract().asPrettyString();
     assertThat(actual)
-        .isEqualToIgnoringWhitespace("""
+        .isEqualToIgnoringWhitespace(
+"""
 {
     "name": "Resolved: {{request.path.[0]}}"
 }
diff --git a/src/test/java/usecases/SingleNamedWireMockTest.java b/wiremock-spring-boot/src/test/java/usecases/SingleNamedWireMockTest.java
similarity index 96%
rename from src/test/java/usecases/SingleNamedWireMockTest.java
rename to wiremock-spring-boot/src/test/java/usecases/SingleNamedWireMockTest.java
index ff4441c..9c50784 100644
--- a/src/test/java/usecases/SingleNamedWireMockTest.java
+++ b/wiremock-spring-boot/src/test/java/usecases/SingleNamedWireMockTest.java
@@ -31,7 +31,8 @@ void usesJavaStubbing() {
             .willReturn(
                 aResponse()
                     .withHeader("Content-Type", "application/json")
-                    .withBody("""
+                    .withBody(
+                        """
 						{ "id": 2, "name": "Amy" }
 						""")));
 
diff --git a/src/test/java/usecases/UsePortFromPropertyTest.java b/wiremock-spring-boot/src/test/java/usecases/UsePortFromPropertyTest.java
similarity index 100%
rename from src/test/java/usecases/UsePortFromPropertyTest.java
rename to wiremock-spring-boot/src/test/java/usecases/UsePortFromPropertyTest.java
diff --git a/src/test/java/usecases/cucumber/CucumberConstants.java b/wiremock-spring-boot/src/test/java/usecases/cucumber/CucumberConstants.java
similarity index 100%
rename from src/test/java/usecases/cucumber/CucumberConstants.java
rename to wiremock-spring-boot/src/test/java/usecases/cucumber/CucumberConstants.java
diff --git a/src/test/java/usecases/cucumber/CucumberSpringConfiguration.java b/wiremock-spring-boot/src/test/java/usecases/cucumber/CucumberSpringConfiguration.java
similarity index 100%
rename from src/test/java/usecases/cucumber/CucumberSpringConfiguration.java
rename to wiremock-spring-boot/src/test/java/usecases/cucumber/CucumberSpringConfiguration.java
diff --git a/src/test/java/usecases/cucumber/RunCucumberTest.java b/wiremock-spring-boot/src/test/java/usecases/cucumber/RunCucumberTest.java
similarity index 100%
rename from src/test/java/usecases/cucumber/RunCucumberTest.java
rename to wiremock-spring-boot/src/test/java/usecases/cucumber/RunCucumberTest.java
diff --git a/src/test/java/usecases/cucumber/Steps.java b/wiremock-spring-boot/src/test/java/usecases/cucumber/Steps.java
similarity index 100%
rename from src/test/java/usecases/cucumber/Steps.java
rename to wiremock-spring-boot/src/test/java/usecases/cucumber/Steps.java
diff --git a/src/test/resources/custom-location/mappings/todos.json b/wiremock-spring-boot/src/test/resources/custom-location/mappings/todos.json
similarity index 100%
rename from src/test/resources/custom-location/mappings/todos.json
rename to wiremock-spring-boot/src/test/resources/custom-location/mappings/todos.json
diff --git a/src/test/resources/response-templating/mappings/global-templating.json b/wiremock-spring-boot/src/test/resources/response-templating/mappings/global-templating.json
similarity index 100%
rename from src/test/resources/response-templating/mappings/global-templating.json
rename to wiremock-spring-boot/src/test/resources/response-templating/mappings/global-templating.json
diff --git a/src/test/resources/response-templating/mappings/local-templating-enabled.json b/wiremock-spring-boot/src/test/resources/response-templating/mappings/local-templating-enabled.json
similarity index 100%
rename from src/test/resources/response-templating/mappings/local-templating-enabled.json
rename to wiremock-spring-boot/src/test/resources/response-templating/mappings/local-templating-enabled.json
diff --git a/src/test/resources/usecases/cucumber/test.feature b/wiremock-spring-boot/src/test/resources/usecases/cucumber/test.feature
similarity index 100%
rename from src/test/resources/usecases/cucumber/test.feature
rename to wiremock-spring-boot/src/test/resources/usecases/cucumber/test.feature
diff --git a/src/test/resources/wiremock/mappings/get-stuff.json b/wiremock-spring-boot/src/test/resources/wiremock/mappings/get-stuff.json
similarity index 100%
rename from src/test/resources/wiremock/mappings/get-stuff.json
rename to wiremock-spring-boot/src/test/resources/wiremock/mappings/get-stuff.json
diff --git a/src/test/resources/wiremock/user-client/mappings/get-users.json b/wiremock-spring-boot/src/test/resources/wiremock/user-client/mappings/get-users.json
similarity index 100%
rename from src/test/resources/wiremock/user-client/mappings/get-users.json
rename to wiremock-spring-boot/src/test/resources/wiremock/user-client/mappings/get-users.json