diff --git a/src/MusicStore/Program.cs b/src/MusicStore/Program.cs
new file mode 100644
index 0000000000..ec106508f9
--- /dev/null
+++ b/src/MusicStore/Program.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNet.Hosting;
+
+namespace MusicStore
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup("MusicStore")
+                .Build();
+
+            application.Run();
+        }
+    }
+}
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 3fb99d2cae..8244573723 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -220,15 +220,5 @@ namespace MusicStore
             //Populates the MusicStore sample data
             SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
         }
-
-        public static void Main(string[] args)
-        {
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
-                .UseStartup<Startup>()
-                .Build();
-
-            application.Run();
-        }
     }
 }
\ No newline at end of file