diff --git a/src/Microsoft.ComponentDetection/Program.cs b/src/Microsoft.ComponentDetection/Program.cs
index 143549ea8..232a0ece5 100644
--- a/src/Microsoft.ComponentDetection/Program.cs
+++ b/src/Microsoft.ComponentDetection/Program.cs
@@ -1,13 +1,14 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.ComponentDetection.Contracts;
-
-namespace Microsoft.ComponentDetection.Loader
+namespace Microsoft.ComponentDetection
 {
+    using System;
+    using System.Diagnostics;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.ComponentDetection.Contracts;
+
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
             try
             {
@@ -22,7 +23,7 @@ public static void Main(string[] args)
 
                     while (!Debugger.IsAttached)
                     {
-                        System.Threading.Tasks.Task.Delay(1000).GetAwaiter().GetResult();
+                        await Task.Delay(1000);
                     }
                 }
 
@@ -43,7 +44,7 @@ public static void Main(string[] args)
             }
             catch (ArgumentException ae)
             {
-                Console.Error.WriteLine(ae.ToString());
+                await Console.Error.WriteLineAsync(ae.ToString());
                 Environment.Exit(-1);
             }
         }