diff --git a/App.xaml b/App.xaml
index 04fef6d..6384de0 100644
--- a/App.xaml
+++ b/App.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:VideoConcat"
              xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/VideoConcat.csproj b/VideoConcat.csproj
index 0bfa5dd..16737b5 100644
--- a/VideoConcat.csproj
+++ b/VideoConcat.csproj
@@ -28,4 +28,9 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Models\" />
+    <Folder Include="ViewModels\" />
+  </ItemGroup>
+
 </Project>
diff --git a/MainWindow.xaml b/Views/MainWindow.xaml
similarity index 100%
rename from MainWindow.xaml
rename to Views/MainWindow.xaml
diff --git a/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
similarity index 100%
rename from MainWindow.xaml.cs
rename to Views/MainWindow.xaml.cs