diff --git a/settings.gradle b/settings.gradle
index 6873865269..2a76c5c79f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,18 +11,22 @@ include 'hibernate-proxool'
 include 'hibernate-ehcache'
 include 'hibernate-infinispan'
 
+include 'documentation'
+include 'release'
+
 include 'metamodel-generator'
 project(':metamodel-generator').projectDir = new File(rootProject.projectDir, "tooling/metamodel-generator")
 project(':metamodel-generator').name = 'hibernate-jpamodelgen'
 
 include 'hibernate-gradle-plugin'
-include 'hibernate-maven-plugin'
+project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin")
 
-include 'documentation'
-include 'release'
+include 'hibernate-maven-plugin'
+project(':hibernate-maven-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-maven-plugin")
 
 rootProject.children.each { project ->
     project.buildFileName = "${project.name}.gradle"
     assert project.projectDir.isDirectory()
+    assert project.buildFile.exists()
     assert project.buildFile.isFile()
 }
diff --git a/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
similarity index 100%
rename from hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
rename to tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
diff --git a/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy b/tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy
similarity index 100%
rename from hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy
rename to tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/EnhancerTask.groovy
diff --git a/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/HibernatePlugin.java b/tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/HibernatePlugin.java
similarity index 100%
rename from hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/HibernatePlugin.java
rename to tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/tooling/gradle/HibernatePlugin.java
diff --git a/hibernate-gradle-plugin/src/main/resources/META-INF/gradle-plugins/hibernate.properties b/tooling/hibernate-gradle-plugin/src/main/resources/META-INF/gradle-plugins/hibernate.properties
similarity index 100%
rename from hibernate-gradle-plugin/src/main/resources/META-INF/gradle-plugins/hibernate.properties
rename to tooling/hibernate-gradle-plugin/src/main/resources/META-INF/gradle-plugins/hibernate.properties
diff --git a/hibernate-maven-plugin/hibernate-maven-plugin.gradle b/tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle
similarity index 100%
rename from hibernate-maven-plugin/hibernate-maven-plugin.gradle
rename to tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle
diff --git a/hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java
similarity index 100%
rename from hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java
rename to tooling/hibernate-maven-plugin/src/main/java/org/hibernate/bytecode/enhance/plugins/HibernateEnhancementMojo.java