diff --git a/models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java b/models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/embedding/PostgresMlEmbeddingClient.java
similarity index 96%
rename from models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java
rename to models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/embedding/PostgresMlEmbeddingClient.java
index 026ee391540..bd53145c887 100644
--- a/models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java
+++ b/models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/embedding/PostgresMlEmbeddingClient.java
@@ -1,4 +1,4 @@
-package org.springframework.ai.embedding;
+package org.springframework.ai.postgresml.embedding;
 
 import java.sql.Array;
 import java.sql.PreparedStatement;
@@ -12,6 +12,9 @@
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.MetadataMode;
+import org.springframework.ai.embedding.AbstractEmbeddingClient;
+import org.springframework.ai.embedding.Embedding;
+import org.springframework.ai.embedding.EmbeddingResponse;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
diff --git a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java
index e4324a3eddb..6e61dea9e3c 100644
--- a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java
+++ b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.ai.postgresml.embedding.PostgresMlEmbeddingClient;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.junit.jupiter.Container;
@@ -18,7 +19,7 @@
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.MetadataMode;
-import org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType;
+import org.springframework.ai.postgresml.embedding.PostgresMlEmbeddingClient.VectorType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
@@ -27,8 +28,8 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType.PG_ARRAY;
-import static org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType.PG_VECTOR;
+import static org.springframework.ai.postgresml.embedding.PostgresMlEmbeddingClient.VectorType.PG_ARRAY;
+import static org.springframework.ai.postgresml.embedding.PostgresMlEmbeddingClient.VectorType.PG_VECTOR;
 
 /**
  * @author Toshiaki Maki
diff --git a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java b/models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/ResourceCacheService.java
similarity index 99%
rename from models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java
rename to models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/ResourceCacheService.java
index 47a281764ba..cbc160f2d07 100644
--- a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java
+++ b/models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/ResourceCacheService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.embedding;
+package org.springframework.ai.sbert.embedding;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java b/models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/TransformersEmbeddingClient.java
similarity index 97%
rename from models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java
rename to models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/TransformersEmbeddingClient.java
index c61d0ee255e..3160eedd889 100644
--- a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java
+++ b/models/spring-ai-transformers/src/main/java/org/springframework/ai/sbert/embedding/TransformersEmbeddingClient.java
@@ -1,4 +1,4 @@
-package org.springframework.ai.embedding;
+package org.springframework.ai.sbert.embedding;
 
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
@@ -23,6 +23,9 @@
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.MetadataMode;
+import org.springframework.ai.embedding.AbstractEmbeddingClient;
+import org.springframework.ai.embedding.Embedding;
+import org.springframework.ai.embedding.EmbeddingResponse;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java
index 9cc44f2b950..6efe124e9f6 100644
--- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java
+++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.springframework.ai.sbert.embedding.ResourceCacheService;
 import org.springframework.core.io.DefaultResourceLoader;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java
index aea25226e4e..27afe9fabad 100644
--- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java
+++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.document.Document;
+import org.springframework.ai.sbert.embedding.TransformersEmbeddingClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java
index e646c4d1450..8cd77686f23 100644
--- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java
+++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java
@@ -20,7 +20,7 @@
 import ai.onnxruntime.OrtSession;
 
 import org.springframework.ai.embedding.EmbeddingClient;
-import org.springframework.ai.embedding.TransformersEmbeddingClient;
+import org.springframework.ai.sbert.embedding.TransformersEmbeddingClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java b/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java
index 3cd9ec081a2..e510d96b9b3 100644
--- a/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java
+++ b/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java
@@ -32,7 +32,7 @@
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.embedding.EmbeddingClient;
-import org.springframework.ai.embedding.TransformersEmbeddingClient;
+import org.springframework.ai.sbert.embedding.TransformersEmbeddingClient;
 import org.springframework.ai.vectorstore.PineconeVectorStore.PineconeVectorStoreConfig;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java b/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java
index 40ac99c97c4..598f085cacf 100644
--- a/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java
+++ b/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java
@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.ai.document.Document;
 import org.springframework.ai.embedding.EmbeddingClient;
-import org.springframework.ai.embedding.TransformersEmbeddingClient;
+import org.springframework.ai.sbert.embedding.TransformersEmbeddingClient;
 import org.springframework.ai.vectorstore.RedisVectorStore.MetadataField;
 import org.springframework.ai.vectorstore.RedisVectorStore.RedisVectorStoreConfig;
 import org.springframework.boot.SpringBootConfiguration;
diff --git a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java b/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
index ed0c6e8704c..8f09dffe901 100644
--- a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
+++ b/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
@@ -30,7 +30,7 @@
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.embedding.EmbeddingClient;
-import org.springframework.ai.embedding.TransformersEmbeddingClient;
+import org.springframework.ai.sbert.embedding.TransformersEmbeddingClient;
 import org.springframework.ai.vectorstore.WeaviateVectorStore.WeaviateVectorStoreConfig;
 import org.springframework.ai.vectorstore.WeaviateVectorStore.WeaviateVectorStoreConfig.MetadataField;
 import org.springframework.boot.SpringBootConfiguration;