diff --git a/src/Microsoft.AspNetCore.Dispatcher/DispatcherApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Dispatcher/Builder/DispatcherApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Dispatcher/DispatcherApplicationBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.Dispatcher/Builder/DispatcherApplicationBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Dispatcher/DefaultDispatcherConfigureOptions.cs b/src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DefaultDispatcherConfigureOptions.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Dispatcher/DefaultDispatcherConfigureOptions.cs
rename to src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DefaultDispatcherConfigureOptions.cs
index 7b54aaf76d..e9c7ac59e2 100644
--- a/src/Microsoft.AspNetCore.Dispatcher/DefaultDispatcherConfigureOptions.cs
+++ b/src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DefaultDispatcherConfigureOptions.cs
@@ -3,9 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Dispatcher;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Dispatcher
+namespace Microsoft.Extensions.DependencyInjection
 {
     internal class DefaultDispatcherConfigureOptions : IConfigureOptions<DispatcherOptions>
     {
diff --git a/src/Microsoft.AspNetCore.Dispatcher/DispatcherServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DispatcherServiceCollectionExtensions.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Dispatcher/DispatcherServiceCollectionExtensions.cs
rename to src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DispatcherServiceCollectionExtensions.cs
index 58444b4357..bd81283ac6 100644
--- a/src/Microsoft.AspNetCore.Dispatcher/DispatcherServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Dispatcher/DependencyInjection/DispatcherServiceCollectionExtensions.cs
@@ -5,7 +5,6 @@ using System;
 using Microsoft.AspNetCore.Dispatcher;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection