ehsavoie · Jul 22, 2026 · Jul 21, 2026 · Jul 22, 2026 · Jul 22, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -66,6 +66,7 @@ mvn clean install
 - Use `org.a2aproject.sdk.util.Assert.checkNotNullParam()` in the compact constructor to validate required fields
 - Use `List.copyOf()` and `Map.copyOf()` for defensive copying of collections
 - Apply the Builder pattern for records with many fields (see `AgentCard.java` as reference)
+- Do not split Java packages across Maven modules in production code (each package must belong to exactly one module). Test code may share a package with production code to access package-private members.
 
 ### Code generation
 

diff --git a/boms/extras/src/it/extras-usage-test/pom.xml b/boms/extras/src/it/extras-usage-test/pom.xml
@@ -158,7 +158,7 @@
                             <goal>java</goal>
                         </goals>
                         <configuration>
-                            <mainClass>org.a2aproject.sdk.test.ExtrasBomVerifier</mainClass>
+                            <mainClass>org.a2aproject.sdk.bom.test.extras.ExtrasBomVerifier</mainClass>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...2aproject/sdk/test/ExtrasBomVerifier.java → ...dk/bom/test/extras/ExtrasBomVerifier.java b/...2aproject/sdk/test/ExtrasBomVerifier.java → ...dk/bom/test/extras/ExtrasBomVerifier.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.test;
+package org.a2aproject.sdk.bom.test.extras;
 
 import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
 

diff --git a/boms/reference/src/it/reference-usage-test/pom.xml b/boms/reference/src/it/reference-usage-test/pom.xml
@@ -155,7 +155,7 @@
                             <goal>java</goal>
                         </goals>
                         <configuration>
-                            <mainClass>org.a2aproject.sdk.test.ReferenceBomVerifier</mainClass>
+                            <mainClass>org.a2aproject.sdk.bom.test.reference.ReferenceBomVerifier</mainClass>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...roject/sdk/test/ReferenceBomVerifier.java → .../test/reference/ReferenceBomVerifier.java b/...roject/sdk/test/ReferenceBomVerifier.java → .../test/reference/ReferenceBomVerifier.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.test;
+package org.a2aproject.sdk.bom.test.reference;
 
 import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
 

diff --git a/boms/sdk/src/it/sdk-usage-test/pom.xml b/boms/sdk/src/it/sdk-usage-test/pom.xml
@@ -196,7 +196,7 @@
                             <goal>java</goal>
                         </goals>
                         <configuration>
-                            <mainClass>org.a2aproject.sdk.test.SdkBomVerifier</mainClass>
+                            <mainClass>org.a2aproject.sdk.bom.test.sdk.SdkBomVerifier</mainClass>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...g/a2aproject/sdk/test/SdkBomVerifier.java → ...ject/sdk/bom/test/sdk/SdkBomVerifier.java b/...g/a2aproject/sdk/test/SdkBomVerifier.java → ...ject/sdk/bom/test/sdk/SdkBomVerifier.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.test;
+package org.a2aproject.sdk.bom.test.sdk;
 
 import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
 

diff --git a/client/base/src/main/java/org/a2aproject/sdk/client/ClientTaskManager.java b/client/base/src/main/java/org/a2aproject/sdk/client/ClientTaskManager.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.client;
 
-import static org.a2aproject.sdk.util.Utils.appendArtifactToTask;
+import static org.a2aproject.sdk.spec.util.Utils.appendArtifactToTask;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...t/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransport.java b/...t/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransport.java
@@ -65,7 +65,7 @@
 import org.a2aproject.sdk.spec.TaskIdParams;
 import org.a2aproject.sdk.spec.TaskPushNotificationConfig;
 import org.a2aproject.sdk.spec.TaskQueryParams;
