diff --git a/build.gradle b/build.gradle
index 64bc08fb..354a90e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 ext {
-	moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
+	moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
 }
 
 description = "Spring GraphQL"
diff --git a/settings.gradle b/settings.gradle
index 90c9e383..152d6c65 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,4 +22,4 @@ include 'spring-graphql',
 	'samples:webmvc-http-security',
 	'samples:webflux-security',
 	'samples:webflux-websocket',
-	'docs'
+	'spring-graphql-docs'
diff --git a/docs/build.gradle b/spring-graphql-docs/build.gradle
similarity index 100%
rename from docs/build.gradle
rename to spring-graphql-docs/build.gradle
diff --git a/docs/src/docs/api/overview.html b/spring-graphql-docs/src/docs/api/overview.html
similarity index 100%
rename from docs/src/docs/api/overview.html
rename to spring-graphql-docs/src/docs/api/overview.html
diff --git a/docs/src/docs/api/stylesheet.css b/spring-graphql-docs/src/docs/api/stylesheet.css
similarity index 100%
rename from docs/src/docs/api/stylesheet.css
rename to spring-graphql-docs/src/docs/api/stylesheet.css
diff --git a/docs/src/docs/asciidoc/css/stylesheet.css b/spring-graphql-docs/src/docs/asciidoc/css/stylesheet.css
similarity index 100%
rename from docs/src/docs/asciidoc/css/stylesheet.css
rename to spring-graphql-docs/src/docs/asciidoc/css/stylesheet.css
diff --git a/docs/src/docs/asciidoc/index.adoc b/spring-graphql-docs/src/docs/asciidoc/index.adoc
similarity index 100%
rename from docs/src/docs/asciidoc/index.adoc
rename to spring-graphql-docs/src/docs/asciidoc/index.adoc