diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClient.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java
similarity index 98%
rename from opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClient.java
rename to opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java
index 5889642d8..19d63eb11 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClient.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal;
+package io.opentelemetry.opamp.client;
 
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import java.io.Closeable;
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClientBuilder.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClientBuilder.java
similarity index 98%
rename from opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClientBuilder.java
rename to opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClientBuilder.java
index 3e4d0f4aa..d6af850fa 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClientBuilder.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClientBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal;
+package io.opentelemetry.opamp.client;
 
 import com.github.f4b6a3.uuid.UuidCreator;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -11,9 +11,9 @@
 import io.opentelemetry.opamp.client.internal.impl.OpampClientImpl;
 import io.opentelemetry.opamp.client.internal.impl.OpampClientState;
 import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
 import io.opentelemetry.opamp.client.internal.state.State;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,12 +28,7 @@
 import opamp.proto.KeyValue;
 import opamp.proto.RemoteConfigStatus;
 
-/**
- * This class is internal and is hence not for public use. Its APIs are unstable and can change at
- * any time.
- *
- * <p>Builds an {@link OpampClient} instance.
- */
+/** Builds an {@link OpampClient} instance. */
 public final class OpampClientBuilder {
   private final Map<String, AnyValue> identifyingAttributes = new HashMap<>();
   private final Map<String, AnyValue> nonIdentifyingAttributes = new HashMap<>();
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java
index 7ada06c42..e224135ff 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.opamp.client.internal.impl;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.impl.recipe.AgentToServerAppenders;
 import io.opentelemetry.opamp.client.internal.impl.recipe.RecipeManager;
 import io.opentelemetry.opamp.client.internal.impl.recipe.RequestRecipe;
@@ -19,12 +19,12 @@
 import io.opentelemetry.opamp.client.internal.impl.recipe.appenders.SequenceNumberAppender;
 import io.opentelemetry.opamp.client.internal.request.Field;
 import io.opentelemetry.opamp.client.internal.request.Request;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
 import io.opentelemetry.opamp.client.internal.state.ObservableState;
 import io.opentelemetry.opamp.client.internal.state.State;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java
index 569447342..e9f79c254 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java
@@ -14,6 +14,7 @@
 import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Objects;
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java
index 13ef9b117..280725884 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java
@@ -13,6 +13,7 @@
 import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.time.Duration;
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java
index df9fb8ba1..af47027ef 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.opamp.client.internal.response;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import javax.annotation.Nullable;
 import opamp.proto.AgentRemoteConfig;
 
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/RequestService.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/request/service/RequestService.java
similarity index 91%
rename from opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/RequestService.java
rename to opamp-client/src/main/java/io/opentelemetry/opamp/client/request/service/RequestService.java
index ee47e4249..76d1650e3 100644
--- a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/RequestService.java
+++ b/opamp-client/src/main/java/io/opentelemetry/opamp/client/request/service/RequestService.java
@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal.request.service;
+package io.opentelemetry.opamp.client.request.service;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.request.Request;
+import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
+import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
 import io.opentelemetry.opamp.client.internal.response.Response;
 import java.util.function.Supplier;
 
diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java
index 9a076f757..dd5c0b956 100644
--- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java
+++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java
@@ -12,13 +12,13 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
 import io.opentelemetry.opamp.client.internal.request.Request;
 import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import io.opentelemetry.opamp.client.internal.state.State;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java
index c0107673b..fad784e62 100644
--- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java
+++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java
@@ -21,6 +21,7 @@
 import io.opentelemetry.opamp.client.internal.request.Request;
 import io.opentelemetry.opamp.client.internal.request.delay.PeriodicDelay;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.ByteArrayInputStream;
 import java.time.Duration;
 import java.util.ArrayList;
diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java
index c00cc0cc0..becdbc69b 100644
--- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java
+++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.opamp.client.internal.request.Request;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.time.Duration;