-import org.a2aproject.sdk.util.Utils;
+import org.a2aproject.sdk.spec.util.Utils;
 import org.jspecify.annotations.Nullable;
 
 public class JSONRPCTransport implements ClientTransport {

diff --git a/...onrpc/src/test/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportTest.java b/...onrpc/src/test/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportTest.java
@@ -66,7 +66,7 @@
 import org.a2aproject.sdk.spec.TaskQueryParams;
 import org.a2aproject.sdk.spec.TaskState;
 import org.a2aproject.sdk.spec.TextPart;
-import org.a2aproject.sdk.util.Utils;
+import org.a2aproject.sdk.spec.util.Utils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/.../transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransport.java b/.../transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransport.java
@@ -60,7 +60,7 @@
 import org.a2aproject.sdk.spec.TaskIdParams;
 import org.a2aproject.sdk.spec.TaskPushNotificationConfig;
 import org.a2aproject.sdk.spec.TaskQueryParams;
-import org.a2aproject.sdk.util.Utils;
+import org.a2aproject.sdk.spec.util.Utils;
 import org.jspecify.annotations.Nullable;
 
 public class RestTransport implements ClientTransport {

diff --git a/...sport/spi/src/main/java/org/a2aproject/sdk/compat03/client/http/A2ACardResolver_v0_3.java b/...sport/spi/src/main/java/org/a2aproject/sdk/compat03/client/http/A2ACardResolver_v0_3.java
@@ -14,7 +14,7 @@
 import org.a2aproject.sdk.compat03.spec.A2AClientError_v0_3;
 import org.a2aproject.sdk.compat03.spec.A2AClientJSONError_v0_3;
 import org.a2aproject.sdk.compat03.spec.AgentCard_v0_3;
-import org.a2aproject.sdk.util.Utils;
+import org.a2aproject.sdk.spec.util.Utils;
 import org.jspecify.annotations.Nullable;
 
 public class A2ACardResolver_v0_3 {

diff --git a/...a/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_AndroidTest.java b/...a/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_AndroidTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.apps.quarkus;
 
-import org.a2aproject.sdk.client.http.AndroidA2AHttpClient;
+import org.a2aproject.sdk.client.http.android.AndroidA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;

diff --git a/...ava/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_VertxTest.java b/...ava/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_VertxTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.apps.quarkus;
 
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;

diff --git a/...aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthAndroidTest.java b/...aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthAndroidTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.apps.quarkus;
 
-import org.a2aproject.sdk.client.http.AndroidA2AHttpClient;
+import org.a2aproject.sdk.client.http.android.AndroidA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;

diff --git a/...a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthVertxTest.java b/...a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthVertxTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.apps.quarkus;
 
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;

diff --git a/...k/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithTaskAuthorizationVertxTest.java b/...k/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithTaskAuthorizationVertxTest.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.TestProfile;
 import io.vertx.core.Vertx;
 import jakarta.inject.Inject;
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;

diff --git a/...java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_AndroidTest.java b/...java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_AndroidTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.rest.quarkus;
 
-import org.a2aproject.sdk.client.http.AndroidA2AHttpClient;
+import org.a2aproject.sdk.client.http.android.AndroidA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;

diff --git a/...t/java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_VertxTest.java b/...t/java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_VertxTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.rest.quarkus;
 
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;

diff --git a/.../a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthAndroidTest.java b/.../a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthAndroidTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.rest.quarkus;
 
-import org.a2aproject.sdk.client.http.AndroidA2AHttpClient;
+import org.a2aproject.sdk.client.http.android.AndroidA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;

diff --git a/...rg/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthVertxTest.java b/...rg/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthVertxTest.java
@@ -1,6 +1,6 @@
 package org.a2aproject.sdk.compat03.server.rest.quarkus;
 
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;

diff --git a/.../sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithTaskAuthorizationVertxTest.java b/.../sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithTaskAuthorizationVertxTest.java
@@ -4,7 +4,7 @@
 import io.quarkus.test.junit.TestProfile;
 import io.vertx.core.Vertx;
 import jakarta.inject.Inject;
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import org.a2aproject.sdk.compat03.client.ClientBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransport_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;

diff --git a/...onversion/AgentExecutorProducer_v0_3.java → ...sion/test/AgentExecutorProducer_v0_3.java b/...onversion/AgentExecutorProducer_v0_3.java → ...sion/test/AgentExecutorProducer_v0_3.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.compat03.conversion;
+package org.a2aproject.sdk.compat03.conversion.test;
 
 import java.util.List;
 

diff --git a/...03/conversion/RequestScopedBean_v0_3.java → ...nversion/test/RequestScopedBean_v0_3.java b/...03/conversion/RequestScopedBean_v0_3.java → ...nversion/test/RequestScopedBean_v0_3.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.compat03.conversion;
+package org.a2aproject.sdk.compat03.conversion.test;
 
 import jakarta.enterprise.context.RequestScoped;
 

diff --git a/...n/TestTaskAuthorizationProvider_v0_3.java → ...t/TestTaskAuthorizationProvider_v0_3.java b/...n/TestTaskAuthorizationProvider_v0_3.java → ...t/TestTaskAuthorizationProvider_v0_3.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.compat03.conversion;
+package org.a2aproject.sdk.compat03.conversion.test;
 
 import java.util.concurrent.ConcurrentHashMap;
 

diff --git a/examples/helloworld/client/pom.xml b/examples/helloworld/client/pom.xml
@@ -16,7 +16,7 @@
     <description>Examples for the Java SDK for the Agent2Agent Protocol (A2A)</description>
 
     <properties>
-        <jbang.script.name>src/main/java/org/a2aproject/sdk/examples/helloworld/HelloWorldRunner.java</jbang.script.name>
+        <jbang.script.name>src/main/java/org/a2aproject/sdk/examples/helloworld/client/HelloWorldRunner.java</jbang.script.name>
     </properties>
 
     <dependencies>
@@ -93,7 +93,7 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <version>3.6.3</version>
                 <configuration>
-                    <mainClass>org.a2aproject.sdk.examples.helloworld.HelloWorldClient</mainClass>
+                    <mainClass>org.a2aproject.sdk.examples.helloworld.client.HelloWorldClient</mainClass>
                     <systemProperties>
                         <systemProperty>
                             <key>opentelemetry</key>

diff --git a/...examples/helloworld/HelloWorldClient.java → ...s/helloworld/client/HelloWorldClient.java b/...examples/helloworld/HelloWorldClient.java → ...s/helloworld/client/HelloWorldClient.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.examples.helloworld;
+package org.a2aproject.sdk.examples.helloworld.client;
 
 import static org.a2aproject.sdk.extras.opentelemetry.client.OpenTelemetryClientTransportWrapper.OTEL_TRACER_KEY;
 import static org.a2aproject.sdk.extras.opentelemetry.client.propagation.OpenTelemetryClientPropagatorTransportWrapper.OTEL_OPEN_TELEMETRY_KEY;

diff --git a/...examples/helloworld/HelloWorldRunner.java → ...s/helloworld/client/HelloWorldRunner.java b/...examples/helloworld/HelloWorldRunner.java → ...s/helloworld/client/HelloWorldRunner.java
@@ -37,6 +37,6 @@ public static void main(String[] args) {
                 }
             }
         }
-        org.a2aproject.sdk.examples.helloworld.HelloWorldClient.main(args);
+        org.a2aproject.sdk.examples.helloworld.client.HelloWorldClient.main(args);
     }
 }
diff --git a/...xamples/helloworld/AgentCardProducer.java → .../helloworld/server/AgentCardProducer.java b/...xamples/helloworld/AgentCardProducer.java → .../helloworld/server/AgentCardProducer.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.examples.helloworld;
+package org.a2aproject.sdk.examples.helloworld.server;
 
 import org.a2aproject.sdk.server.PublicAgentCard;
 import org.a2aproject.sdk.spec.AgentCapabilities;

diff --git a/...les/helloworld/AgentExecutorProducer.java → ...loworld/server/AgentExecutorProducer.java b/...les/helloworld/AgentExecutorProducer.java → ...loworld/server/AgentExecutorProducer.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.examples.helloworld;
+package org.a2aproject.sdk.examples.helloworld.server;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;

diff --git a/...sdk/client/http/AndroidA2AHttpClient.java → ...nt/http/android/AndroidA2AHttpClient.java b/...sdk/client/http/AndroidA2AHttpClient.java → ...nt/http/android/AndroidA2AHttpClient.java
@@ -1,12 +1,10 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
 
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_MULT_CHOICE;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
 
-import org.a2aproject.sdk.common.A2AErrorMessages;
-import org.a2aproject.sdk.spec.A2AClientHTTPError;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,6 +24,13 @@
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
+import org.a2aproject.sdk.client.http.A2AHttpClient;
+import org.a2aproject.sdk.client.http.A2AHttpHeaders;
+import org.a2aproject.sdk.client.http.A2AHttpResponse;
+import org.a2aproject.sdk.client.http.ServerSentEvent;
+import org.a2aproject.sdk.client.http.ServerSentEventParser;
+import org.a2aproject.sdk.common.A2AErrorMessages;
+import org.a2aproject.sdk.spec.A2AClientHTTPError;
 import org.jspecify.annotations.Nullable;
 
 /** Android-specific implementation of {@link A2AHttpClient} using {@link HttpURLConnection}. */

