diff --git a/addons/TestAddon/TestAddon.csproj b/addons/TestAddon/TestAddon.csproj
index 2dfee4f..405cee8 100644
--- a/addons/TestAddon/TestAddon.csproj
+++ b/addons/TestAddon/TestAddon.csproj
@@ -30,6 +30,42 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/img/ConfEditor.png b/img/ConfEditor.png
index 6089142..d849265 100644
Binary files a/img/ConfEditor.png and b/img/ConfEditor.png differ
diff --git a/mpv.net.sln b/mpv.net.sln
index f828ad6..5631732 100644
--- a/mpv.net.sln
+++ b/mpv.net.sln
@@ -59,10 +59,10 @@ Global
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|x86
 		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.ActiveCfg = Debug|x64
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|x64
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|x86
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|x86
 		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.ActiveCfg = Release|Any CPU
diff --git a/mpv.net/Addon.cs b/mpv.net/Misc/Addon.cs
similarity index 100%
rename from mpv.net/Addon.cs
rename to mpv.net/Misc/Addon.cs
diff --git a/mpv.net/Command.cs b/mpv.net/Misc/Command.cs
similarity index 100%
rename from mpv.net/Command.cs
rename to mpv.net/Misc/Command.cs
diff --git a/mpv.net/Misc.cs b/mpv.net/Misc/Misc.cs
similarity index 100%
rename from mpv.net/Misc.cs
rename to mpv.net/Misc/Misc.cs
diff --git a/mpv.net/Program.cs b/mpv.net/Misc/Program.cs
similarity index 100%
rename from mpv.net/Program.cs
rename to mpv.net/Misc/Program.cs
diff --git a/mpv.net/MediaInfo.cs b/mpv.net/Native/MediaInfo.cs
similarity index 100%
rename from mpv.net/MediaInfo.cs
rename to mpv.net/Native/MediaInfo.cs
diff --git a/mpv.net/Native.cs b/mpv.net/Native/Native.cs
similarity index 100%
rename from mpv.net/Native.cs
rename to mpv.net/Native/Native.cs
diff --git a/mpv.net/NativeHelp.cs b/mpv.net/Native/NativeHelp.cs
similarity index 100%
rename from mpv.net/NativeHelp.cs
rename to mpv.net/Native/NativeHelp.cs
diff --git a/mpv.net/TaskDialog.cs b/mpv.net/Native/TaskDialog.cs
similarity index 100%
rename from mpv.net/TaskDialog.cs
rename to mpv.net/Native/TaskDialog.cs
diff --git a/mpv.net/PowerShellScript.cs b/mpv.net/Scripting/PowerShellScript.cs
similarity index 100%
rename from mpv.net/PowerShellScript.cs
rename to mpv.net/Scripting/PowerShellScript.cs
diff --git a/mpv.net/PythonScript.cs b/mpv.net/Scripting/PythonScript.cs
similarity index 100%
rename from mpv.net/PythonScript.cs
rename to mpv.net/Scripting/PythonScript.cs
diff --git a/mpv.net/Windows/AboutWindow.xaml b/mpv.net/WPF/AboutWindow.xaml
similarity index 100%
rename from mpv.net/Windows/AboutWindow.xaml
rename to mpv.net/WPF/AboutWindow.xaml
diff --git a/mpv.net/Windows/AboutWindow.xaml.cs b/mpv.net/WPF/AboutWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/AboutWindow.xaml.cs
rename to mpv.net/WPF/AboutWindow.xaml.cs
diff --git a/mpv.net/Windows/CommandPaletteWindow.xaml b/mpv.net/WPF/CommandPaletteWindow.xaml
similarity index 100%
rename from mpv.net/Windows/CommandPaletteWindow.xaml
rename to mpv.net/WPF/CommandPaletteWindow.xaml
diff --git a/mpv.net/Windows/CommandPaletteWindow.xaml.cs b/mpv.net/WPF/CommandPaletteWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/CommandPaletteWindow.xaml.cs
rename to mpv.net/WPF/CommandPaletteWindow.xaml.cs
diff --git a/mpv.net/Windows/ConfWindow.xaml b/mpv.net/WPF/ConfWindow.xaml
similarity index 100%
rename from mpv.net/Windows/ConfWindow.xaml
rename to mpv.net/WPF/ConfWindow.xaml
diff --git a/mpv.net/Windows/ConfWindow.xaml.cs b/mpv.net/WPF/ConfWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/ConfWindow.xaml.cs
rename to mpv.net/WPF/ConfWindow.xaml.cs
diff --git a/mpv.net/Windows/EverythingWindow.xaml b/mpv.net/WPF/EverythingWindow.xaml
similarity index 100%
rename from mpv.net/Windows/EverythingWindow.xaml
rename to mpv.net/WPF/EverythingWindow.xaml
diff --git a/mpv.net/Windows/EverythingWindow.xaml.cs b/mpv.net/WPF/EverythingWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/EverythingWindow.xaml.cs
rename to mpv.net/WPF/EverythingWindow.xaml.cs
diff --git a/mpv.net/Windows/InputWindow.xaml b/mpv.net/WPF/InputWindow.xaml
similarity index 100%
rename from mpv.net/Windows/InputWindow.xaml
rename to mpv.net/WPF/InputWindow.xaml
diff --git a/mpv.net/Windows/InputWindow.xaml.cs b/mpv.net/WPF/InputWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/InputWindow.xaml.cs
rename to mpv.net/WPF/InputWindow.xaml.cs
diff --git a/mpv.net/Windows/LearnWindow.xaml b/mpv.net/WPF/LearnWindow.xaml
similarity index 100%
rename from mpv.net/Windows/LearnWindow.xaml
rename to mpv.net/WPF/LearnWindow.xaml
diff --git a/mpv.net/Windows/LearnWindow.xaml.cs b/mpv.net/WPF/LearnWindow.xaml.cs
similarity index 100%
rename from mpv.net/Windows/LearnWindow.xaml.cs
rename to mpv.net/WPF/LearnWindow.xaml.cs
diff --git a/mpv.net/MainForm.Designer.cs b/mpv.net/WinForms/MainForm.Designer.cs
similarity index 100%
rename from mpv.net/MainForm.Designer.cs
rename to mpv.net/WinForms/MainForm.Designer.cs
diff --git a/mpv.net/MainForm.cs b/mpv.net/WinForms/MainForm.cs
similarity index 100%
rename from mpv.net/MainForm.cs
rename to mpv.net/WinForms/MainForm.cs
diff --git a/mpv.net/MainForm.resx b/mpv.net/WinForms/MainForm.resx
similarity index 100%
rename from mpv.net/MainForm.resx
rename to mpv.net/WinForms/MainForm.resx
diff --git a/mpv.net/Menu.cs b/mpv.net/WinForms/Menu.cs
similarity index 100%
rename from mpv.net/Menu.cs
rename to mpv.net/WinForms/Menu.cs
diff --git a/mpv.net/mpv.net.csproj b/mpv.net/mpv.net.csproj
index dc8ea9b..c7b06ec 100644
--- a/mpv.net/mpv.net.csproj
+++ b/mpv.net/mpv.net.csproj
@@ -137,20 +137,20 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Addon.cs" />
+    <Compile Include="Misc\Addon.cs" />
     <Page Include="Controls\SearchTextBoxUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\AboutWindow.xaml">
