diff --git a/src/App/App.csproj b/src/App/App.csproj
index c12e76863..0e8525646 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -104,15 +104,15 @@
     <Compile Include="Models\Page\VaultViewSitePageModel.cs" />
     <Compile Include="Pages\HomePage.cs" />
     <Compile Include="Pages\RegisterPage.cs" />
-    <Compile Include="Pages\SettingsPinPage.cs" />
-    <Compile Include="Pages\LockPinPage.cs" />
+    <Compile Include="Pages\Settings\SettingsPinPage.cs" />
+    <Compile Include="Pages\Lock\LockPinPage.cs" />
     <Compile Include="Pages\MainPage.cs" />
-    <Compile Include="Pages\SettingsEditFolderPage.cs" />
-    <Compile Include="Pages\LockFingerprintPage.cs" />
-    <Compile Include="Pages\ToolsPage.cs" />
-    <Compile Include="Pages\SyncPage.cs" />
-    <Compile Include="Pages\SettingsPage.cs" />
-    <Compile Include="Pages\SettingsListFoldersPage.cs" />
+    <Compile Include="Pages\Settings\SettingsEditFolderPage.cs" />
+    <Compile Include="Pages\Lock\LockFingerprintPage.cs" />
+    <Compile Include="Pages\Tools\ToolsPage.cs" />
+    <Compile Include="Pages\Settings\SettingsSyncPage.cs" />
+    <Compile Include="Pages\Settings\SettingsPage.cs" />
+    <Compile Include="Pages\Settings\SettingsListFoldersPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Abstractions\Repositories\ISiteRepository.cs" />
     <Compile Include="Repositories\ApiRepository.cs" />
@@ -150,11 +150,11 @@
     <Compile Include="Services\CryptoService.cs" />
     <Compile Include="Models\Page\VaultListPageModel.cs" />
     <Compile Include="Pages\LoginPage.cs" />
-    <Compile Include="Pages\SettingsAddFolderPage.cs" />
-    <Compile Include="Pages\VaultAddSitePage.cs" />
-    <Compile Include="Pages\VaultViewSitePage.cs" />
-    <Compile Include="Pages\VaultEditSitePage.cs" />
-    <Compile Include="Pages\VaultListSitesPage.cs" />
+    <Compile Include="Pages\Settings\SettingsAddFolderPage.cs" />
+    <Compile Include="Pages\Vault\VaultAddSitePage.cs" />
+    <Compile Include="Pages\Vault\VaultViewSitePage.cs" />
+    <Compile Include="Pages\Vault\VaultEditSitePage.cs" />
+    <Compile Include="Pages\Vault\VaultListSitesPage.cs" />
     <Compile Include="Utilities\Extentions.cs" />
     <Compile Include="Utilities\ExtendedObservableCollection.cs" />
     <Compile Include="Utilities\ApiHttpClient.cs" />
diff --git a/src/App/Pages/LockFingerprintPage.cs b/src/App/Pages/Lock/LockFingerprintPage.cs
similarity index 100%
rename from src/App/Pages/LockFingerprintPage.cs
rename to src/App/Pages/Lock/LockFingerprintPage.cs
diff --git a/src/App/Pages/LockPinPage.cs b/src/App/Pages/Lock/LockPinPage.cs
similarity index 100%
rename from src/App/Pages/LockPinPage.cs
rename to src/App/Pages/Lock/LockPinPage.cs
diff --git a/src/App/Pages/SettingsAddFolderPage.cs b/src/App/Pages/Settings/SettingsAddFolderPage.cs
similarity index 100%
rename from src/App/Pages/SettingsAddFolderPage.cs
rename to src/App/Pages/Settings/SettingsAddFolderPage.cs
diff --git a/src/App/Pages/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs
similarity index 100%
rename from src/App/Pages/SettingsEditFolderPage.cs
rename to src/App/Pages/Settings/SettingsEditFolderPage.cs
diff --git a/src/App/Pages/SettingsListFoldersPage.cs b/src/App/Pages/Settings/SettingsListFoldersPage.cs
similarity index 100%
rename from src/App/Pages/SettingsListFoldersPage.cs
rename to src/App/Pages/Settings/SettingsListFoldersPage.cs
diff --git a/src/App/Pages/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs
similarity index 99%
rename from src/App/Pages/SettingsPage.cs
rename to src/App/Pages/Settings/SettingsPage.cs
index a299da3bc..e230b5cb7 100644
--- a/src/App/Pages/SettingsPage.cs
+++ b/src/App/Pages/Settings/SettingsPage.cs
@@ -175,7 +175,7 @@ namespace Bit.App.Pages
 
         private void SyncCell_Tapped(object sender, EventArgs e)
         {
-            Navigation.PushAsync(new SyncPage());
+            Navigation.PushAsync(new SettingsSyncPage());
         }
 
         private void LockCell_Tapped(object sender, EventArgs e)
diff --git a/src/App/Pages/SettingsPinPage.cs b/src/App/Pages/Settings/SettingsPinPage.cs
similarity index 100%
rename from src/App/Pages/SettingsPinPage.cs
rename to src/App/Pages/Settings/SettingsPinPage.cs
diff --git a/src/App/Pages/SyncPage.cs b/src/App/Pages/Settings/SettingsSyncPage.cs
similarity index 95%
rename from src/App/Pages/SyncPage.cs
rename to src/App/Pages/Settings/SettingsSyncPage.cs
index 16f5b5cc9..b2efb147c 100644
--- a/src/App/Pages/SyncPage.cs
+++ b/src/App/Pages/Settings/SettingsSyncPage.cs
@@ -10,13 +10,13 @@ using XLabs.Ioc;
 
 namespace Bit.App.Pages
 {
-    public class SyncPage : ExtendedContentPage
+    public class SettingsSyncPage : ExtendedContentPage
     {
         private readonly ISyncService _syncService;
         private readonly IUserDialogs _userDialogs;
         private readonly IConnectivity _connectivity;
 
-        public SyncPage()
+        public SettingsSyncPage()
         {
             _syncService = Resolver.Resolve<ISyncService>();
             _userDialogs = Resolver.Resolve<IUserDialogs>();
diff --git a/src/App/Pages/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs
similarity index 100%
rename from src/App/Pages/ToolsPage.cs
rename to src/App/Pages/Tools/ToolsPage.cs
diff --git a/src/App/Pages/VaultAddSitePage.cs b/src/App/Pages/Vault/VaultAddSitePage.cs
similarity index 100%
rename from src/App/Pages/VaultAddSitePage.cs
rename to src/App/Pages/Vault/VaultAddSitePage.cs
diff --git a/src/App/Pages/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditSitePage.cs
similarity index 100%
rename from src/App/Pages/VaultEditSitePage.cs
rename to src/App/Pages/Vault/VaultEditSitePage.cs
diff --git a/src/App/Pages/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs
similarity index 100%
rename from src/App/Pages/VaultListSitesPage.cs
rename to src/App/Pages/Vault/VaultListSitesPage.cs
diff --git a/src/App/Pages/VaultViewSitePage.cs b/src/App/Pages/Vault/VaultViewSitePage.cs
similarity index 100%
rename from src/App/Pages/VaultViewSitePage.cs
rename to src/App/Pages/Vault/VaultViewSitePage.cs