diff --git a/langchain4j-google-ai-gemini/pom.xml b/langchain4j-google-ai-gemini-spring-boot-starter/pom.xml
similarity index 65%
rename from langchain4j-google-ai-gemini/pom.xml
rename to langchain4j-google-ai-gemini-spring-boot-starter/pom.xml
index 0beea692..0949d861 100644
--- a/langchain4j-google-ai-gemini/pom.xml
+++ b/langchain4j-google-ai-gemini-spring-boot-starter/pom.xml
@@ -2,30 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>dev.langchain4j</groupId>
+        <artifactId>langchain4j-spring</artifactId>
+        <version>0.37.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>dev.langchain4j</groupId>
-    <artifactId>langchain4j-google-ai-gemini</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>langchain4j-google-ai-gemini</name>
-    <description>langchain4j-google-ai-gemini</description>
-    <url/>
-    <licenses>
-        <license/>
-    </licenses>
-    <developers>
-        <developer/>
-    </developers>
-    <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
-    </scm>
+
+    <artifactId>langchain4j-google-ai-gemini-spring-boot-starter</artifactId>
+
+    <name>Langchain4j Spring Boot Starter for Google Gemini AI Model</name>
+
+
     <properties>
         <java.version>21</java.version>
     </properties>
diff --git a/langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/AutoConfig.java b/langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/AutoConfig.java
similarity index 100%
rename from langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/AutoConfig.java
rename to langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/AutoConfig.java
diff --git a/langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/ChatModelProperties.java b/langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/ChatModelProperties.java
similarity index 100%
rename from langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/ChatModelProperties.java
rename to langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/ChatModelProperties.java
diff --git a/langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/Properties.java b/langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/Properties.java
similarity index 100%
rename from langchain4j-google-ai-gemini/src/main/java/dev/langchain4j/googleaigemini/Properties.java
rename to langchain4j-google-ai-gemini-spring-boot-starter/src/main/java/dev/langchain4j/googleaigemini/Properties.java
diff --git a/langchain4j-google-ai-gemini/src/main/resources/application.properties.local b/langchain4j-google-ai-gemini-spring-boot-starter/src/main/resources/application.properties.local
similarity index 100%
rename from langchain4j-google-ai-gemini/src/main/resources/application.properties.local
rename to langchain4j-google-ai-gemini-spring-boot-starter/src/main/resources/application.properties.local
diff --git a/langchain4j-google-ai-gemini/src/test/java/dev/langchain4j/googleaigemini/Langchain4jGoogleAiGeminiApplicationTests.java b/langchain4j-google-ai-gemini-spring-boot-starter/src/test/java/dev/langchain4j/googleaigemini/Langchain4jGoogleAiGeminiApplicationTests.java
similarity index 100%
rename from langchain4j-google-ai-gemini/src/test/java/dev/langchain4j/googleaigemini/Langchain4jGoogleAiGeminiApplicationTests.java
rename to langchain4j-google-ai-gemini-spring-boot-starter/src/test/java/dev/langchain4j/googleaigemini/Langchain4jGoogleAiGeminiApplicationTests.java
diff --git a/langchain4j-google-ai-gemini/.idea/.gitignore b/langchain4j-google-ai-gemini/.idea/.gitignore
deleted file mode 100644
index 13566b81..00000000
--- a/langchain4j-google-ai-gemini/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/langchain4j-google-ai-gemini/.idea/compiler.xml b/langchain4j-google-ai-gemini/.idea/compiler.xml
deleted file mode 100644
index ed7b6364..00000000
--- a/langchain4j-google-ai-gemini/.idea/compiler.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="langchain4j-google-ai-gemini" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="langchain4j-google-ai-gemini" options="-parameters" />
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/langchain4j-google-ai-gemini/.idea/encodings.xml b/langchain4j-google-ai-gemini/.idea/encodings.xml
deleted file mode 100644
index 63e90019..00000000
--- a/langchain4j-google-ai-gemini/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/langchain4j-google-ai-gemini/.idea/inspectionProfiles/Project_Default.xml b/langchain4j-google-ai-gemini/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index a84f2414..00000000
--- a/langchain4j-google-ai-gemini/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="VulnerableLibrariesLocal" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="isIgnoringEnabled" value="true" />
-      <option name="ignoredModules">
-        <list>
-          <option value="langchain4j-google-ai-gemini" />
-          <option value="langchain4j-google-ai-gemini" />
-        </list>
-      </option>
-      <option name="ignoredPackages">
-        <list>
-          <option value="org.xmlunit:xmlunit-core:2.9.1" />
-          <option value="org.springframework:spring-context:6.1.8" />
-        </list>
-      </option>
-      <option name="ignoredReasons">
-        <list>
-          <option value="Not exploitable" />
-          <option value="Not exploitable" />
-        </list>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/langchain4j-google-ai-gemini/.idea/jarRepositories.xml b/langchain4j-google-ai-gemini/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d9..00000000
--- a/langchain4j-google-ai-gemini/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/langchain4j-google-ai-gemini/.idea/misc.xml b/langchain4j-google-ai-gemini/.idea/misc.xml
deleted file mode 100644
index 6546f14f..00000000
--- a/langchain4j-google-ai-gemini/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/langchain4j-google-ai-gemini/.idea/vcs.xml b/langchain4j-google-ai-gemini/.idea/vcs.xml
deleted file mode 100644
index 288b36b1..00000000
--- a/langchain4j-google-ai-gemini/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file