diff --git a/...nt/http/AndroidA2AHttpClientProvider.java → ...android/AndroidA2AHttpClientProvider.java b/...nt/http/AndroidA2AHttpClientProvider.java → ...android/AndroidA2AHttpClientProvider.java
@@ -1,4 +1,7 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
+
+import org.a2aproject.sdk.client.http.A2AHttpClient;
+import org.a2aproject.sdk.client.http.A2AHttpClientProvider;
 
 /**
  * Service provider for {@link AndroidA2AHttpClient}.

diff --git a/...dk/extras/opentelemetry/package-info.java → ...sdk/client/http/android/package-info.java b/...dk/extras/opentelemetry/package-info.java → ...sdk/client/http/android/package-info.java
@@ -1,5 +1,5 @@
 @NullMarked
-package org.a2aproject.sdk.extras.opentelemetry;
+package org.a2aproject.sdk.client.http.android;
 
 import org.jspecify.annotations.NullMarked;
 
diff --git a/...src/main/resources/META-INF/services/org.a2aproject.sdk.client.http.A2AHttpClientProvider b/...src/main/resources/META-INF/services/org.a2aproject.sdk.client.http.A2AHttpClientProvider
@@ -1 +1 @@
-org.a2aproject.sdk.client.http.AndroidA2AHttpClientProvider
+org.a2aproject.sdk.client.http.android.AndroidA2AHttpClientProvider
diff --git a/...http/AndroidA2AHttpClientFactoryTest.java → ...roid/AndroidA2AHttpClientFactoryTest.java b/...http/AndroidA2AHttpClientFactoryTest.java → ...roid/AndroidA2AHttpClientFactoryTest.java
@@ -1,7 +1,10 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
 
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.a2aproject.sdk.client.http.A2AHttpClient;
+import org.a2aproject.sdk.client.http.A2AHttpClientFactory;
 import org.junit.jupiter.api.Test;
 
 public class AndroidA2AHttpClientFactoryTest {

diff --git a/.../AndroidA2AHttpClientIntegrationTest.java → .../AndroidA2AHttpClientIntegrationTest.java b/.../AndroidA2AHttpClientIntegrationTest.java → .../AndroidA2AHttpClientIntegrationTest.java
@@ -1,4 +1,7 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
+
+import org.a2aproject.sdk.client.http.A2AHttpClient;
+import org.a2aproject.sdk.client.http.AbstractA2AHttpClientIntegrationTest;
 
 public class AndroidA2AHttpClientIntegrationTest extends AbstractA2AHttpClientIntegrationTest {
 

diff --git a/...ent/http/AndroidA2AHttpClientSSETest.java → .../android/AndroidA2AHttpClientSSETest.java b/...ent/http/AndroidA2AHttpClientSSETest.java → .../android/AndroidA2AHttpClientSSETest.java
@@ -1,4 +1,7 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
+
+import org.a2aproject.sdk.client.http.A2AHttpClient;
+import org.a2aproject.sdk.client.http.AbstractA2AHttpClientSSETest;
 
 public class AndroidA2AHttpClientSSETest extends AbstractA2AHttpClientSSETest {
 

diff --git a/...client/http/AndroidA2AHttpClientTest.java → ...ttp/android/AndroidA2AHttpClientTest.java b/...client/http/AndroidA2AHttpClientTest.java → ...ttp/android/AndroidA2AHttpClientTest.java
@@ -1,7 +1,9 @@
-package org.a2aproject.sdk.client.http;
+package org.a2aproject.sdk.client.http.android;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
+
+import org.a2aproject.sdk.client.http.A2AHttpClient;
 import org.junit.jupiter.api.Test;
 
 public class AndroidA2AHttpClientTest {

diff --git a/extras/http-client-vertx/README.md b/extras/http-client-vertx/README.md
@@ -216,7 +216,7 @@ The `VertxA2AHttpClient` constructor automatically checks for a CDI-managed `Ver
 If you're not using CDI but want to share a Vert.x instance:
 
 ```java
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import io.vertx.core.Vertx;
 
 // Create Vertx instance once
@@ -242,7 +242,7 @@ For advanced use cases requiring custom Vert.x WebClient configuration, you can
 
 ```java
 import org.a2aproject.sdk.client.http.A2AHttpClient;
-import org.a2aproject.sdk.client.http.VertxA2AHttpClient;
+import org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClient;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
@@ -263,7 +263,7 @@ The module uses Java's `ServiceLoader` mechanism for automatic discovery:
 
 1. **Provider Registration**: `META-INF/services/org.a2aproject.sdk.client.http.A2AHttpClientProvider` contains:
    ```
-   org.a2aproject.sdk.client.http.VertxA2AHttpClientProvider
+   org.a2aproject.sdk.client.http.vertx.VertxA2AHttpClientProvider
    ```
 
 2. **Priority System**: Each provider has a priority:
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,6 @@ public static void main(String[] args) { @@
                     }
                 }
             }
-            org.a2aproject.sdk.examples.helloworld.HelloWorldClient.main(args);
+            org.a2aproject.sdk.examples.helloworld.client.HelloWorldClient.main(args);
         }
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.a2aproject.sdk.client.http.AndroidA2AHttpClientProvider
		org.a2aproject.sdk.client.http.android.AndroidA2AHttpClientProvider