diff --git a/settings.gradle b/settings.gradle
index a6b407b3..667c67f7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -48,10 +48,18 @@ include 'spring-shell-docs'
 include 'spring-shell-samples'
 include 'spring-shell-standard'
 include 'spring-shell-standard-commands'
-include 'spring-shell-starter'
-include 'spring-shell-starter-jna'
 include 'spring-shell-table'
 
-rootProject.children.each {project ->
-	project.buildFileName = "${project.name}.gradle"
+file("${rootDir}/spring-shell-starters").eachDirMatch(~/spring-shell-starter.*/) {
+	include "spring-shell-starters:${it.name}"
+}
+
+rootProject.children.each { project ->
+	if (project.name == 'spring-shell-starters') {
+		project.children.each { subproject ->
+		subproject.buildFileName = "${subproject.name}.gradle"
+		}
+	} else {
+		project.buildFileName = "${project.name}.gradle"
+	}
 }
diff --git a/spring-shell-docs/spring-shell-docs.gradle b/spring-shell-docs/spring-shell-docs.gradle
index 605051b2..9ff0e436 100644
--- a/spring-shell-docs/spring-shell-docs.gradle
+++ b/spring-shell-docs/spring-shell-docs.gradle
@@ -6,7 +6,7 @@ description = 'Spring Shell Documentation'
 
 dependencies {
 	management platform(project(":spring-shell-management"))
-	implementation project(':spring-shell-starter')
+	implementation project(':spring-shell-starters:spring-shell-starter')
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
diff --git a/spring-shell-samples/spring-shell-samples.gradle b/spring-shell-samples/spring-shell-samples.gradle
index 53932bdb..740031c6 100644
--- a/spring-shell-samples/spring-shell-samples.gradle
+++ b/spring-shell-samples/spring-shell-samples.gradle
@@ -8,7 +8,7 @@ description = 'Spring Shell Samples'
 
 dependencies {
 	management platform(project(":spring-shell-management"))
-	implementation project(':spring-shell-starter-jna')
+	implementation project(':spring-shell-starters:spring-shell-starter-jna')
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
diff --git a/spring-shell-starter-jna/spring-shell-starter-jna.gradle b/spring-shell-starters/spring-shell-starter-jna/spring-shell-starter-jna.gradle
similarity index 78%
rename from spring-shell-starter-jna/spring-shell-starter-jna.gradle
rename to spring-shell-starters/spring-shell-starter-jna/spring-shell-starter-jna.gradle
index eada79af..61351d75 100644
--- a/spring-shell-starter-jna/spring-shell-starter-jna.gradle
+++ b/spring-shell-starters/spring-shell-starter-jna/spring-shell-starter-jna.gradle
@@ -6,6 +6,6 @@ description = 'Spring Shell Starter Jna'
 
 dependencies {
 	management platform(project(':spring-shell-management'))
-	api(project(':spring-shell-starter'))
+	api(project(':spring-shell-starters:spring-shell-starter'))
 	implementation 'org.jline:jline-terminal-jna'
 }
diff --git a/spring-shell-starter-jna/src/main/resources/META-INF/LICENSE b/spring-shell-starters/spring-shell-starter-jna/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from spring-shell-starter-jna/src/main/resources/META-INF/LICENSE
rename to spring-shell-starters/spring-shell-starter-jna/src/main/resources/META-INF/LICENSE
diff --git a/spring-shell-starter/spring-shell-starter.gradle b/spring-shell-starters/spring-shell-starter/spring-shell-starter.gradle
similarity index 100%
rename from spring-shell-starter/spring-shell-starter.gradle
rename to spring-shell-starters/spring-shell-starter/spring-shell-starter.gradle
diff --git a/spring-shell-starter/src/main/resources/META-INF/LICENSE b/spring-shell-starters/spring-shell-starter/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from spring-shell-starter/src/main/resources/META-INF/LICENSE
rename to spring-shell-starters/spring-shell-starter/src/main/resources/META-INF/LICENSE