diff --git a/samples/StandaloneApp/App.cshtml b/samples/StandaloneApp/App.cshtml
index c115391ee3..00b1330e12 100644
--- a/samples/StandaloneApp/App.cshtml
+++ b/samples/StandaloneApp/App.cshtml
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Blazor.Routing
-<!--
+<!--
     Configuring this stuff here is temporary. Later we'll move the app config
     into Program.cs, and it won't be necessary to specify AppAssembly.
 -->
diff --git a/samples/StandaloneApp/Pages/FetchData.cshtml b/samples/StandaloneApp/Pages/FetchData.cshtml
index e426907457..2cc8cbfcb6 100644
--- a/samples/StandaloneApp/Pages/FetchData.cshtml
+++ b/samples/StandaloneApp/Pages/FetchData.cshtml
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Blazor
-@using Microsoft.AspNetCore.Blazor.Browser.Services.Temporary
+@using Microsoft.AspNetCore.Blazor.Browser.Services.Temporary
 @inject HttpClient Http
 
 <h1>Weather forecast</h1>
diff --git a/samples/StandaloneApp/Pages/_ViewImports.cshtml b/samples/StandaloneApp/Pages/_ViewImports.cshtml
index 55ec034759..7dabd59f01 100644
--- a/samples/StandaloneApp/Pages/_ViewImports.cshtml
+++ b/samples/StandaloneApp/Pages/_ViewImports.cshtml
@@ -1 +1 @@
-@(Layout<StandaloneApp.Shared.MainLayout>())
+@(Layout<MainLayout>())
diff --git a/samples/StandaloneApp/Shared/MainLayout.cshtml b/samples/StandaloneApp/Shared/MainLayout.cshtml
index e9fc4a1131..0d01343695 100644
--- a/samples/StandaloneApp/Shared/MainLayout.cshtml
+++ b/samples/StandaloneApp/Shared/MainLayout.cshtml
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Blazor.RenderTree
-@(Implements<Microsoft.AspNetCore.Blazor.Layouts.ILayoutComponent>())
+@(Implements<ILayoutComponent>())
 
 <div class='container-fluid'>
     <div class='row'>
diff --git a/samples/StandaloneApp/Shared/NavMenu.cshtml b/samples/StandaloneApp/Shared/NavMenu.cshtml
index f11d7ec1c2..17f6de6f62 100644
--- a/samples/StandaloneApp/Shared/NavMenu.cshtml
+++ b/samples/StandaloneApp/Shared/NavMenu.cshtml
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Blazor.Routing
-<div class='main-nav'>
+<div class='main-nav'>
     <div class='navbar navbar-inverse'>
         <div class='navbar-header'>
             <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'>
diff --git a/samples/StandaloneApp/_ViewImports.cshtml b/samples/StandaloneApp/_ViewImports.cshtml
new file mode 100644
index 0000000000..caea86a11a
--- /dev/null
+++ b/samples/StandaloneApp/_ViewImports.cshtml
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Blazor
+@using Microsoft.AspNetCore.Blazor.Layouts
+@using Microsoft.AspNetCore.Blazor.Routing
+@using StandaloneApp
+@using StandaloneApp.Shared
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ScopeStack.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ScopeStack.cs
index f61ffac0ed..4b8ce02301 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ScopeStack.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ScopeStack.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
     /// </summary>
     internal class ScopeStack
     {
-        private const string _renderFragmentTypeName = "Microsoft.AspNetCore.Blazor.RenderTree.RenderFragment";
+        private const string _renderFragmentTypeName = "Microsoft.AspNetCore.Blazor.RenderFragment";
 
         private readonly Stack<ScopeEntry> _stack = new Stack<ScopeEntry>();
         private int _builderVarNumber = 1;
diff --git a/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderFragment.cs b/src/Microsoft.AspNetCore.Blazor/RenderFragment.cs
similarity index 86%
rename from src/Microsoft.AspNetCore.Blazor/RenderTree/RenderFragment.cs
rename to src/Microsoft.AspNetCore.Blazor/RenderFragment.cs
index 6b206bfc20..529c4c753f 100644
--- a/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderFragment.cs
+++ b/src/Microsoft.AspNetCore.Blazor/RenderFragment.cs
@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Blazor.RenderTree
+using Microsoft.AspNetCore.Blazor.RenderTree;
+
+namespace Microsoft.AspNetCore.Blazor
 {
     /// <summary>
     /// Represents a segment of UI content, implemented as a delegate that
diff --git a/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.cs b/src/Microsoft.AspNetCore.Blazor/UIEventArgs.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.cs
rename to src/Microsoft.AspNetCore.Blazor/UIEventArgs.cs
index abe4da6b83..c11149579a 100644
--- a/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.cs
+++ b/src/Microsoft.AspNetCore.Blazor/UIEventArgs.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Blazor.RenderTree
+namespace Microsoft.AspNetCore.Blazor
 {
     /// <summary>
     /// Supplies information about an event that is being raised.
diff --git a/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.cs b/src/Microsoft.AspNetCore.Blazor/UIEventHandler.cs
similarity index 87%
rename from src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.cs
rename to src/Microsoft.AspNetCore.Blazor/UIEventHandler.cs
index 37b78f6b0f..2e9b983ed4 100644
--- a/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.cs
+++ b/src/Microsoft.AspNetCore.Blazor/UIEventHandler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Blazor.RenderTree
+namespace Microsoft.AspNetCore.Blazor
 {
     /// <summary>
     /// Handles an event raised for a <see cref="RenderTreeFrame"/>.
diff --git a/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs
index f477631a36..122b92ebc8 100644
--- a/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs
@@ -265,7 +265,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
                 @functions {
                     public bool HandlerWasCalled { get; set; } = false;
 
-                    void MyHandleEvent(Microsoft.AspNetCore.Blazor.RenderTree.UIEventArgs eventArgs)
+                    void MyHandleEvent(Microsoft.AspNetCore.Blazor.UIEventArgs eventArgs)
                     {
                         HandlerWasCalled = true;
                     }
diff --git a/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml b/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml
index f929f23651..92e4e0aa3e 100644
--- a/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml
+++ b/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml
@@ -1,5 +1,5 @@
 @using System.Collections.Generic
-@using Microsoft.AspNetCore.Blazor.RenderTree
+@using Microsoft.AspNetCore.Blazor
 Type here: <input onkeypress=@OnKeyPressed />
 <ul>
     @foreach (var key in keysPressed)
diff --git a/test/testapps/BasicTestApp/RenderFragmentToggler.cshtml b/test/testapps/BasicTestApp/RenderFragmentToggler.cshtml
index 1c15a9037f..228f6187e0 100644
--- a/test/testapps/BasicTestApp/RenderFragmentToggler.cshtml
+++ b/test/testapps/BasicTestApp/RenderFragmentToggler.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Blazor.RenderTree
+@using Microsoft.AspNetCore.Blazor
 <div>
     <p>Fragment will be toggled below</p>