diff --git a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
index 8de9dad273..7c7f6fcda4 100644
--- a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
+++ b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HostedInAspNet.Client\HostedInAspNet.Client.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\src\Microsoft.Blazor.Server\Microsoft.Blazor.Server.csproj" />
+    <ProjectReference Include="..\HostedInAspNet.Client\HostedInAspNet.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/HostedInAspNet.Server/Startup.cs b/samples/HostedInAspNet.Server/Startup.cs
index bea85f7bed..576c37f634 100644
--- a/samples/HostedInAspNet.Server/Startup.cs
+++ b/samples/HostedInAspNet.Server/Startup.cs
@@ -25,7 +25,7 @@ namespace HostedInAspNet.Server
                 app.UseBlazorDevelopmentServer("../HostedInAspNet.Client");
             }
 
-            app.UseBlazor();
+            app.UseBlazor<Client.Program>();
         }
     }
 }
diff --git a/samples/MonoSanity/Startup.cs b/samples/MonoSanity/Startup.cs
index aa6d8d6245..144ea796f3 100644
--- a/samples/MonoSanity/Startup.cs
+++ b/samples/MonoSanity/Startup.cs
@@ -15,29 +15,7 @@ namespace MonoSanity
         {
             app.UseDeveloperExceptionPage();
             app.UseFileServer();
-            app.UseBlazor();
-            
-            ServeSingleStaticFile(app, 
-                "/clientBin/MonoSanityClient.dll",
-                typeof(Examples).Assembly.Location);            
-        }
-
-        private void ServeSingleStaticFile(IApplicationBuilder app, string url, string physicalPath)
-        {
-            // This is not implemented efficiently (e.g., doesn't support cache control headers)
-            // so don't use this in real applications. Use 'UseStaticFiles' or similar instead.
-            app.Use((context, next) =>
-            {
-                if (context.Request.Path == url)
-                {
-                    context.Response.ContentType = MediaTypeNames.Application.Octet;
-                    return File.OpenRead(physicalPath).CopyToAsync(context.Response.Body);
-                }
-                else
-                {
-                    return next();
-                }
-            });
+            app.UseBlazor<MonoSanityClient.Examples>();         
         }
     }
 }
diff --git a/samples/MonoSanity/wwwroot/index.html b/samples/MonoSanity/wwwroot/index.html
index b0ba50cf6c..52ee7448df 100644
--- a/samples/MonoSanity/wwwroot/index.html
+++ b/samples/MonoSanity/wwwroot/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+﻿<!DOCTYPE html>
 <html>
 <head>
   <title>Mono sanity check</title>
@@ -40,7 +40,7 @@
 
   <script src="loader.js"></script>
   <script>
-    initMono(['/clientBin/MonoSanityClient.dll'], function () {
+    initMono(['/_framework/_bin/MonoSanityClient.dll'], function () {
       var buttons = document.getElementsByTagName('button');
       for (var i = 0; i < buttons.length; i++) {
         buttons[i].disabled = false;
diff --git a/samples/MonoSanityClient/Examples.cs b/samples/MonoSanityClient/Examples.cs
index 24be61d54e..9983c89cd0 100644
--- a/samples/MonoSanityClient/Examples.cs
+++ b/samples/MonoSanityClient/Examples.cs
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace MonoSanityClient
 {
-    public static class Examples
+    public class Examples
     {
         public static string AddNumbers(int a, int b)
             => (a + b).ToString();
diff --git a/src/Microsoft.Blazor.Browser/src/Boot.ts b/src/Microsoft.Blazor.Browser/src/Boot.ts
index ac8b00a748..dc04668436 100644
--- a/src/Microsoft.Blazor.Browser/src/Boot.ts
+++ b/src/Microsoft.Blazor.Browser/src/Boot.ts
@@ -18,9 +18,8 @@ async function boot() {
 
   // Determine the URLs of the assemblies we want to load
   const loadAssemblyUrls = [entryPoint]
-    .concat(referenceAssemblies)      // Developer-specified references
-    .concat(['Microsoft.Blazor.dll']) // Standard references
-    .map(filename => `/_bin/${filename}`);
+    .concat(referenceAssemblies)
+    .map(filename => `/_framework/_bin/${filename}`);
 
   try {
     await platform.start(loadAssemblyUrls);
diff --git a/src/Microsoft.Blazor.DevHost/Server/Startup.cs b/src/Microsoft.Blazor.DevHost/Server/Startup.cs
index 80323c395c..148aa8c7f6 100644
--- a/src/Microsoft.Blazor.DevHost/Server/Startup.cs
+++ b/src/Microsoft.Blazor.DevHost/Server/Startup.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Blazor.DevHost.Server
         {
             app.UseDeveloperExceptionPage();
             app.UseBlazorDevelopmentServer(".");
-            app.UseBlazor();
+            app.UseBlazor<object>(); // TODO
         }
     }
 }
diff --git a/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs b/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs
index 67f6baf0f0..96dc2e743f 100644
--- a/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs
+++ b/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs
@@ -10,12 +10,14 @@ namespace Microsoft.AspNetCore.Builder
 {
     public static class BlazorAppBuilderExtensions
     {
-        public static void UseBlazor(this IApplicationBuilder applicationBuilder)
+        public static void UseBlazor<TProgram>(this IApplicationBuilder applicationBuilder)
         {
+            var clientAppAssembly = typeof(TProgram).Assembly;
+
             applicationBuilder.UseStaticFiles(new StaticFileOptions
             {
                 RequestPath = "/_framework",
-                FileProvider = ClientFileProvider.Instantiate(),
+                FileProvider = ClientFileProvider.Instantiate(clientAppAssembly),
                 ContentTypeProvider = CreateContentTypeProvider(),
             });
         }
diff --git a/src/Microsoft.Blazor.Server/ClientFilesystem/ClientFileProvider.cs b/src/Microsoft.Blazor.Server/ClientFilesystem/ClientFileProvider.cs
index 3481a12f76..b4514c23e4 100644
--- a/src/Microsoft.Blazor.Server/ClientFilesystem/ClientFileProvider.cs
+++ b/src/Microsoft.Blazor.Server/ClientFilesystem/ClientFileProvider.cs
@@ -4,15 +4,17 @@
 using Microsoft.Blazor.Browser;
 using Microsoft.Blazor.Mono;
 using Microsoft.Extensions.FileProviders;
+using System.Reflection;
 
 namespace Microsoft.Blazor.Server.ClientFilesystem
 {
     internal static class ClientFileProvider
     {
-        public static IFileProvider Instantiate()
+        public static IFileProvider Instantiate(Assembly clientApp)
             => new CompositeFileProvider(
                 MonoStaticFileProvider.JsFiles,
                 MonoStaticFileProvider.BclFiles, // TODO: Stop serving these, and serve the ReferencedAssemblyFileProvider instead
-                BlazorBrowserFileProvider.Instance);
+                BlazorBrowserFileProvider.Instance,
+                new ReferencedAssemblyFileProvider(clientApp, MonoStaticFileProvider.BclFiles));
     }
 }