+    <Page Include="WPF\AboutWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\EverythingWindow.xaml">
+    <Page Include="WPF\EverythingWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\CommandPaletteWindow.xaml">
+    <Page Include="WPF\CommandPaletteWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -169,53 +169,52 @@
       <DependentUpon>StringSettingControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="DynamicGUI\Tommy.cs" />
-    <Compile Include="MediaInfo.cs" />
-    <Compile Include="Menu.cs">
+    <Compile Include="Native\MediaInfo.cs" />
+    <Compile Include="WinForms\Menu.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="PowerShellScript.cs" />
+    <Compile Include="Scripting\PowerShellScript.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="PythonScript.cs" />
-    <Compile Include="libmpv.cs" />
-    <Compile Include="MainForm.cs">
+    <Compile Include="Scripting\PythonScript.cs" />
+    <Compile Include="mpv\libmpv.cs" />
+    <Compile Include="WinForms\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm.Designer.cs">
+    <Compile Include="WinForms\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Misc.cs" />
-    <Compile Include="mp.cs" />
-    <Compile Include="Command.cs" />
-    <Compile Include="Native.cs" />
-    <Compile Include="NativeHelp.cs" />
-    <Compile Include="Program.cs" />
+    <Compile Include="Misc\Misc.cs" />
+    <Compile Include="mpv\mp.cs" />
+    <Compile Include="Misc\Command.cs" />
+    <Compile Include="Native\Native.cs" />
+    <Compile Include="Native\NativeHelp.cs" />
+    <Compile Include="Misc\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TaskDialog.cs" />
-    <Compile Include="Windows\EverythingWindow.xaml.cs">
+    <Compile Include="Native\TaskDialog.cs" />
+    <Compile Include="WPF\EverythingWindow.xaml.cs">
       <DependentUpon>EverythingWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\CommandPaletteWindow.xaml.cs">
