diff --git a/src/Kestrel.Transport.Libuv/LibuvTransport.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvTransport.cs
similarity index 97%
rename from src/Kestrel.Transport.Libuv/LibuvTransport.cs
rename to src/Kestrel.Transport.Libuv/Internal/LibuvTransport.cs
index 35def2dc55..293745f38b 100644
--- a/src/Kestrel.Transport.Libuv/LibuvTransport.cs
+++ b/src/Kestrel.Transport.Libuv/Internal/LibuvTransport.cs
@@ -8,11 +8,10 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
 {
     public class LibuvTransport : ITransport
     {
diff --git a/src/Kestrel.Transport.Libuv/LibuvTransportFactory.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvTransportFactory.cs
similarity index 95%
rename from src/Kestrel.Transport.Libuv/LibuvTransportFactory.cs
rename to src/Kestrel.Transport.Libuv/Internal/LibuvTransportFactory.cs
index 418f43abd8..c2ff9e8a56 100644
--- a/src/Kestrel.Transport.Libuv/LibuvTransportFactory.cs
+++ b/src/Kestrel.Transport.Libuv/Internal/LibuvTransportFactory.cs
@@ -4,11 +4,10 @@
 using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal
 {
     public class LibuvTransportFactory : ITransportFactory
     {
diff --git a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
index 3ae5b90b2b..bef2f77e60 100644
--- a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
+++ b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj
@@ -9,7 +9,6 @@
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
-    <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs b/src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs
index 3d7f2fe3ae..386d0b6679 100644
--- a/src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs
+++ b/src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Hosting
diff --git a/src/Kestrel.Transport.Libuv/breakingchanges.netcore.json b/src/Kestrel.Transport.Libuv/breakingchanges.netcore.json
new file mode 100644
index 0000000000..bb70d76ea8
--- /dev/null
+++ b/src/Kestrel.Transport.Libuv/breakingchanges.netcore.json
@@ -0,0 +1,10 @@
+[
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.LibuvTransport : Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransport",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.LibuvTransportFactory : Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportFactory",
+    "Kind": "Removal"
+  }
+]
diff --git a/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs b/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs
index bc0eff8af8..7ea16d4c85 100644
--- a/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs
+++ b/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
diff --git a/test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs
index 1e80201397..2db383f941 100644
--- a/test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs
+++ b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs
index 388f78e3ba..4d2be2380c 100644
--- a/test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs
+++ b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs
@@ -1,19 +1,18 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;