diff --git a/Karaoke Kingpin.csproj b/Karaoke Kingpin.csproj
index f86f5bb..e995f76 100644
--- a/Karaoke Kingpin.csproj	
+++ b/Karaoke Kingpin.csproj	
@@ -261,31 +261,31 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
+    <ApplicationDefinition Include="Views\App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Converters\ImagePathConverter.cs" />
     <Compile Include="Models\SongData.cs" />
-    <Page Include="Index.xaml">
+    <Page Include="Views\Index.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MainWindow.xaml">
+    <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="Controller\App.cs">
-      <DependentUpon>App.xaml</DependentUpon>
+      <DependentUpon>Views\App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Converters\BitmapToImageSourceConverter.cs" />
     <Compile Include="Controller\Index.cs">
-      <DependentUpon>Index.xaml</DependentUpon>
+      <DependentUpon>Views\Index.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controller\MainViewModel.cs" />
     <Compile Include="Controller\MainWindow.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <DependentUpon>Views\MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/App.xaml b/Views/App.xaml
similarity index 89%
rename from App.xaml
rename to Views/App.xaml
index aa3f839..7038615 100644
--- a/App.xaml
+++ b/Views/App.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Karaoke_Kingpin.Controller"
              xmlns:converters="clr-namespace:Karaoke_Kingpin.Converters"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views\MainWindow.xaml">
     <Application.Resources>
         
     </Application.Resources>
diff --git a/Index.xaml b/Views/Index.xaml
similarity index 100%
rename from Index.xaml
rename to Views/Index.xaml
diff --git a/MainWindow.xaml b/Views/MainWindow.xaml
similarity index 100%
rename from MainWindow.xaml
rename to Views/MainWindow.xaml