diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs
index 3944fbcb3a..a97c543268 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/HubClients.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.Collections.Generic;
+using Microsoft.AspNetCore.SignalR.Internal;
 
 namespace Microsoft.AspNetCore.SignalR
 {
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs
index bc6ad53675..0f9573470c 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.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.Collections.Generic;
+using Microsoft.AspNetCore.SignalR.Internal;
 
 namespace Microsoft.AspNetCore.SignalR
 {
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs
index cf2cfdf961..e9e2b79ac1 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs
@@ -1,6 +1,8 @@
 // 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 Microsoft.AspNetCore.SignalR.Internal;
+
 namespace Microsoft.AspNetCore.SignalR
 {
     public class HubContext<THub> : IHubContext<THub> where THub : Hub
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs
index e91577204b..23e95b4022 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs
@@ -1,7 +1,7 @@
 // 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.Collections.Generic;
+using Microsoft.AspNetCore.SignalR.Internal;
 
 namespace Microsoft.AspNetCore.SignalR
 {
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Proxies.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/Proxies.cs
similarity index 87%
rename from src/Microsoft.AspNetCore.SignalR.Core/Proxies.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/Proxies.cs
index a3283e067d..e85633fa28 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/Proxies.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/Proxies.cs
@@ -4,9 +4,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.SignalR
+namespace Microsoft.AspNetCore.SignalR.Internal
 {
-    public class UserProxy<THub> : IClientProxy where THub : Hub
+    internal class UserProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly string _userId;
         private readonly HubLifetimeManager<THub> _lifetimeManager;
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class MultipleUserProxy<THub> : IClientProxy where THub : Hub
+    internal class MultipleUserProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly IReadOnlyList<string> _userIds;
         private readonly HubLifetimeManager<THub> _lifetimeManager;
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class GroupProxy<THub> : IClientProxy where THub : Hub
+    internal class GroupProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly string _groupName;
         private readonly HubLifetimeManager<THub> _lifetimeManager;
@@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class MultipleGroupProxy<THub> : IClientProxy where THub : Hub
+    internal class MultipleGroupProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly HubLifetimeManager<THub> _lifetimeManager;
         private readonly IReadOnlyList<string> _groupNames;
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class GroupExceptProxy<THub> : IClientProxy where THub : Hub
+    internal class GroupExceptProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly string _groupName;
         private readonly HubLifetimeManager<THub> _lifetimeManager;
@@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class AllClientProxy<THub> : IClientProxy where THub : Hub
+    internal class AllClientProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly HubLifetimeManager<THub> _lifetimeManager;
 
@@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class AllClientsExceptProxy<THub> : IClientProxy where THub : Hub
+    internal class AllClientsExceptProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly HubLifetimeManager<THub> _lifetimeManager;
         private readonly IReadOnlyList<string> _excludedIds;
@@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class SingleClientProxy<THub> : IClientProxy where THub : Hub
+    internal class SingleClientProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly string _connectionId;
         private readonly HubLifetimeManager<THub> _lifetimeManager;
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class MultipleClientProxy<THub> : IClientProxy where THub : Hub
+    internal class MultipleClientProxy<THub> : IClientProxy where THub : Hub
     {
         private readonly HubLifetimeManager<THub> _lifetimeManager;
         private readonly IReadOnlyList<string> _connectionIds;
@@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.SignalR
         }
     }
 
-    public class GroupManager<THub> : IGroupManager where THub : Hub
+    internal class GroupManager<THub> : IGroupManager where THub : Hub
     {
         private readonly HubLifetimeManager<THub> _lifetimeManager;
 
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs
index b3c401163f..ce43e9c728 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs
@@ -4,4 +4,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.SignalR.Tests.Utils, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.SignalR.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.SignalR.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.SignalR.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/ClientProxyTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/ClientProxyTests.cs
index d3fd189d6b..2381590e12 100644
--- a/test/Microsoft.AspNetCore.SignalR.Tests/ClientProxyTests.cs
+++ b/test/Microsoft.AspNetCore.SignalR.Tests/ClientProxyTests.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Internal;
 using Moq;
 using Xunit;