+    <Compile Include="WPF\CommandPaletteWindow.xaml.cs">
       <DependentUpon>CommandPaletteWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\ConfWindow.xaml.cs">
+    <Compile Include="WPF\ConfWindow.xaml.cs">
       <DependentUpon>ConfWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\AboutWindow.xaml.cs">
+    <Compile Include="WPF\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\LearnWindow.xaml.cs">
+    <Compile Include="WPF\LearnWindow.xaml.cs">
       <DependentUpon>LearnWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Windows\InputWindow.xaml.cs">
+    <Compile Include="WPF\InputWindow.xaml.cs">
       <DependentUpon>InputWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="trash.cs" />
     <Compile Include="WPF\WPF.cs" />
-    <EmbeddedResource Include="MainForm.resx">
+    <EmbeddedResource Include="WinForms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -263,19 +262,20 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\ConfWindow.xaml">
+    <Page Include="WPF\ConfWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\LearnWindow.xaml">
+    <Page Include="WPF\LearnWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Windows\InputWindow.xaml">
+    <Page Include="WPF\InputWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/mpv.net/libmpv.cs b/mpv.net/mpv/libmpv.cs
similarity index 100%
rename from mpv.net/libmpv.cs
rename to mpv.net/mpv/libmpv.cs
diff --git a/mpv.net/mp.cs b/mpv.net/mpv/mp.cs
similarity index 100%
rename from mpv.net/mp.cs
rename to mpv.net/mpv/mp.cs
diff --git a/mpv.net/trash.cs b/mpv.net/trash.cs
deleted file mode 100644
index 9e37ca3..0000000
--- a/mpv.net/trash.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-//public static string GetAssociatedApplication(string ext)
-//{
-//    uint returnValue = 0U;
-//    // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
-//    if (1 == Native.AssocQueryString(0x40, 2, ext, null, null, ref returnValue))
-//    {
-//        if (returnValue > 0)
-//        {
-//            StringBuilder sb = new StringBuilder(Convert.ToInt32(returnValue));
-//            // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
-//            if (0 == Native.AssocQueryString(0x40, 2, ext, null, sb, ref returnValue))
-//            {
-//                var ret = sb.ToString();
-//                if (File.Exists(ret)) return ret;
-//            }
-//        }
-//    }
-//    return "";
-//}
-
-//[DllImport("Shlwapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-//public static extern uint AssocQueryString(uint flags, uint str, string pszAssoc, string pszExtra, StringBuilder pszOut, ref uint pcchOut);
\ No newline at end of file
diff --git a/setup.ps1 b/setup.ps1
index 8d7beab..24d12fa 100644
--- a/setup.ps1
+++ b/setup.ps1
@@ -5,47 +5,28 @@ function CheckExitCode {
     }
 }
 
-$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe"
+$msbuild   = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe"
+$innoSetup = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+$sevenZip  = "C:\Program Files\7-Zip\7z.exe"
 
-& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x64
+& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x64; CheckExitCode
+& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x86; CheckExitCode
 
-CheckExitCode
-
-& $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x86
-
-CheckExitCode
-
-& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Darch="x64" setup.iss
-
-CheckExitCode
-
-& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /Darch="x86" setup.iss
-
-CheckExitCode
+& $innoSetup /Darch="x64" setup.iss; CheckExitCode
+& $innoSetup /Darch="x86" setup.iss; CheckExitCode
 
 $scriptDir = Split-Path -Path $PSCommandPath -Parent
 $desktopDir = [Environment]::GetFolderPath("Desktop")
-
 $exePath = $scriptDir + "\mpv.net\bin\x64\mpvnet.exe"
 $version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
 $targetDir = $desktopDir + "\mpv.net-portable-x64-" + $version
 Copy-Item $scriptDir\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
-& "C:\Program Files\7-Zip\7z.exe" a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"
-
-CheckExitCode
-
-& "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
-
-CheckExitCode
+& $sevenZip a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"; CheckExitCode
+& $sevenZip a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"; CheckExitCode
 
 $exePath = $scriptDir + "\mpv.net\bin\x86\mpvnet.exe"
 $version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
 $targetDir = $desktopDir + "\mpv.net-portable-x86-" + $version
 Copy-Item $scriptDir\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
-& "C:\Program Files\7-Zip\7z.exe" a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"
-
-CheckExitCode
-
-& "C:\Program Files\7-Zip\7z.exe" a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"
-
-CheckExitCode
\ No newline at end of file
+& $sevenZip a -t7z  -mx9 "$targetDir.7z"  -r "$targetDir\*"; CheckExitCode
+& $sevenZip a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*"; CheckExitCode
\ No newline at end of file