diff --git a/qController.Standard/App.xaml.cs b/qController.Standard/App.xaml.cs
index f3aecb2..c78107b 100644
--- a/qController.Standard/App.xaml.cs
+++ b/qController.Standard/App.xaml.cs
@@ -89,7 +89,7 @@ namespace qController
                 {
                     await NavigationPage.PopToRootAsync();
                     QWorkspace recentWorkspace = new QWorkspace(packagedInfo.workspaceInfo, new QServer(packagedInfo.serverInfo.host, packagedInfo.serverInfo.port));
-                    await NavigationPage.PushAsync(new WorkspacePage(recentWorkspace));
+                    await NavigationPage.PushAsync(new QWorkspacePage(recentWorkspace));
                     Log.Debug("Pushed WorkspacePage from App Action");
                 }
             });
diff --git a/qController.Standard/Views/HomePage.xaml b/qController.Standard/Views/HomePage.xaml
deleted file mode 100644
index 61c14a2..0000000
--- a/qController.Standard/Views/HomePage.xaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="qController.HomePage">
-    <ContentPage.Content>
-    </ContentPage.Content>
-</ContentPage>
diff --git a/qController.Standard/Views/HomePage.xaml.cs b/qController.Standard/Views/HomePage.xaml.cs
deleted file mode 100644
index 39c8f5a..0000000
--- a/qController.Standard/Views/HomePage.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Xamarin.Forms;
-
-namespace qController
-{
-    public partial class HomePage : ContentPage
-    {
-        public HomePage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/qController.Standard/Views/ControlPage.xaml b/qController.Standard/Views/Old/ControlPage.xaml
similarity index 100%
rename from qController.Standard/Views/ControlPage.xaml
rename to qController.Standard/Views/Old/ControlPage.xaml
diff --git a/qController.Standard/Views/ControlPage.xaml.cs b/qController.Standard/Views/Old/ControlPage.xaml.cs
similarity index 100%
rename from qController.Standard/Views/ControlPage.xaml.cs
rename to qController.Standard/Views/Old/ControlPage.xaml.cs
diff --git a/qController.Standard/Views/qConnectionPage.xaml b/qController.Standard/Views/Old/qConnectionPage.xaml
similarity index 100%
rename from qController.Standard/Views/qConnectionPage.xaml
rename to qController.Standard/Views/Old/qConnectionPage.xaml
diff --git a/qController.Standard/Views/qConnectionPage.xaml.cs b/qController.Standard/Views/Old/qConnectionPage.xaml.cs
similarity index 100%
rename from qController.Standard/Views/qConnectionPage.xaml.cs
rename to qController.Standard/Views/Old/qConnectionPage.xaml.cs
diff --git a/qController.Standard/Views/QBrowserPage.xaml.cs b/qController.Standard/Views/QBrowserPage.xaml.cs
index ba01edd..bdf98c5 100644
--- a/qController.Standard/Views/QBrowserPage.xaml.cs
+++ b/qController.Standard/Views/QBrowserPage.xaml.cs
@@ -65,7 +65,7 @@ namespace qController.Pages
                         if (resp.Ok)
                         {
                             Console.WriteLine($"Passcode is null: {resp.Value == null}");
-                            await Navigation.PushAsync(new WorkspacePage(selectedWorkspace, resp.Value));
+                            await Navigation.PushAsync(new QWorkspacePage(selectedWorkspace, resp.Value));
                         }
                     }
 
@@ -73,7 +73,7 @@ namespace qController.Pages
             }
             else
             {
-                await Navigation.PushAsync(new WorkspacePage(selectedWorkspace));
+                await Navigation.PushAsync(new QWorkspacePage(selectedWorkspace));
             }
         }
 
