diff --git a/STranslate/App.xaml b/STranslate/App.xaml
index 310d543..2709e18 100644
--- a/STranslate/App.xaml
+++ b/STranslate/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="STranslate.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
+             StartupUri="View/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/STranslate/STranslate.csproj b/STranslate/STranslate.csproj
index 9d7997d..39f86b1 100644
--- a/STranslate/STranslate.csproj
+++ b/STranslate/STranslate.csproj
@@ -104,7 +104,7 @@
     </Compile>
     <Compile Include="Util\Util.cs" />
     <Compile Include="ViewModel\MainVM.cs" />
-    <Page Include="MainWindow.xaml">
+    <Page Include="View\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -112,7 +112,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainWindow.xaml.cs">
+    <Compile Include="View\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
diff --git a/STranslate/MainWindow.xaml b/STranslate/View/MainWindow.xaml
similarity index 99%
rename from STranslate/MainWindow.xaml
rename to STranslate/View/MainWindow.xaml
index 3f2bfd0..819695f 100644
--- a/STranslate/MainWindow.xaml
+++ b/STranslate/View/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="STranslate.MainWindow"
+<Window x:Class="STranslate.View.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/STranslate/MainWindow.xaml.cs b/STranslate/View/MainWindow.xaml.cs
similarity index 98%
rename from STranslate/MainWindow.xaml.cs
rename to STranslate/View/MainWindow.xaml.cs
index 335c9ed..e9703ea 100644
--- a/STranslate/MainWindow.xaml.cs
+++ b/STranslate/View/MainWindow.xaml.cs
@@ -6,7 +6,7 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 
-namespace STranslate
+namespace STranslate.View
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/STranslate/ViewModel/MainVM.cs b/STranslate/ViewModel/MainVM.cs
index 98b3a5c..6de1dd6 100644
--- a/STranslate/ViewModel/MainVM.cs
+++ b/STranslate/ViewModel/MainVM.cs
@@ -1,17 +1,14 @@
-using STranslate.Model;
-using STranslate.Helper;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using System.Windows.Media;
-using System.Text.RegularExpressions;
-using System.Security.Cryptography;
-using STranslate.Util;
+using System.Threading.Tasks;
 using System.Speech.Synthesis;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using STranslate.View;
+using STranslate.Model;
+using STranslate.Helper;
 
 namespace STranslate.ViewModel
 {