diff --git a/BlazorSharedDemo.ServerApp/App.razor b/BlazorSharedDemo.ServerApp/App.razor
deleted file mode 100644
index 6fd3ed1..0000000
--- a/BlazorSharedDemo.ServerApp/App.razor
+++ /dev/null
@@ -1,12 +0,0 @@
-<Router AppAssembly="@typeof(App).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-    </Found>
-    <NotFound>
-        <PageTitle>Not found</PageTitle>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p role="alert">Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>
diff --git a/BlazorSharedDemo.ServerApp/BlazorSharedDemo.ServerApp.csproj b/BlazorSharedDemo.ServerApp/BlazorSharedDemo.ServerApp.csproj
index 52f45fd..aaa3fed 100644
--- a/BlazorSharedDemo.ServerApp/BlazorSharedDemo.ServerApp.csproj
+++ b/BlazorSharedDemo.ServerApp/BlazorSharedDemo.ServerApp.csproj
@@ -10,4 +10,8 @@
     <ProjectReference Include="..\BlazorSharedDemo.SharedUI\BlazorSharedDemo.SharedUI.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Shared\" />
+  </ItemGroup>
+
 </Project>
diff --git a/BlazorSharedDemo.ServerApp/MainLayout.razor b/BlazorSharedDemo.ServerApp/MainLayout.razor
deleted file mode 100644
index a5af348..0000000
--- a/BlazorSharedDemo.ServerApp/MainLayout.razor
+++ /dev/null
@@ -1,3 +0,0 @@
-@inherits LayoutComponentBase
-
-<main> @Body </main>
diff --git a/BlazorSharedDemo.ServerApp/Pages/Index.razor b/BlazorSharedDemo.ServerApp/Pages/Index.razor
index cba3252..864a8e9 100644
--- a/BlazorSharedDemo.ServerApp/Pages/Index.razor
+++ b/BlazorSharedDemo.ServerApp/Pages/Index.razor
@@ -1,3 +1,3 @@
 @page "/"
 
-<h1>Hello, world!</h1>
+<h1>ServerApp Hello!</h1>
diff --git a/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml b/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml
index 79d6855..36bd90d 100644
--- a/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml
+++ b/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml
@@ -1,4 +1,5 @@
 @page "/"
+@using BlazorSharedDemo.SharedUI;
 @using Microsoft.AspNetCore.Components.Web
 @namespace BlazorSharedDemo.ServerApp.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/BlazorSharedDemo.ServerApp/_Imports.razor b/BlazorSharedDemo.ServerApp/_Imports.razor
index 6869169..cbef72a 100644
--- a/BlazorSharedDemo.ServerApp/_Imports.razor
+++ b/BlazorSharedDemo.ServerApp/_Imports.razor
@@ -1,4 +1,7 @@
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
+
+@using BlazorSharedDemo.SharedUI;
+
 @using BlazorSharedDemo.ServerApp
diff --git a/BlazorSharedDemo.WaslApp/App.razor b/BlazorSharedDemo.SharedUI/App.razor
similarity index 100%
rename from BlazorSharedDemo.WaslApp/App.razor
rename to BlazorSharedDemo.SharedUI/App.razor
diff --git a/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj b/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj
index e537315..64059cd 100644
--- a/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj
+++ b/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Pages\" />
     <Folder Include="Services\" />
     <Folder Include="Shared\" />
     <Folder Include="Models\" />
diff --git a/BlazorSharedDemo.WaslApp/MainLayout.razor b/BlazorSharedDemo.SharedUI/MainLayout.razor
similarity index 100%
rename from BlazorSharedDemo.WaslApp/MainLayout.razor
rename to BlazorSharedDemo.SharedUI/MainLayout.razor
diff --git a/BlazorSharedDemo.SharedUI/Pages/Index.razor b/BlazorSharedDemo.SharedUI/Pages/Index.razor
new file mode 100644
index 0000000..77bf548
--- /dev/null
+++ b/BlazorSharedDemo.SharedUI/Pages/Index.razor
@@ -0,0 +1,7 @@
+
+@page "/"
+<h3>SharedUI Hello!</h3>
+
+@code {
+
+}
diff --git a/BlazorSharedDemo.WaslApp/Program.cs b/BlazorSharedDemo.WaslApp/Program.cs
index f0be21d..b2ab27a 100644
--- a/BlazorSharedDemo.WaslApp/Program.cs
+++ b/BlazorSharedDemo.WaslApp/Program.cs
@@ -1,8 +1,9 @@
-using BlazorSharedDemo.WaslApp;
-
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
+using BlazorSharedDemo.SharedUI;
+using BlazorSharedDemo.WaslApp;
+
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
diff --git a/BlazorSharedDemo.sln b/BlazorSharedDemo.sln
index 5f999e2..7186a46 100644
--- a/BlazorSharedDemo.sln
+++ b/BlazorSharedDemo.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33712.159
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSharedDemo.SharedUI", "BlazorSharedDemo.SharedUI\BlazorSharedDemo.SharedUI.csproj", "{AF0869F6-7176-4AB1-B79F-5C7651D36606}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSharedDemo.SharedUI", "BlazorSharedDemo.SharedUI\BlazorSharedDemo.SharedUI.csproj", "{AF0869F6-7176-4AB1-B79F-5C7651D36606}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSharedDemo.ServerApp", "BlazorSharedDemo.ServerApp\BlazorSharedDemo.ServerApp.csproj", "{2A713A1E-6F33-4F66-A6B9-A8264BA01270}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSharedDemo.ServerApp", "BlazorSharedDemo.ServerApp\BlazorSharedDemo.ServerApp.csproj", "{2A713A1E-6F33-4F66-A6B9-A8264BA01270}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSharedDemo.WaslApp", "BlazorSharedDemo.WaslApp\BlazorSharedDemo.WaslApp.csproj", "{7DE872E2-729B-413A-BAA7-2BD2B9089568}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSharedDemo.WaslApp", "BlazorSharedDemo.WaslApp\BlazorSharedDemo.WaslApp.csproj", "{7DE872E2-729B-413A-BAA7-2BD2B9089568}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution