diff --git a/src/OpenTelemetry.OpAmp.Client/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.OpAmp.Client/.publicApi/PublicAPI.Unshipped.txt
index fda686d6ae..1780095e3a 100644
--- a/src/OpenTelemetry.OpAmp.Client/.publicApi/PublicAPI.Unshipped.txt
+++ b/src/OpenTelemetry.OpAmp.Client/.publicApi/PublicAPI.Unshipped.txt
@@ -1,14 +1,14 @@
-OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<TMessage>
-OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<TMessage>.HandleMessage(TMessage! message) -> void
-OpenTelemetry.OpAmp.Client.Internal.Listeners.OpAmpMessage
-OpenTelemetry.OpAmp.Client.Internal.Listeners.OpAmpMessage.OpAmpMessage() -> void
+OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<TMessage>
+OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<TMessage>.HandleMessage(TMessage! message) -> void
+OpenTelemetry.OpAmp.Client.Messages.OpAmpMessage
+OpenTelemetry.OpAmp.Client.Messages.OpAmpMessage.OpAmpMessage() -> void
 OpenTelemetry.OpAmp.Client.OpAmpClient
 OpenTelemetry.OpAmp.Client.OpAmpClient.Dispose() -> void
 OpenTelemetry.OpAmp.Client.OpAmpClient.OpAmpClient(System.Action<OpenTelemetry.OpAmp.Client.Settings.OpAmpClientSettings!>? configure = null) -> void
 OpenTelemetry.OpAmp.Client.OpAmpClient.StartAsync(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
 OpenTelemetry.OpAmp.Client.OpAmpClient.StopAsync(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
-OpenTelemetry.OpAmp.Client.OpAmpClient.Subscribe<T>(OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<T!>! listener) -> void
-OpenTelemetry.OpAmp.Client.OpAmpClient.Unsubscribe<T>(OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<T!>! listener) -> void
+OpenTelemetry.OpAmp.Client.OpAmpClient.Subscribe<T>(OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<T!>! listener) -> void
+OpenTelemetry.OpAmp.Client.OpAmpClient.Unsubscribe<T>(OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<T!>! listener) -> void
 OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion
 OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion.AnyValueUnion() -> void
 OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion.BoolValue.get -> bool?
diff --git a/src/OpenTelemetry.OpAmp.Client/CHANGELOG.md b/src/OpenTelemetry.OpAmp.Client/CHANGELOG.md
index 7441156c67..63805db847 100644
--- a/src/OpenTelemetry.OpAmp.Client/CHANGELOG.md
+++ b/src/OpenTelemetry.OpAmp.Client/CHANGELOG.md
@@ -7,6 +7,8 @@
   ([#3589](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3589))
 * Add support for subscribing and unsubscribing to messages from the OpAMP server.
   ([#3593](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3593))
+* Clean up directories and namespaces for public API.
+  ([#3612](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3612))
 
 ## 0.1.0-alpha.3
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs b/src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs
index 01e103bd37..0638943053 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs
@@ -5,9 +5,10 @@
 using System.Collections.Concurrent;
 using OpAmp.Proto.V1;
 using OpenTelemetry.Internal;
-using OpenTelemetry.OpAmp.Client.Internal.Listeners;
 using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 using OpenTelemetry.OpAmp.Client.Internal.Utils;
+using OpenTelemetry.OpAmp.Client.Listeners;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/AgentIdentificationMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/AgentIdentificationMessage.cs
similarity index 91%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/AgentIdentificationMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/AgentIdentificationMessage.cs
index 732de59dbc..7b7d308b60 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/AgentIdentificationMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/AgentIdentificationMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CapabilitiesMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CapabilitiesMessage.cs
similarity index 90%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CapabilitiesMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/CapabilitiesMessage.cs
index 29993cf1d4..fb0a00270a 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CapabilitiesMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CapabilitiesMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CommandMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CommandMessage.cs
similarity index 89%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CommandMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/CommandMessage.cs
index be5dad6bce..be0c5bc24b 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CommandMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CommandMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ConnectionSettingsMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/ConnectionSettingsMessage.cs
similarity index 91%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ConnectionSettingsMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/ConnectionSettingsMessage.cs
index f816d8198e..7d9ba6e36e 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ConnectionSettingsMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/ConnectionSettingsMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomCapabilitiesMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomCapabilitiesMessage.cs
similarity index 91%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomCapabilitiesMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomCapabilitiesMessage.cs
index 0a4063af52..8ea8f77cc2 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomCapabilitiesMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomCapabilitiesMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomMessageMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomMessageMessage.cs
similarity index 90%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomMessageMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomMessageMessage.cs
index 7d99e30c02..5193d53382 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/CustomMessageMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/CustomMessageMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ErrorResponseMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/ErrorResponseMessage.cs
similarity index 90%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ErrorResponseMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/ErrorResponseMessage.cs
index 75dcebe9a7..7256616410 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/ErrorResponseMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/ErrorResponseMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/FlagsMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/FlagsMessage.cs
similarity index 89%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/FlagsMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/FlagsMessage.cs
index ae263cfd92..25ca8d3a49 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/FlagsMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/FlagsMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/PackagesAvailableMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/PackagesAvailableMessage.cs
similarity index 90%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/PackagesAvailableMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/PackagesAvailableMessage.cs
index f50bd4e413..8262bf3e04 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/PackagesAvailableMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/PackagesAvailableMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/RemoteConfigMessage.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/RemoteConfigMessage.cs
similarity index 90%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/RemoteConfigMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Internal/Messages/RemoteConfigMessage.cs
index 92ad6cd21d..92d4eaa627 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/Messages/RemoteConfigMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Messages/RemoteConfigMessage.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpAmp.Proto.V1;
+using OpenTelemetry.OpAmp.Client.Messages;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
 
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Services/Heartbeat/HeartbeatService.cs b/src/OpenTelemetry.OpAmp.Client/Internal/Services/Heartbeat/HeartbeatService.cs
index 66579c1577..0fd91cd14d 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Services/Heartbeat/HeartbeatService.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Internal/Services/Heartbeat/HeartbeatService.cs
@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using OpenTelemetry.OpAmp.Client.Internal.Listeners;
 using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
+using OpenTelemetry.OpAmp.Client.Listeners;
 using OpenTelemetry.OpAmp.Client.Settings;
 
 namespace OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/IOpAmpListener.cs b/src/OpenTelemetry.OpAmp.Client/Listeners/IOpAmpListener.cs
similarity index 85%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/IOpAmpListener.cs
rename to src/OpenTelemetry.OpAmp.Client/Listeners/IOpAmpListener.cs
index 0db481faca..e9b2417bad 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/IOpAmpListener.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Listeners/IOpAmpListener.cs
@@ -1,7 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-namespace OpenTelemetry.OpAmp.Client.Internal.Listeners;
+using OpenTelemetry.OpAmp.Client.Messages;
+
+namespace OpenTelemetry.OpAmp.Client.Listeners;
 
 /// <summary>
 /// A listener capable of handling OpAMP messages of a specific type.
diff --git a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/OpAmpMessage.cs b/src/OpenTelemetry.OpAmp.Client/Messages/OpAmpMessage.cs
similarity index 75%
rename from src/OpenTelemetry.OpAmp.Client/Internal/Listeners/OpAmpMessage.cs
rename to src/OpenTelemetry.OpAmp.Client/Messages/OpAmpMessage.cs
index e37b440f37..932918a8ec 100644
--- a/src/OpenTelemetry.OpAmp.Client/Internal/Listeners/OpAmpMessage.cs
+++ b/src/OpenTelemetry.OpAmp.Client/Messages/OpAmpMessage.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-namespace OpenTelemetry.OpAmp.Client.Internal.Listeners;
+namespace OpenTelemetry.OpAmp.Client.Messages;
 
 /// <summary>
 /// Base type for OpAMP messages.
diff --git a/src/OpenTelemetry.OpAmp.Client/OpAmpClient.cs b/src/OpenTelemetry.OpAmp.Client/OpAmpClient.cs
index fc08b8110d..268b568c1c 100644
--- a/src/OpenTelemetry.OpAmp.Client/OpAmpClient.cs
+++ b/src/OpenTelemetry.OpAmp.Client/OpAmpClient.cs
@@ -3,12 +3,13 @@
 
 using OpenTelemetry.Internal;
 using OpenTelemetry.OpAmp.Client.Internal;
-using OpenTelemetry.OpAmp.Client.Internal.Listeners;
 using OpenTelemetry.OpAmp.Client.Internal.Services;
 using OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
 using OpenTelemetry.OpAmp.Client.Internal.Transport;
 using OpenTelemetry.OpAmp.Client.Internal.Transport.Http;
 using OpenTelemetry.OpAmp.Client.Internal.Transport.WebSocket;
+using OpenTelemetry.OpAmp.Client.Listeners;
+using OpenTelemetry.OpAmp.Client.Messages;
 using OpenTelemetry.OpAmp.Client.Settings;
 
 namespace OpenTelemetry.OpAmp.Client;
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Mocks/MockListener.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Mocks/MockListener.cs
index 38c9bfea4e..b6670fbdcf 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Mocks/MockListener.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Mocks/MockListener.cs
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Collections.Concurrent;
-using OpenTelemetry.OpAmp.Client.Internal.Listeners;
 using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
+using OpenTelemetry.OpAmp.Client.Listeners;
 
 namespace OpenTelemetry.OpAmp.Client.Tests.Mocks;