diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/BookQueriesPage.xaml
rename to BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
rename to BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/BookQueryPage.xaml
rename to BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
rename to BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml b/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
rename to BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml
diff --git a/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
rename to BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/EditEstimatePage.xaml
rename to BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
rename to BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml b/BookAStar/BookAStar/Pages/Oooops/EventDetail.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/EventDetail.xaml
rename to BookAStar/BookAStar/Pages/Oooops/EventDetail.xaml
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml.cs b/BookAStar/BookAStar/Pages/Oooops/EventDetail.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/EventDetail.xaml.cs
rename to BookAStar/BookAStar/Pages/Oooops/EventDetail.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml b/BookAStar/BookAStar/Pages/Oooops/HomePage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/HomePage.xaml
rename to BookAStar/BookAStar/Pages/Oooops/HomePage.xaml
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml.cs b/BookAStar/BookAStar/Pages/Oooops/HomePage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/HomePage.xaml.cs
rename to BookAStar/BookAStar/Pages/Oooops/HomePage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/PinPage.cs b/BookAStar/BookAStar/Pages/Oooops/PinPage.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/PinPage.cs
rename to BookAStar/BookAStar/Pages/Oooops/PinPage.cs
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml b/BookAStar/BookAStar/Pages/Oooops/SearchPage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/SearchPage.xaml
rename to BookAStar/BookAStar/Pages/Oooops/SearchPage.xaml
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml.cs b/BookAStar/BookAStar/Pages/Oooops/SearchPage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/SearchPage.xaml.cs
rename to BookAStar/BookAStar/Pages/Oooops/SearchPage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/AccountChooserPage.xaml
rename to BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml
diff --git a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs b/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
rename to BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml b/BookAStar/BookAStar/Pages/User/DashboardPage.xaml
similarity index 100%
rename from BookAStar/BookAStar/Pages/DashboardPage.xaml
rename to BookAStar/BookAStar/Pages/User/DashboardPage.xaml
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs
similarity index 100%
rename from BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
rename to BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs