diff --git a/PointingParty.Client.Tests/GameUiTests.cs b/PointingParty.Client.Tests/GameUiTests.cs
index 15144fe..429707a 100644
--- a/PointingParty.Client.Tests/GameUiTests.cs
+++ b/PointingParty.Client.Tests/GameUiTests.cs
@@ -1,4 +1,5 @@
 using AngleSharp.Dom;
+using PointingParty.Client.Components;
 using PointingParty.Domain;
 using PointingParty.Domain.Events;
 
@@ -111,4 +112,4 @@ public void Shows_Votes_After_VotesShown_Event()
         var results = cut.Find("""[data-testid="vote-for-Player Two"]""");
         Assert.Equal("8", results.GetInnerText());
     }
-}
\ No newline at end of file
+}
diff --git a/PointingParty.Client.Tests/Pages/GameTests.cs b/PointingParty.Client.Tests/Pages/GameTests.cs
index d18d572..98ccbf6 100644
--- a/PointingParty.Client.Tests/Pages/GameTests.cs
+++ b/PointingParty.Client.Tests/Pages/GameTests.cs
@@ -1,6 +1,7 @@
 using Bunit.TestDoubles;
 using Microsoft.Extensions.DependencyInjection;
-using PointingParty.Client.Pages;
+using PointingParty.Client.Components;
+using PointingParty.Client.Components.Pages;
 using PointingParty.Domain;
 
 namespace PointingParty.Client.Tests.Pages;
diff --git a/PointingParty.Client/FatButton.razor b/PointingParty.Client/Components/FatButton.razor
similarity index 100%
rename from PointingParty.Client/FatButton.razor
rename to PointingParty.Client/Components/FatButton.razor
diff --git a/PointingParty.Client/GameUi.razor b/PointingParty.Client/Components/GameUi.razor
similarity index 100%
rename from PointingParty.Client/GameUi.razor
rename to PointingParty.Client/Components/GameUi.razor
diff --git a/PointingParty.Client/Pages/Game.razor b/PointingParty.Client/Components/Pages/Game.razor
similarity index 100%
rename from PointingParty.Client/Pages/Game.razor
rename to PointingParty.Client/Components/Pages/Game.razor
diff --git a/PointingParty.Client/ScoreGraph.razor b/PointingParty.Client/Components/ScoreGraph.razor
similarity index 100%
rename from PointingParty.Client/ScoreGraph.razor
rename to PointingParty.Client/Components/ScoreGraph.razor
diff --git a/PointingParty.Client/VoteButton.razor b/PointingParty.Client/Components/VoteButton.razor
similarity index 100%
rename from PointingParty.Client/VoteButton.razor
rename to PointingParty.Client/Components/VoteButton.razor
diff --git a/PointingParty.Client/_Imports.razor b/PointingParty.Client/Components/_Imports.razor
similarity index 83%
rename from PointingParty.Client/_Imports.razor
rename to PointingParty.Client/Components/_Imports.razor
index fac8e1f..d85cbcb 100644
--- a/PointingParty.Client/_Imports.razor
+++ b/PointingParty.Client/Components/_Imports.razor
@@ -6,4 +6,5 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using PointingParty.Client
\ No newline at end of file
+@using PointingParty.Client
+@using PointingParty.Client.Components
diff --git a/PointingParty.Client/PointingParty.Client.csproj b/PointingParty.Client/PointingParty.Client.csproj
index e35891e..fa5794b 100644
--- a/PointingParty.Client/PointingParty.Client.csproj
+++ b/PointingParty.Client/PointingParty.Client.csproj
@@ -23,4 +23,13 @@
         <ProjectReference Include="..\PointingParty.Domain\PointingParty.Domain.csproj"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <AdditionalFiles Include="Components\FatButton.razor" />
+      <AdditionalFiles Include="Components\GameUi.razor" />
+      <AdditionalFiles Include="Components\Pages\Game.razor" />
+      <AdditionalFiles Include="Components\ScoreGraph.razor" />
+      <AdditionalFiles Include="Components\VoteButton.razor" />
+      <AdditionalFiles Include="Components\_Imports.razor" />
+    </ItemGroup>
+
 </Project>
diff --git a/PointingParty/Components/Routes.razor b/PointingParty/Components/Routes.razor
index d5ed33e..23bc3a6 100644
--- a/PointingParty/Components/Routes.razor
+++ b/PointingParty/Components/Routes.razor
@@ -1,7 +1,7 @@
 @using PointingParty.Components.Layout
-<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
+<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client.Components._Imports).Assembly }">
     <Found Context="routeData">
         <RouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)"/>
         <FocusOnNavigate RouteData="routeData" Selector="h1"/>
     </Found>
-</Router>
\ No newline at end of file
+</Router>
diff --git a/PointingParty/Program.cs b/PointingParty/Program.cs
index e0200c6..1a6f859 100644
--- a/PointingParty/Program.cs
+++ b/PointingParty/Program.cs
@@ -1,7 +1,7 @@
 using PointingParty;
 using PointingParty.Client;
 using PointingParty.Components;
-using _Imports = PointingParty.Client._Imports;
+using _Imports = PointingParty.Client.Components._Imports;
 
 var builder = WebApplication.CreateBuilder(args);