diff --git a/src/SmtpServer/Extensions/TaskExtensions.cs b/src/SmtpServer/Extensions/TaskExtensions.cs
index 842cc65..98722d0 100644
--- a/src/SmtpServer/Extensions/TaskExtensions.cs
+++ b/src/SmtpServer/Extensions/TaskExtensions.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SmtpServer
+namespace SmtpServer.Extensions
 {
     /// <summary>
     /// Task Extensions
diff --git a/src/SmtpServer/Net/EndpointListener.cs b/src/SmtpServer/Net/EndpointListener.cs
index c7d2946..8b2686d 100644
--- a/src/SmtpServer/Net/EndpointListener.cs
+++ b/src/SmtpServer/Net/EndpointListener.cs
@@ -2,6 +2,7 @@
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
+using SmtpServer.Extensions;
 using SmtpServer.IO;
 
 namespace SmtpServer.Net