diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 4fa97c81..65942a84 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -170,7 +170,7 @@
     <Compile Include="Views\GraphingCalculator\EquationStylePanelControl.xaml.cs">
       <DependentUpon>EquationStylePanelControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\GraphingCalculator\KeyGraphFeaturesTemplateSelector.cs" />
+    <Compile Include="Selectors\KeyGraphFeaturesTemplateSelector.cs" />
     <Compile Include="Utils\DelegateCommandUtils.cs" />
     <Compile Include="Views\Calculator.xaml.cs">
       <DependentUpon>Calculator.xaml</DependentUpon>
@@ -236,7 +236,7 @@
       <DependentUpon>Settings.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\StateTriggers\AspectRatioTrigger.cs" />
-    <Compile Include="Views\StateTriggers\CalculatorProgrammerDisplayPanel.xaml.cs">
+    <Compile Include="Views\CalculatorProgrammerDisplayPanel.xaml.cs">
       <DependentUpon>CalculatorProgrammerDisplayPanel.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\StateTriggers\ControlSizeTrigger.cs" />
@@ -774,7 +774,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\StateTriggers\CalculatorProgrammerDisplayPanel.xaml">
+    <Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesTemplateSelector.cs b/src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs
similarity index 100%
rename from src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesTemplateSelector.cs
rename to src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs
diff --git a/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
similarity index 100%
rename from src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml
rename to src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
diff --git a/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
similarity index 100%
rename from src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs
rename to src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs
index 96dada16..0748f330 100644
--- a/src/Calculator/Views/MainPage.xaml.cs
+++ b/src/Calculator/Views/MainPage.xaml.cs
@@ -5,10 +5,8 @@ using CalculatorApp.ViewModel.Common;
 using CalculatorApp.ViewModel.Common.Automation;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Graphics.Display;
 using Windows.Storage;
 using Windows.UI.Core;