diff --git a/qController.Standard/Views/WorkspacePage.xaml b/qController.Standard/Views/QWorkspacePage.xaml
similarity index 96%
rename from qController.Standard/Views/WorkspacePage.xaml
rename to qController.Standard/Views/QWorkspacePage.xaml
index a4e2405..72c14b8 100644
--- a/qController.Standard/Views/WorkspacePage.xaml
+++ b/qController.Standard/Views/QWorkspacePage.xaml
@@ -7,7 +7,7 @@
              xmlns:qui="clr-namespace:qController.UI"
              ios:Page.UseSafeArea="true"
              mc:Ignorable="d"
-             x:Class="qController.WorkspacePage"
+             x:Class="qController.QWorkspacePage"
              BackgroundColor="{DynamicResource PageBackgroundColor}">
     <Grid RowSpacing="0">
         <Grid.RowDefinitions>
diff --git a/qController.Standard/Views/WorkspacePage.xaml.cs b/qController.Standard/Views/QWorkspacePage.xaml.cs
similarity index 98%
rename from qController.Standard/Views/WorkspacePage.xaml.cs
rename to qController.Standard/Views/QWorkspacePage.xaml.cs
index 027f6e1..9d17d41 100644
--- a/qController.Standard/Views/WorkspacePage.xaml.cs
+++ b/qController.Standard/Views/QWorkspacePage.xaml.cs
@@ -15,12 +15,12 @@ using System;
 
 namespace qController
 {
-    public partial class WorkspacePage : ContentPage
+    public partial class QWorkspacePage : ContentPage
     {
         private QWorkspace connectedWorkspace;
         private string passcode;
         private Dictionary<string, Grid> cueGridDict = new Dictionary<string, Grid>();
-        public WorkspacePage(QWorkspace workspace, string passcode = null)
+        public QWorkspacePage(QWorkspace workspace, string passcode = null)
         {
             InitializeComponent();
 
diff --git a/qController.Standard/Views/RootPage.xaml b/qController.Standard/Views/Root/RootPage.xaml
similarity index 100%
rename from qController.Standard/Views/RootPage.xaml
rename to qController.Standard/Views/Root/RootPage.xaml
diff --git a/qController.Standard/Views/RootPage.xaml.cs b/qController.Standard/Views/Root/RootPage.xaml.cs
similarity index 100%
rename from qController.Standard/Views/RootPage.xaml.cs
rename to qController.Standard/Views/Root/RootPage.xaml.cs
diff --git a/qController.Standard/Views/RootPageDetail.xaml b/qController.Standard/Views/Root/RootPageDetail.xaml
similarity index 100%
rename from qController.Standard/Views/RootPageDetail.xaml
rename to qController.Standard/Views/Root/RootPageDetail.xaml
diff --git a/qController.Standard/Views/RootPageDetail.xaml.cs b/qController.Standard/Views/Root/RootPageDetail.xaml.cs
similarity index 100%
rename from qController.Standard/Views/RootPageDetail.xaml.cs
rename to qController.Standard/Views/Root/RootPageDetail.xaml.cs
diff --git a/qController.Standard/Views/RootPageMaster.xaml b/qController.Standard/Views/Root/RootPageMaster.xaml
similarity index 100%
rename from qController.Standard/Views/RootPageMaster.xaml
rename to qController.Standard/Views/Root/RootPageMaster.xaml
diff --git a/qController.Standard/Views/RootPageMaster.xaml.cs b/qController.Standard/Views/Root/RootPageMaster.xaml.cs
similarity index 100%
rename from qController.Standard/Views/RootPageMaster.xaml.cs
rename to qController.Standard/Views/Root/RootPageMaster.xaml.cs
diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj
index 8a835b7..be4efcb 100644
--- a/qController.Standard/qController.csproj
+++ b/qController.Standard/qController.csproj
@@ -94,6 +94,8 @@
     <Folder Include="Classes\UI\Buttons\" />
     <Folder Include="Classes\UI\Cells\" />
     <Folder Include="Classes\Helpers\" />
+    <Folder Include="Views\Old\" />
+    <Folder Include="Views\Root\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Remove="Pages\RootPageMaster.xaml" />