diff --git a/Needlework.Net/Needlework.Net.csproj b/Needlework.Net/Needlework.Net.csproj
index 081ece2..ef9256d 100644
--- a/Needlework.Net/Needlework.Net.csproj
+++ b/Needlework.Net/Needlework.Net.csproj
@@ -55,7 +55,7 @@
     <Compile Update="Views\MainWindow\MainWindowView.axaml.cs">
       <DependentUpon>MainWindowView.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\Pages\EndpointView.axaml.cs">
+    <Compile Update="Views\Pages\Endpoints\EndpointView.axaml.cs">
       <DependentUpon>EndpointView.axaml</DependentUpon>
     </Compile>
   </ItemGroup>
diff --git a/Needlework.Net/Views/Pages/EndpointView.axaml b/Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml
similarity index 99%
rename from Needlework.Net/Views/Pages/EndpointView.axaml
rename to Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml
index d24613b..f053941 100644
--- a/Needlework.Net/Views/Pages/EndpointView.axaml
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml
@@ -7,7 +7,7 @@
 		xmlns:avalonEdit="https://github.com/avaloniaui/avaloniaedit"
 		xmlns:controls="using:Needlework.Net.Controls"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Needlework.Net.Views.Pages.EndpointView"
+        x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointView"
 		x:DataType="vm:EndpointViewModel">
 	<UserControl.Styles>
 		<Style Selector="DataGrid">
diff --git a/Needlework.Net/Views/Pages/EndpointView.axaml.cs b/Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml.cs
similarity index 98%
rename from Needlework.Net/Views/Pages/EndpointView.axaml.cs
rename to Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml.cs
index 0ae310d..c404360 100644
--- a/Needlework.Net/Views/Pages/EndpointView.axaml.cs
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointView.axaml.cs
@@ -7,7 +7,7 @@ using Needlework.Net.ViewModels.Pages.Endpoints;
 using Needlework.Net.ViewModels.Shared;
 using TextMateSharp.Grammars;
 
-namespace Needlework.Net.Views.Pages;
+namespace Needlework.Net.Views.Pages.Endpoints;
 
 public partial class EndpointView : UserControl
 {
diff --git a/Needlework.Net/Views/Pages/EndpointsContainerView.axaml b/Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml
similarity index 93%
rename from Needlework.Net/Views/Pages/EndpointsContainerView.axaml
rename to Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml
index 6f2a7fd..c7e8122 100644
--- a/Needlework.Net/Views/Pages/EndpointsContainerView.axaml
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml
@@ -6,7 +6,7 @@
 			xmlns:avalonEdit="https://github.com/avaloniaui/avaloniaedit"
 			xmlns:i="https://github.com/projektanker/icons.avalonia"
 			mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-			x:Class="Needlework.Net.Views.Pages.EndpointsContainerView"
+			x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsContainerView"
 			x:DataType="vm:EndpointsContainerViewModel">
 	<Grid RowDefinitions="auto,*"
 		  ColumnDefinitions="*"
diff --git a/Needlework.Net/Views/Pages/EndpointsContainerView.axaml.cs b/Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml.cs
similarity index 77%
rename from Needlework.Net/Views/Pages/EndpointsContainerView.axaml.cs
rename to Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml.cs
index af86fd0..f1e4494 100644
--- a/Needlework.Net/Views/Pages/EndpointsContainerView.axaml.cs
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointsContainerView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Views.Pages;
+namespace Needlework.Net.Views.Pages.Endpoints;
 
 public partial class EndpointsContainerView : UserControl
 {
diff --git a/Needlework.Net/Views/Pages/EndpointsView.axaml b/Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml
similarity index 95%
rename from Needlework.Net/Views/Pages/EndpointsView.axaml
rename to Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml
index 7415266..c78f2f5 100644
--- a/Needlework.Net/Views/Pages/EndpointsView.axaml
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml
@@ -6,7 +6,7 @@
 		xmlns:controls="using:Needlework.Net.Controls"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
 		Name="EndpointsControl"
-        x:Class="Needlework.Net.Views.Pages.EndpointsView"
+        x:Class="Needlework.Net.Views.Pages.Endpoints.EndpointsView"
 		x:DataType="vm:EndpointsViewModel">
 	<controls:BusyArea IsBusy="{Binding IsBusy}"
 					   BusyText="Loading...">
diff --git a/Needlework.Net/Views/Pages/EndpointsView.axaml.cs b/Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml.cs
similarity index 76%
rename from Needlework.Net/Views/Pages/EndpointsView.axaml.cs
rename to Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml.cs
index 44bd16d..6609532 100644
--- a/Needlework.Net/Views/Pages/EndpointsView.axaml.cs
+++ b/Needlework.Net/Views/Pages/Endpoints/EndpointsView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Views.Pages;
+namespace Needlework.Net.Views.Pages.Endpoints;
 
 public partial class EndpointsView : UserControl
 {