diff --git a/src/App/App.csproj b/src/App/App.csproj
index 0ec75a9d2..9f835f135 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -34,13 +34,13 @@
     <Compile Update="Pages\Accounts\LoginPage.xaml.cs">
       <DependentUpon>LoginPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Pages\GeneratorPage.xaml.cs">
+    <Compile Update="Pages\Generator\GeneratorPage.xaml.cs">
       <DependentUpon>GeneratorPage.xaml</DependentUpon>
     </Compile>
     <Compile Update="Pages\Vault\ViewPage.xaml.cs">
       <DependentUpon>ViewPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Pages\SettingsPage.xaml.cs">
+    <Compile Update="Pages\Settings\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
     <Compile Update="Pages\Vault\GroupingsPage\GroupingsPage.xaml.cs">
diff --git a/src/App/Pages/HomePage.xaml b/src/App/Pages/Accounts/HomePage.xaml
similarity index 100%
rename from src/App/Pages/HomePage.xaml
rename to src/App/Pages/Accounts/HomePage.xaml
diff --git a/src/App/Pages/HomePage.xaml.cs b/src/App/Pages/Accounts/HomePage.xaml.cs
similarity index 100%
rename from src/App/Pages/HomePage.xaml.cs
rename to src/App/Pages/Accounts/HomePage.xaml.cs
diff --git a/src/App/Pages/HomePageViewModel.cs b/src/App/Pages/Accounts/HomePageViewModel.cs
similarity index 100%
rename from src/App/Pages/HomePageViewModel.cs
rename to src/App/Pages/Accounts/HomePageViewModel.cs
diff --git a/src/App/Pages/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
similarity index 100%
rename from src/App/Pages/GeneratorPage.xaml
rename to src/App/Pages/Generator/GeneratorPage.xaml
diff --git a/src/App/Pages/GeneratorPage.xaml.cs b/src/App/Pages/Generator/GeneratorPage.xaml.cs
similarity index 100%
rename from src/App/Pages/GeneratorPage.xaml.cs
rename to src/App/Pages/Generator/GeneratorPage.xaml.cs
diff --git a/src/App/Pages/GeneratorPageViewModel.cs b/src/App/Pages/Generator/GeneratorPageViewModel.cs
similarity index 100%
rename from src/App/Pages/GeneratorPageViewModel.cs
rename to src/App/Pages/Generator/GeneratorPageViewModel.cs
diff --git a/src/App/Pages/SettingsPage.xaml b/src/App/Pages/Settings/SettingsPage.xaml
similarity index 100%
rename from src/App/Pages/SettingsPage.xaml
rename to src/App/Pages/Settings/SettingsPage.xaml
diff --git a/src/App/Pages/SettingsPage.xaml.cs b/src/App/Pages/Settings/SettingsPage.xaml.cs
similarity index 100%
rename from src/App/Pages/SettingsPage.xaml.cs
rename to src/App/Pages/Settings/SettingsPage.xaml.cs
diff --git a/src/App/Pages/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPageViewModel.cs
similarity index 100%
rename from src/App/Pages/SettingsPageViewModel.cs
rename to src/App/Pages/Settings/SettingsPageViewModel.cs