diff --git a/src/Templates/src/templates/maui-blazor/Routes.razor b/src/Templates/src/templates/maui-blazor/Components/Routes.razor
similarity index 87%
rename from src/Templates/src/templates/maui-blazor/Routes.razor
rename to src/Templates/src/templates/maui-blazor/Components/Routes.razor
index 339a6a40060e..631cf8054724 100644
--- a/src/Templates/src/templates/maui-blazor/Routes.razor
+++ b/src/Templates/src/templates/maui-blazor/Components/Routes.razor
@@ -1,6 +1,6 @@
 <Router AppAssembly="@typeof(MauiProgram).Assembly">
     <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(Components.Layout.MainLayout)" />
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
 </Router>
diff --git a/src/Templates/src/templates/maui-blazor/_Imports.razor b/src/Templates/src/templates/maui-blazor/Components/_Imports.razor
similarity index 100%
rename from src/Templates/src/templates/maui-blazor/_Imports.razor
rename to src/Templates/src/templates/maui-blazor/Components/_Imports.razor
diff --git a/src/Templates/src/templates/maui-blazor/MainPage.xaml b/src/Templates/src/templates/maui-blazor/MainPage.xaml
index 96a89841851c..3a086bcd3cdd 100644
--- a/src/Templates/src/templates/maui-blazor/MainPage.xaml
+++ b/src/Templates/src/templates/maui-blazor/MainPage.xaml
@@ -7,7 +7,7 @@
 
     <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
         <BlazorWebView.RootComponents>
-            <RootComponent Selector="#app" ComponentType="{x:Type local:Routes}" />
+            <RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
         </BlazorWebView.RootComponents>
     </BlazorWebView>