diff --git a/src/App/App.csproj b/src/App/App.csproj
index 212cd358b..6f8350341 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -87,7 +87,7 @@
     <Compile Update="Pages\Vault\ViewPage.xaml.cs">
       <DependentUpon>ViewPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Pages\Settings\SettingsPage.xaml.cs">
+    <Compile Update="Pages\Settings\SettingsPage\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
     <Compile Update="Pages\Vault\GroupingsPage\GroupingsPage.xaml.cs">
diff --git a/src/App/Pages/Settings/SettingsPage.xaml b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
similarity index 100%
rename from src/App/Pages/Settings/SettingsPage.xaml
rename to src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
diff --git a/src/App/Pages/Settings/SettingsPage.xaml.cs b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
similarity index 100%
rename from src/App/Pages/Settings/SettingsPage.xaml.cs
rename to src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
diff --git a/src/App/Pages/Settings/SettingsPageListGroup.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageListGroup.cs
similarity index 100%
rename from src/App/Pages/Settings/SettingsPageListGroup.cs
rename to src/App/Pages/Settings/SettingsPage/SettingsPageListGroup.cs
diff --git a/src/App/Pages/Settings/SettingsPageListItem.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
similarity index 100%
rename from src/App/Pages/Settings/SettingsPageListItem.cs
rename to src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
diff --git a/src/App/Pages/Settings/SettingsPageListItemSelector.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageListItemSelector.cs
similarity index 100%
rename from src/App/Pages/Settings/SettingsPageListItemSelector.cs
rename to src/App/Pages/Settings/SettingsPage/SettingsPageListItemSelector.cs
diff --git a/src/App/Pages/Settings/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
similarity index 100%
rename from src/App/Pages/Settings/SettingsPageViewModel.cs
rename to src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs