205 files changed, 8392 insertions, 8399 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Docs/Readme.txt b/win/CS/HandBrake.ApplicationServices/Docs/Readme.txt
deleted file mode 100644
index 69d4b85d9..000000000
--- a/win/CS/HandBrake.ApplicationServices/Docs/Readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Library: HandBrake.ApplicationServices.dll
-Description: A C# Wrapper library around LibHB. This wrapper library exposes the main scan and encode functions of the JSON API and many helper functions.
-Usage: See the IHandBrakeInstance interface.
-\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Attributes/DisplayName.cs b/win/CS/HandBrake.Interop/Attributes/DisplayName.cs
index e96c9ab73..a890d97f1 100644
--- a/win/CS/HandBrake.ApplicationServices/Attributes/DisplayName.cs
+++ b/win/CS/HandBrake.Interop/Attributes/DisplayName.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Attributes
+namespace HandBrake.Interop.Attributes
 {
     using System;
 
diff --git a/win/CS/HandBrake.ApplicationServices/Attributes/ShortName.cs b/win/CS/HandBrake.Interop/Attributes/ShortName.cs
index ba70fdf95..1f5ef6700 100644
--- a/win/CS/HandBrake.ApplicationServices/Attributes/ShortName.cs
+++ b/win/CS/HandBrake.Interop/Attributes/ShortName.cs
@@ -1,35 +1,35 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ShortName.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   A Short Name for an enum value
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Attributes
-{
-    using System;
-
-    /// <summary>
-    ///  A Short Name for an enum value
-    /// </summary>
-    public class ShortName : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ShortName"/> class.
-        /// </summary>
-        /// <param name="shortName">
-        /// The short name.
-        /// </param>
-        public ShortName(string shortName)
-        {
-            this.Name = shortName;
-        }
-
-        /// <summary>
-        /// Gets the short name.
-        /// </summary>
-        public string Name { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ShortName.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Short Name for an enum value
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Attributes
+{
+    using System;
+
+    /// <summary>
+    ///  A Short Name for an enum value
+    /// </summary>
+    public class ShortName : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShortName"/> class.
+        /// </summary>
+        /// <param name="shortName">
+        /// The short name.
+        /// </param>
+        public ShortName(string shortName)
+        {
+            this.Name = shortName;
+        }
+
+        /// <summary>
+        /// Gets the short name.
+        /// </summary>
+        public string Name { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index e55e0e039..09e73d0f5 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -1,198 +1,198 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HandBrake.ApplicationServices</RootNamespace>
-    <AssemblyName>HandBrake.ApplicationServices</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\HandBrake.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Attributes\DisplayName.cs" />
-    <Compile Include="Attributes\ShortName.cs" />
-    <Compile Include="Interop\EventArgs\EncodeCompletedEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\EncodeProgressEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\MessageLoggedEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\ScanProgressEventArgs.cs" />
-    <Compile Include="Interop\HandBrakeEncoderHelpers.cs" />
-    <Compile Include="Interop\HandBrakeFilterHelpers.cs" />
-    <Compile Include="Interop\HandBrakeInstance.cs" />
-    <Compile Include="Interop\HandBrakeInstanceManager.cs" />
-    <Compile Include="Interop\HandBrakeLanguagesHelper.cs" />
-    <Compile Include="Interop\HandBrakePresetService.cs" />
-    <Compile Include="Interop\HandBrakeUnitConversionHelpers.cs" />
-    <Compile Include="Interop\HandBrakeUtils.cs" />
-    <Compile Include="Interop\HbLib\HBDelegates.cs" />
-    <Compile Include="Interop\HbLib\HbFunctions.cs" />
-    <Compile Include="Interop\HbLib\hb_anamorphic_mode_t.cs" />
-    <Compile Include="Interop\HbLib\hb_container_s.cs" />
-    <Compile Include="Interop\HbLib\hb_encoder_s.cs" />
-    <Compile Include="Interop\HbLib\hb_error_code.cs" />
-    <Compile Include="Interop\HbLib\hb_filter_ids.cs" />
-    <Compile Include="Interop\HbLib\hb_geometry.cs" />
-    <Compile Include="Interop\HbLib\hb_image_s.cs" />
-    <Compile Include="Interop\HbLib\hb_mixdown_s.cs" />
-    <Compile Include="Interop\HbLib\hb_rate_s.cs" />
-    <Compile Include="Interop\HbLib\hb_subtitle.cs" />
-    <Compile Include="Interop\HbLib\iso639_lang_t.cs" />
-    <Compile Include="Interop\HbLib\NativeConstants.cs" />
-    <Compile Include="Interop\Helpers\InteropUtilities.cs" />
-    <Compile Include="Interop\Helpers\NativeList.cs" />
-    <Compile Include="Interop\Helpers\Utilities.cs" />
-    <Compile Include="Interop\Interfaces\IHandBrakeInstance.cs" />
-    <Compile Include="Interop\Json\Anamorphic\AnamorphicGeometry.cs" />
-    <Compile Include="Interop\Json\Anamorphic\DestSettings.cs" />
-    <Compile Include="Interop\Json\Encode\QSV.cs" />
-    <Compile Include="Interop\Json\Filters\PresetTune.cs" />
-    <Compile Include="Interop\Json\Presets\AudioList.cs" />
-    <Compile Include="Interop\Json\Presets\HBPreset.cs" />
-    <Compile Include="Interop\Json\Presets\PresetCategory.cs" />
-    <Compile Include="Interop\Json\Presets\PresetTransportContainer.cs" />
-    <Compile Include="Interop\Json\Queue\Task.cs" />
-    <Compile Include="Interop\Json\Scan\AudioAttributes.cs" />
-    <Compile Include="Interop\Json\Scan\SubtitleAttributes.cs" />
-    <Compile Include="Interop\Json\Shared\PAR.cs" />
-    <Compile Include="Interop\Json\Encode\Audio.cs" />
-    <Compile Include="Interop\Json\Encode\AudioTrack.cs" />
-    <Compile Include="Interop\Json\Encode\Chapter.cs" />
-    <Compile Include="Interop\Json\Encode\Destination.cs" />
-    <Compile Include="Interop\Json\Encode\Filters.cs" />
-    <Compile Include="Interop\Json\Encode\Filter.cs" />
-    <Compile Include="Interop\Json\Encode\JsonEncodeObject.cs" />
-    <Compile Include="Interop\Json\Encode\Metadata.cs" />
-    <Compile Include="Interop\Json\Encode\Mp4Options.cs" />
-    <Compile Include="Interop\Json\Encode\Range.cs" />
-    <Compile Include="Interop\Json\Encode\SubtitleSearch.cs" />
-    <Compile Include="Interop\Json\Encode\Source.cs" />
-    <Compile Include="Interop\Json\Encode\SRT.cs" />
-    <Compile Include="Interop\Json\Encode\Subtitles.cs" />
-    <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />
-    <Compile Include="Interop\Json\Encode\Video.cs" />
-    <Compile Include="Interop\Factories\AnamorphicFactory.cs" />
-    <Compile Include="Interop\Json\State\TaskState.cs" />
-    <Compile Include="Interop\Model\Encoding\CombDetect.cs" />
-    <Compile Include="Interop\Model\Encoding\DeinterlaceFilter.cs" />
-    <Compile Include="Interop\Model\Encoding\HBPresetTune.cs" />
-    <Compile Include="Interop\Model\Encoding\Sharpen.cs" />
-    <Compile Include="Interop\Model\Preview\RawPreviewData.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Interop\Json\Scan\SourceAudioTrack.cs" />
-    <Compile Include="Interop\Json\Scan\SourceChapter.cs" />
-    <Compile Include="Interop\Json\Scan\Color.cs" />
-    <Compile Include="Interop\Json\Scan\Duration.cs" />
-    <Compile Include="Interop\Json\Scan\FrameRate.cs" />
-    <Compile Include="Interop\Json\Shared\Geometry.cs" />
-    <Compile Include="Interop\Json\Scan\JsonScanObject.cs" />
-    <Compile Include="Interop\Json\Scan\SourceMetadata.cs" />
-    <Compile Include="Interop\Json\Scan\SourceSubtitleTrack.cs" />
-    <Compile Include="Interop\Json\Scan\SourceTitle.cs" />
-    <Compile Include="Interop\Json\State\JsonState.cs" />
-    <Compile Include="Interop\Json\State\Scanning.cs" />
-    <Compile Include="Interop\Json\State\WorkDone.cs" />
-    <Compile Include="Interop\Json\State\Working.cs" />
-    <Compile Include="Interop\Model\BitrateLimits.cs" />
-    <Compile Include="Interop\Model\Cropping.cs" />
-    <Compile Include="Interop\Model\Encoding\Anamorphic.cs" />
-    <Compile Include="Interop\Model\Encoding\Container.cs" />
-    <Compile Include="Interop\Model\Encoding\Decomb.cs" />
-    <Compile Include="Interop\Model\Encoding\Deinterlace.cs" />
-    <Compile Include="Interop\Model\Encoding\Denoise.cs" />
-    <Compile Include="Interop\Model\Encoding\Detelecine.cs" />
-    <Compile Include="Interop\Model\Encoding\HBAudioEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\HBContainer.cs" />
-    <Compile Include="Interop\Model\Encoding\HBMixdown.cs" />
-    <Compile Include="Interop\Model\Encoding\HBRate.cs" />
-    <Compile Include="Interop\Model\Encoding\HBVideoEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\PictureRotation.cs" />
-    <Compile Include="Interop\Model\Encoding\ScaleMethod.cs" />
-    <Compile Include="Interop\Model\Encoding\VideoEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\VideoEncodeRateType.cs" />
-    <Compile Include="Interop\Model\Language.cs" />
-    <Compile Include="Interop\Model\Preview\PreviewSettings.cs" />
-    <Compile Include="Interop\Model\RangeLimits.cs" />
-    <Compile Include="Interop\Model\Size.cs" />
-    <Compile Include="Interop\Model\SourceVideoInfo.cs" />
-    <Compile Include="Interop\Model\VideoQualityLimits.cs" />
-    <Compile Include="Model\HBConfiguration.cs" />
-    <Compile Include="Model\VideoScaler.cs" />
-    <Compile Include="Utilities\SystemInfo.cs" />
-    <Compile Include="Utilities\VersionHelper.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Utilities\CharCodesUtilities.cs" />
-    <Compile Include="Utilities\LanguageUtilities.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="HandBrake.ApplicationServices.nuspec" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>HandBrake.Interop</RootNamespace>
+    <AssemblyName>HandBrake.Interop</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\HandBrake.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Attributes\DisplayName.cs" />
+    <Compile Include="Attributes\ShortName.cs" />
+    <Compile Include="Interop\EventArgs\EncodeCompletedEventArgs.cs" />
+    <Compile Include="Interop\EventArgs\EncodeProgressEventArgs.cs" />
+    <Compile Include="Interop\EventArgs\MessageLoggedEventArgs.cs" />
+    <Compile Include="Interop\EventArgs\ScanProgressEventArgs.cs" />
+    <Compile Include="Interop\HandBrakeEncoderHelpers.cs" />
+    <Compile Include="Interop\HandBrakeFilterHelpers.cs" />
+    <Compile Include="Interop\HandBrakeInstance.cs" />
+    <Compile Include="Interop\HandBrakeInstanceManager.cs" />
+    <Compile Include="Interop\HandBrakeLanguagesHelper.cs" />
+    <Compile Include="Interop\HandBrakePresetService.cs" />
+    <Compile Include="Interop\HandBrakeUnitConversionHelpers.cs" />
+    <Compile Include="Interop\HandBrakeUtils.cs" />
+    <Compile Include="Interop\HbLib\HBDelegates.cs" />
+    <Compile Include="Interop\HbLib\HbFunctions.cs" />
+    <Compile Include="Interop\HbLib\hb_anamorphic_mode_t.cs" />
+    <Compile Include="Interop\HbLib\hb_container_s.cs" />
+    <Compile Include="Interop\HbLib\hb_encoder_s.cs" />
+    <Compile Include="Interop\HbLib\hb_error_code.cs" />
+    <Compile Include="Interop\HbLib\hb_filter_ids.cs" />
+    <Compile Include="Interop\HbLib\hb_geometry.cs" />
+    <Compile Include="Interop\HbLib\hb_image_s.cs" />
+    <Compile Include="Interop\HbLib\hb_mixdown_s.cs" />
+    <Compile Include="Interop\HbLib\hb_rate_s.cs" />
+    <Compile Include="Interop\HbLib\hb_subtitle.cs" />
+    <Compile Include="Interop\HbLib\iso639_lang_t.cs" />
+    <Compile Include="Interop\HbLib\NativeConstants.cs" />
+    <Compile Include="Interop\Helpers\InteropUtilities.cs" />
+    <Compile Include="Interop\Helpers\NativeList.cs" />
+    <Compile Include="Interop\Helpers\Utilities.cs" />
+    <Compile Include="Interop\Interfaces\IHandBrakeInstance.cs" />
+    <Compile Include="Interop\Json\Anamorphic\AnamorphicGeometry.cs" />
+    <Compile Include="Interop\Json\Anamorphic\DestSettings.cs" />
+    <Compile Include="Interop\Json\Encode\QSV.cs" />
+    <Compile Include="Interop\Json\Filters\PresetTune.cs" />
+    <Compile Include="Interop\Json\Presets\AudioList.cs" />
+    <Compile Include="Interop\Json\Presets\HBPreset.cs" />
+    <Compile Include="Interop\Json\Presets\PresetCategory.cs" />
+    <Compile Include="Interop\Json\Presets\PresetTransportContainer.cs" />
+    <Compile Include="Interop\Json\Queue\Task.cs" />
+    <Compile Include="Interop\Json\Scan\AudioAttributes.cs" />
+    <Compile Include="Interop\Json\Scan\SubtitleAttributes.cs" />
+    <Compile Include="Interop\Json\Shared\PAR.cs" />
+    <Compile Include="Interop\Json\Encode\Audio.cs" />
+    <Compile Include="Interop\Json\Encode\AudioTrack.cs" />
+    <Compile Include="Interop\Json\Encode\Chapter.cs" />
+    <Compile Include="Interop\Json\Encode\Destination.cs" />
+    <Compile Include="Interop\Json\Encode\Filters.cs" />
+    <Compile Include="Interop\Json\Encode\Filter.cs" />
+    <Compile Include="Interop\Json\Encode\JsonEncodeObject.cs" />
+    <Compile Include="Interop\Json\Encode\Metadata.cs" />
+    <Compile Include="Interop\Json\Encode\Mp4Options.cs" />
+    <Compile Include="Interop\Json\Encode\Range.cs" />
+    <Compile Include="Interop\Json\Encode\SubtitleSearch.cs" />
+    <Compile Include="Interop\Json\Encode\Source.cs" />
+    <Compile Include="Interop\Json\Encode\SRT.cs" />
+    <Compile Include="Interop\Json\Encode\Subtitles.cs" />
+    <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />
+    <Compile Include="Interop\Json\Encode\Video.cs" />
+    <Compile Include="Interop\Factories\AnamorphicFactory.cs" />
+    <Compile Include="Interop\Json\State\TaskState.cs" />
+    <Compile Include="Interop\Model\Encoding\CombDetect.cs" />
+    <Compile Include="Interop\Model\Encoding\DeinterlaceFilter.cs" />
+    <Compile Include="Interop\Model\Encoding\HBPresetTune.cs" />
+    <Compile Include="Interop\Model\Encoding\Sharpen.cs" />
+    <Compile Include="Interop\Model\Preview\RawPreviewData.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Interop\Json\Scan\SourceAudioTrack.cs" />
+    <Compile Include="Interop\Json\Scan\SourceChapter.cs" />
+    <Compile Include="Interop\Json\Scan\Color.cs" />
+    <Compile Include="Interop\Json\Scan\Duration.cs" />
+    <Compile Include="Interop\Json\Scan\FrameRate.cs" />
+    <Compile Include="Interop\Json\Shared\Geometry.cs" />
+    <Compile Include="Interop\Json\Scan\JsonScanObject.cs" />
+    <Compile Include="Interop\Json\Scan\SourceMetadata.cs" />
+    <Compile Include="Interop\Json\Scan\SourceSubtitleTrack.cs" />
+    <Compile Include="Interop\Json\Scan\SourceTitle.cs" />
+    <Compile Include="Interop\Json\State\JsonState.cs" />
+    <Compile Include="Interop\Json\State\Scanning.cs" />
+    <Compile Include="Interop\Json\State\WorkDone.cs" />
+    <Compile Include="Interop\Json\State\Working.cs" />
+    <Compile Include="Interop\Model\BitrateLimits.cs" />
+    <Compile Include="Interop\Model\Cropping.cs" />
+    <Compile Include="Interop\Model\Encoding\Anamorphic.cs" />
+    <Compile Include="Interop\Model\Encoding\Container.cs" />
+    <Compile Include="Interop\Model\Encoding\Decomb.cs" />
+    <Compile Include="Interop\Model\Encoding\Deinterlace.cs" />
+    <Compile Include="Interop\Model\Encoding\Denoise.cs" />
+    <Compile Include="Interop\Model\Encoding\Detelecine.cs" />
+    <Compile Include="Interop\Model\Encoding\HBAudioEncoder.cs" />
+    <Compile Include="Interop\Model\Encoding\HBContainer.cs" />
+    <Compile Include="Interop\Model\Encoding\HBMixdown.cs" />
+    <Compile Include="Interop\Model\Encoding\HBRate.cs" />
+    <Compile Include="Interop\Model\Encoding\HBVideoEncoder.cs" />
+    <Compile Include="Interop\Model\Encoding\PictureRotation.cs" />
+    <Compile Include="Interop\Model\Encoding\ScaleMethod.cs" />
+    <Compile Include="Interop\Model\Encoding\VideoEncoder.cs" />
+    <Compile Include="Interop\Model\Encoding\VideoEncodeRateType.cs" />
+    <Compile Include="Interop\Model\Language.cs" />
+    <Compile Include="Interop\Model\Preview\PreviewSettings.cs" />
+    <Compile Include="Interop\Model\RangeLimits.cs" />
+    <Compile Include="Interop\Model\Size.cs" />
+    <Compile Include="Interop\Model\SourceVideoInfo.cs" />
+    <Compile Include="Interop\Model\VideoQualityLimits.cs" />
+    <Compile Include="Model\HBConfiguration.cs" />
+    <Compile Include="Model\VideoScaler.cs" />
+    <Compile Include="Utilities\SystemInfo.cs" />
+    <Compile Include="Utilities\VersionHelper.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Utilities\CharCodesUtilities.cs" />
+    <Compile Include="Utilities\LanguageUtilities.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\stylecop.json">
+      <Link>stylecop.json</Link>
+    </AdditionalFiles>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="HandBrake.Interop.nuspec" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
 </Project>
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.nuspec b/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
index 4e7eb56f7..42a383f9f 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.nuspec
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
@@ -20,6 +20,6 @@
   </metadata>
 
   <files>
-    <file src="bin\Release\HandBrake.ApplicationServices.pdb" target="lib\net471" />
+    <file src="bin\Release\HandBrake.Interop.pdb" target="lib\net471" />
   </files>
 </package>
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeCompletedEventArgs.cs b/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeCompletedEventArgs.cs
index 52b5719fe..ea54e1d1c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeCompletedEventArgs.cs
+++ b/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeCompletedEventArgs.cs
@@ -1,35 +1,35 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the EncodeCompletedEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.EventArgs
-{
-    using System;
-
-    /// <summary>
-    /// Encode Completed Event Args
-    /// </summary>
-    public class EncodeCompletedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EncodeCompletedEventArgs"/> class.
-        /// </summary>
-        /// <param name="error">
-        /// The error.
-        /// </param>
-        public EncodeCompletedEventArgs(bool error)
-        {
-            this.Error = error;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether an error occurred during the encode.
-        /// </summary>
-        public bool Error { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the EncodeCompletedEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.EventArgs
+{
+    using System;
+
+    /// <summary>
+    /// Encode Completed Event Args
+    /// </summary>
+    public class EncodeCompletedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncodeCompletedEventArgs"/> class.
+        /// </summary>
+        /// <param name="error">
+        /// The error.
+        /// </param>
+        public EncodeCompletedEventArgs(bool error)
+        {
+            this.Error = error;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether an error occurred during the encode.
+        /// </summary>
+        public bool Error { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs b/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeProgressEventArgs.cs
index c43ac42d9..303995194 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
+++ b/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeProgressEventArgs.cs
@@ -1,120 +1,120 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the EncodeProgressEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.EventArgs
-{
-    using System;
-
-    /// <summary>s
-    /// Encode Progress Event Args
-    /// </summary>
-    public class EncodeProgressEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EncodeProgressEventArgs"/> class.
-        /// </summary>
-        /// <param name="fractionComplete">
-        /// The fraction complete.
-        /// </param>
-        /// <param name="currentFrameRate">
-        /// The current frame rate.
-        /// </param>
-        /// <param name="averageFrameRate">
-        /// The average frame rate.
-        /// </param>
-        /// <param name="estimatedTimeLeft">
-        /// The estimated time left.
-        /// </param>
-        /// <param name="passId">
-        /// The pass id.
-        /// </param>
-        /// <param name="pass">
-        /// The pass.
-        /// </param>
-        /// <param name="passCount">
-        /// The pass count.
-        /// </param>
-        /// <param name="stateCode">
-        /// The code for the state the encode process is in.
-        /// </param>
-        public EncodeProgressEventArgs(double fractionComplete, double currentFrameRate, double averageFrameRate, TimeSpan estimatedTimeLeft, int passId, int pass, int passCount, string stateCode)
-        {
-            this.FractionComplete = fractionComplete;
-            this.CurrentFrameRate = currentFrameRate;
-            this.AverageFrameRate = averageFrameRate;
-            this.EstimatedTimeLeft = estimatedTimeLeft;
-            this.PassId = passId;
-            this.Pass = pass;
-            this.PassCount = passCount;
-            this.StateCode = stateCode;
-        }
-
-        /// <summary>
-        /// Gets the % Complete.
-        /// </summary>
-        public double FractionComplete { get; private set; }
-
-        /// <summary>
-        /// Gets the Current FrameRate.
-        /// </summary>
-        public double CurrentFrameRate { get; private set; }
-
-        /// <summary>
-        /// Gets the Average FrameRate.
-        /// </summary>
-        public double AverageFrameRate { get; private set; }
-
-        /// <summary>
-        /// Gets the Estimated Time Left.
-        /// </summary>
-        public TimeSpan EstimatedTimeLeft { get; private set; }
-
-        /// <summary>
-        /// Gets the pass ID.
-        /// </summary>
-        /// <remarks>
-        /// -1: Subtitle scan
-        ///  0: Encode
-        ///  1: Encode first pass
-        ///  2: Encode second pass
-        /// </remarks>
-        public int PassId { get; private set; }
-
-        /// <summary>
-        /// Gets the current encoding pass. (1-based)
-        /// </summary>
-        public int Pass { get; private set; }
-
-        /// <summary>
-        /// Gets the pass count.
-        /// </summary>
-        public int PassCount { get; private set; }
-
-        /// <summary>
-        /// Gets the state code of the encode process.
-        /// </summary>
-        public string StateCode { get; }
-
-        /// <summary>
-        /// Gets a value indicating that we are doing a subtitle scan pass.
-        /// </summary>
-        public bool IsSubtitleScan
-        {
-            get
-            {
-                if (this.PassId == -1)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the EncodeProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.EventArgs
+{
+    using System;
+
+    /// <summary>s
+    /// Encode Progress Event Args
+    /// </summary>
+    public class EncodeProgressEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncodeProgressEventArgs"/> class.
+        /// </summary>
+        /// <param name="fractionComplete">
+        /// The fraction complete.
+        /// </param>
+        /// <param name="currentFrameRate">
+        /// The current frame rate.
+        /// </param>
+        /// <param name="averageFrameRate">
+        /// The average frame rate.
+        /// </param>
+        /// <param name="estimatedTimeLeft">
+        /// The estimated time left.
+        /// </param>
+        /// <param name="passId">
+        /// The pass id.
+        /// </param>
+        /// <param name="pass">
+        /// The pass.
+        /// </param>
+        /// <param name="passCount">
+        /// The pass count.
+        /// </param>
+        /// <param name="stateCode">
+        /// The code for the state the encode process is in.
+        /// </param>
+        public EncodeProgressEventArgs(double fractionComplete, double currentFrameRate, double averageFrameRate, TimeSpan estimatedTimeLeft, int passId, int pass, int passCount, string stateCode)
+        {
+            this.FractionComplete = fractionComplete;
+            this.CurrentFrameRate = currentFrameRate;
+            this.AverageFrameRate = averageFrameRate;
+            this.EstimatedTimeLeft = estimatedTimeLeft;
+            this.PassId = passId;
+            this.Pass = pass;
+            this.PassCount = passCount;
+            this.StateCode = stateCode;
+        }
+
+        /// <summary>
+        /// Gets the % Complete.
+        /// </summary>
+        public double FractionComplete { get; private set; }
+
+        /// <summary>
+        /// Gets the Current FrameRate.
+        /// </summary>
+        public double CurrentFrameRate { get; private set; }
+
+        /// <summary>
+        /// Gets the Average FrameRate.
+        /// </summary>
+        public double AverageFrameRate { get; private set; }
+
+        /// <summary>
+        /// Gets the Estimated Time Left.
+        /// </summary>
+        public TimeSpan EstimatedTimeLeft { get; private set; }
+
+        /// <summary>
+        /// Gets the pass ID.
+        /// </summary>
+        /// <remarks>
+        /// -1: Subtitle scan
+        ///  0: Encode
+        ///  1: Encode first pass
+        ///  2: Encode second pass
+        /// </remarks>
+        public int PassId { get; private set; }
+
+        /// <summary>
+        /// Gets the current encoding pass. (1-based)
+        /// </summary>
+        public int Pass { get; private set; }
+
+        /// <summary>
+        /// Gets the pass count.
+        /// </summary>
+        public int PassCount { get; private set; }
+
+        /// <summary>
+        /// Gets the state code of the encode process.
+        /// </summary>
+        public string StateCode { get; }
+
+        /// <summary>
+        /// Gets a value indicating that we are doing a subtitle scan pass.
+        /// </summary>
+        public bool IsSubtitleScan
+        {
+            get
+            {
+                if (this.PassId == -1)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/MessageLoggedEventArgs.cs b/win/CS/HandBrake.Interop/Interop/EventArgs/MessageLoggedEventArgs.cs
index 610ab0a77..2359fff5d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/MessageLoggedEventArgs.cs
+++ b/win/CS/HandBrake.Interop/Interop/EventArgs/MessageLoggedEventArgs.cs
@@ -1,35 +1,35 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MessageLoggedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the MessageLoggedEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.EventArgs
-{
-    using System;
-
-    /// <summary>
-    /// The Message Logged Event Args
-    /// </summary>
-    public class MessageLoggedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MessageLoggedEventArgs"/> class.
-        /// </summary>
-        /// <param name="message">
-        /// The message.
-        /// </param>
-        public MessageLoggedEventArgs(string message)
-        {
-            this.Message = message;
-        }
-
-        /// <summary>
-        /// Gets the Message.
-        /// </summary>
-        public string Message { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MessageLoggedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the MessageLoggedEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.EventArgs
+{
+    using System;
+
+    /// <summary>
+    /// The Message Logged Event Args
+    /// </summary>
+    public class MessageLoggedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MessageLoggedEventArgs"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// The message.
+        /// </param>
+        public MessageLoggedEventArgs(string message)
+        {
+            this.Message = message;
+        }
+
+        /// <summary>
+        /// Gets the Message.
+        /// </summary>
+        public string Message { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/ScanProgressEventArgs.cs b/win/CS/HandBrake.Interop/Interop/EventArgs/ScanProgressEventArgs.cs
index 78737943e..8e87552a2 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/ScanProgressEventArgs.cs
+++ b/win/CS/HandBrake.Interop/Interop/EventArgs/ScanProgressEventArgs.cs
@@ -1,71 +1,71 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the ScanProgressEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.EventArgs
-{
-    using System;
-
-    /// <summary>
-    /// The Scan Progress Event Args
-    /// </summary>
-    public class ScanProgressEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScanProgressEventArgs"/> class.
-        /// </summary>
-        /// <param name="progress">
-        /// The progress.
-        /// </param>
-        /// <param name="currentPreview">
-        /// The current preview.
-        /// </param>
-        /// <param name="previews">
-        /// The previews.
-        /// </param>
-        /// <param name="currentTitle">
-        /// The current title.
-        /// </param>
-        /// <param name="titles">
-        /// The titles.
-        /// </param>
-        public ScanProgressEventArgs(double progress, int currentPreview, int previews, int currentTitle, int titles)
-        {
-            this.Progress = progress;
-            this.CurrentPreview = currentPreview;
-            this.Previews = previews;
-            this.CurrentTitle = currentTitle;
-            this.Titles = titles;
-        }
-
-        /// <summary>
-        /// Gets the total progress fraction for the scan.
-        /// </summary>
-        public double Progress { get; private set; }
-
-        /// <summary>
-        /// Gets the current preview being processed on the scan.
-        /// </summary>
-        public int CurrentPreview { get; private set; }
-
-        /// <summary>
-        /// Gets the total number of previews to process.
-        /// </summary>
-        public int Previews { get; private set; }
-
-        /// <summary>
-        /// Gets the current title being processed on the scan.
-        /// </summary>
-        public int CurrentTitle { get; private set; }
-
-        /// <summary>
-        /// Gets the total number of titles to process.
-        /// </summary>
-        public int Titles { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the ScanProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.EventArgs
+{
+    using System;
+
+    /// <summary>
+    /// The Scan Progress Event Args
+    /// </summary>
+    public class ScanProgressEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScanProgressEventArgs"/> class.
+        /// </summary>
+        /// <param name="progress">
+        /// The progress.
+        /// </param>
+        /// <param name="currentPreview">
+        /// The current preview.
+        /// </param>
+        /// <param name="previews">
+        /// The previews.
+        /// </param>
+        /// <param name="currentTitle">
+        /// The current title.
+        /// </param>
+        /// <param name="titles">
+        /// The titles.
+        /// </param>
+        public ScanProgressEventArgs(double progress, int currentPreview, int previews, int currentTitle, int titles)
+        {
+            this.Progress = progress;
+            this.CurrentPreview = currentPreview;
+            this.Previews = previews;
+            this.CurrentTitle = currentTitle;
+            this.Titles = titles;
+        }
+
+        /// <summary>
+        /// Gets the total progress fraction for the scan.
+        /// </summary>
+        public double Progress { get; private set; }
+
+        /// <summary>
+        /// Gets the current preview being processed on the scan.
+        /// </summary>
+        public int CurrentPreview { get; private set; }
+
+        /// <summary>
+        /// Gets the total number of previews to process.
+        /// </summary>
+        public int Previews { get; private set; }
+
+        /// <summary>
+        /// Gets the current title being processed on the scan.
+        /// </summary>
+        public int CurrentTitle { get; private set; }
+
+        /// <summary>
+        /// Gets the total number of titles to process.
+        /// </summary>
+        public int Titles { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs b/win/CS/HandBrake.Interop/Interop/Factories/AnamorphicFactory.cs
index 5d095cc2c..a1d0207f3 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
+++ b/win/CS/HandBrake.Interop/Interop/Factories/AnamorphicFactory.cs
@@ -1,94 +1,94 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AnamorphicFactory.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The Anamorphic factory.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Factories
-{
-    using System.Collections.Generic;
-
-    using HandBrake.ApplicationServices.Interop.Json.Anamorphic;
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Interop.Model.Preview;
-
-    /// <summary>
-    /// The anamorphic factory.
-    /// </summary>
-    public class AnamorphicFactory
-    {
-        /// <summary>
-        /// The keep setting.
-        /// </summary>
-        public enum KeepSetting
-        {
-            HB_KEEP_WIDTH = 0x01, 
-            HB_KEEP_HEIGHT = 0x02, 
-            HB_KEEP_DISPLAY_ASPECT = 0x04
-        }
-
-        /// <summary>
-        /// Finds output geometry for the given preview settings and title.
-        /// </summary>
-        /// <param name="settings">
-        /// The preview settings.
-        /// </param>
-        /// <param name="title">
-        /// Information on the title to consider.
-        /// </param>
-        /// <returns>
-        /// Geometry Information
-        /// </returns>
-        public static Geometry CreateGeometry(PreviewSettings settings, SourceVideoInfo title)
-        {
-            int settingMode = settings.KeepDisplayAspect ? 0x04 : 0;
-
-            // Sanitize the Geometry First.
-            AnamorphicGeometry anamorphicGeometry = new AnamorphicGeometry
-            {
-                SourceGeometry = new Geometry
-                {
-                    Width = title.Resolution.Width, 
-                    Height = title.Resolution.Height, 
-                    PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height }
-                }, 
-                DestSettings = new DestSettings
-                {
-                    AnamorphicMode = (int)settings.Anamorphic, 
-                    Geometry =
-                    {
-                        Width = settings.Width, 
-                        Height = settings.Height, 
-                        PAR = new PAR
-                        {
-                            Num = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Width : settings.PixelAspectX, 
-                            Den = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Height : settings.PixelAspectY, 
-                        }
-                    }, 
-                    Keep = settingMode, 
-                    Crop = new List<int> { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right }, 
-                    Modulus = settings.Modulus ?? 16, 
-                    MaxWidth = settings.MaxWidth, 
-                    MaxHeight = settings.MaxHeight, 
-                    ItuPAR = false
-                }
-            };
-
-            if (settings.Anamorphic == Anamorphic.Custom)
-            {
-                anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = settings.PixelAspectX, Den = settings.PixelAspectY };
-            }
-            else
-            {
-                anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height };
-            }
-
-            return HandBrakeUtils.GetAnamorphicSize(anamorphicGeometry);
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AnamorphicFactory.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Anamorphic factory.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Factories
+{
+    using System.Collections.Generic;
+
+    using HandBrake.Interop.Interop.Json.Anamorphic;
+    using HandBrake.Interop.Interop.Json.Shared;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Preview;
+
+    /// <summary>
+    /// The anamorphic factory.
+    /// </summary>
+    public class AnamorphicFactory
+    {
+        /// <summary>
+        /// The keep setting.
+        /// </summary>
+        public enum KeepSetting
+        {
+            HB_KEEP_WIDTH = 0x01, 
+            HB_KEEP_HEIGHT = 0x02, 
+            HB_KEEP_DISPLAY_ASPECT = 0x04
+        }
+
+        /// <summary>
+        /// Finds output geometry for the given preview settings and title.
+        /// </summary>
+        /// <param name="settings">
+        /// The preview settings.
+        /// </param>
+        /// <param name="title">
+        /// Information on the title to consider.
+        /// </param>
+        /// <returns>
+        /// Geometry Information
+        /// </returns>
+        public static Geometry CreateGeometry(PreviewSettings settings, SourceVideoInfo title)
+        {
+            int settingMode = settings.KeepDisplayAspect ? 0x04 : 0;
+
+            // Sanitize the Geometry First.
+            AnamorphicGeometry anamorphicGeometry = new AnamorphicGeometry
+            {
+                SourceGeometry = new Geometry
+                {
+                    Width = title.Resolution.Width, 
+                    Height = title.Resolution.Height, 
+                    PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height }
+                }, 
+                DestSettings = new DestSettings
+                {
+                    AnamorphicMode = (int)settings.Anamorphic, 
+                    Geometry =
+                    {
+                        Width = settings.Width, 
+                        Height = settings.Height, 
+                        PAR = new PAR
+                        {
+                            Num = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Width : settings.PixelAspectX, 
+                            Den = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Height : settings.PixelAspectY, 
+                        }
+                    }, 
+                    Keep = settingMode, 
+                    Crop = new List<int> { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right }, 
+                    Modulus = settings.Modulus ?? 16, 
+                    MaxWidth = settings.MaxWidth, 
+                    MaxHeight = settings.MaxHeight, 
+                    ItuPAR = false
+                }
+            };
+
+            if (settings.Anamorphic == Anamorphic.Custom)
+            {
+                anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = settings.PixelAspectX, Den = settings.PixelAspectY };
+            }
+            else
+            {
+                anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height };
+            }
+
+            return HandBrakeUtils.GetAnamorphicSize(anamorphicGeometry);
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
index 125c04449..db5744315 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
@@ -1,666 +1,666 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeEncoderHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The encoders.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-
-    /// <summary>
-    /// The encoders.
-    /// </summary>
-    public static class HandBrakeEncoderHelpers
-    {
-        /// <summary>
-        /// The audio encoders.
-        /// </summary>
-        private static List<HBAudioEncoder> audioEncoders;
-
-        /// <summary>
-        /// The video encoders.
-        /// </summary>
-        private static List<HBVideoEncoder> videoEncoders;
-
-        /// <summary>
-        /// Video framerates in pts.
-        /// </summary>
-        private static List<HBRate> videoFramerates;
-
-        /// <summary>
-        /// List of HandBrake mixdowns.
-        /// </summary>
-        private static List<HBMixdown> mixdowns;
-
-        /// <summary>
-        /// List of HandBrake containers.
-        /// </summary> 
-        private static List<HBContainer> containers;
-
-        /// <summary>
-        /// The audio bitrates.
-        /// </summary>
-        private static List<int> audioBitrates;
-
-        /// <summary>
-        /// Audio sample rates in Hz.
-        /// </summary>
-        private static List<HBRate> audioSampleRates;
-
-        /// <summary>
-        /// Initializes static members of the HandBrakeEncoderHelpers class.
-        /// </summary>
-        static HandBrakeEncoderHelpers()
-        {
-            HandBrakeUtils.EnsureGlobalInit();
-        }
-
-        /// <summary>
-        /// Gets a list of supported audio encoders.
-        /// </summary>
-        public static List<HBAudioEncoder> AudioEncoders
-        {
-            get
-            {
-                if (audioEncoders == null)
-                {
-                    audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToAudioEncoder);
-                }
-
-                return audioEncoders;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported video encoders.
-        /// </summary>
-        public static List<HBVideoEncoder> VideoEncoders
-        {
-            get
-            {
-                if (videoEncoders == null)
-                {
-                    videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToVideoEncoder);
-                }
-
-                return videoEncoders;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported video framerates (in pts).
-        /// </summary>
-        public static List<HBRate> VideoFramerates
-        {
-            get
-            {
-                if (videoFramerates == null)
-                {
-                    videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
-                }
-
-                return videoFramerates;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported mixdowns.
-        /// </summary>
-        public static List<HBMixdown> Mixdowns
-        {
-            get
-            {
-                if (mixdowns == null)
-                {
-                    mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, HandBrakeUnitConversionHelpers.NativeToMixdown);
-                }
-
-                return mixdowns;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported audio bitrates.
-        /// </summary>
-        public static List<int> AudioBitrates
-        {
-            get
-            {
-                if (audioBitrates == null)
-                {
-                    audioBitrates = InteropUtilities.ToListFromIterator<hb_rate_s, int>(HBFunctions.hb_audio_bitrate_get_next, b => b.rate);
-                }
-
-                return audioBitrates;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported audio sample rates (in Hz).
-        /// </summary>
-        public static List<HBRate> AudioSampleRates
-        {
-            get
-            {
-                if (audioSampleRates == null)
-                {
-                    audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
-                }
-
-                return audioSampleRates;
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of supported containers.
-        /// </summary>
-        public static List<HBContainer> Containers
-        {
-            get
-            {
-                if (containers == null)
-                {
-                    containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, HandBrakeUnitConversionHelpers.NativeToContainer);
-                }
-
-                return containers;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether SRT subtitles can be burnt in.
-        /// </summary>
-        public static bool CanBurnSrt
-        {
-            get
-            {
-                return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.SRTSUB) > 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the audio encoder with the specified short name.
-        /// </summary>
-        /// <param name="shortName">
-        /// The name of the audio encoder.
-        /// </param>
-        /// <returns>
-        /// The requested audio encoder.
-        /// </returns>
-        public static HBAudioEncoder GetAudioEncoder(string shortName)
-        {
-            return AudioEncoders.SingleOrDefault(e => e.ShortName == shortName);
-        }
-
-        /// <summary>
-        /// Gets the audio encoder with the specified codec ID.
-        /// </summary>
-        /// <param name="codecId">
-        /// The ID of the audio encoder.
-        /// </param>
-        /// <returns>
-        /// The requested audio encoder.
-        /// </returns>
-        public static HBAudioEncoder GetAudioEncoder(int codecId)
-        {
-            return AudioEncoders.SingleOrDefault(e => e.Id == codecId);
-        }
-
-        /// <summary>
-        /// Gets the video encoder with the specified short name.
-        /// </summary>
-        /// <param name="shortName">
-        /// The name of the video encoder.
-        /// </param>
-        /// <returns>
-        /// The requested video encoder.
-        /// </returns>
-        public static HBVideoEncoder GetVideoEncoder(string shortName)
-        {
-            return VideoEncoders.SingleOrDefault(e => e.ShortName == shortName);
-        }
-
-        /// <summary>
-        /// Gets the mixdown with the specified short name.
-        /// </summary>
-        /// <param name="shortName">
-        /// The name of the mixdown.
-        /// </param>
-        /// <returns>
-        /// The requested mixdown.
-        /// </returns>
-        public static HBMixdown GetMixdown(string shortName)
-        {
-            return Mixdowns.SingleOrDefault(m => m.ShortName == shortName);
-        }
-
-		/// <summary>
-		/// Gets the mixdown with the specified ID.
-		/// </summary>
-		/// <param name="id">The mixdown ID.</param>
-		/// <returns>The requested mixdown.</returns>
-	    public static HBMixdown GetMixdown(int id)
-	    {
-		    return Mixdowns.SingleOrDefault(m => m.Id == id);
-	    }
-
-        /// <summary>
-        /// Gets the container with the specified short name.
-        /// </summary>
-        /// <param name="shortName">
-        /// The name of the container.
-        /// </param>
-        /// <returns>
-        /// The requested container.
-        /// </returns>
-        public static HBContainer GetContainer(string shortName)
-        {
-            return Containers.SingleOrDefault(c => c.ShortName == shortName);
-        }
-
-        /// <summary>
-        /// Returns true if the subtitle source type can be set to forced only.
-        /// </summary>
-        /// <param name="source">
-        /// The subtitle source type (SSA, VobSub, etc)
-        /// </param>
-        /// <returns>
-        /// True if the subtitle source type can be set to forced only.
-        /// </returns>
-        public static bool SubtitleCanSetForcedOnly(int source)
-        {
-            return HBFunctions.hb_subtitle_can_force(source) > 0;
-        }
-
-        /// <summary>
-        /// Returns true if the subtitle source type can be burned in.
-        /// </summary>
-        /// <param name="source">
-        /// The subtitle source type (SSA, VobSub, etc)
-        /// </param>
-        /// <returns>
-        /// True if the subtitle source type can be burned in.
-        /// </returns>
-        public static bool SubtitleCanBurn(int source)
-        {
-            return HBFunctions.hb_subtitle_can_burn(source) > 0;
-        }
-
-        /// <summary>
-        /// Returns true if the subtitle type can be passed through using the given muxer.
-        /// </summary>
-        /// <param name="subtitleSourceType">
-        /// The subtitle source type (SSA, VobSub, etc)
-        /// </param>
-        /// <param name="muxer">
-        /// The ID of the muxer.
-        /// </param>
-        /// <returns>
-        /// True if the subtitle type can be passed through with the given muxer.
-        /// </returns>
-        public static bool SubtitleCanPassthrough(int subtitleSourceType, int muxer)
-        {
-            return HBFunctions.hb_subtitle_can_pass(subtitleSourceType, muxer) > 0;
-        }
-
-        /// <summary>
-        /// Gets the subtitle source type's name.
-        /// </summary>
-        /// <param name="source">
-        /// The subtitle source type (SSA, VobSub, etc).
-        /// </param>
-        /// <returns>
-        /// The name of the subtitle source.
-        /// </returns>
-        public static string GetSubtitleSourceName(int source)
-        {
-            switch ((hb_subtitle_s_subsource)source)
-            {
-                case hb_subtitle_s_subsource.CC608SUB:
-                    return "CC608";
-                case hb_subtitle_s_subsource.CC708SUB:
-                    return "CC708";
-                case hb_subtitle_s_subsource.SRTSUB:
-                    return "SRT";
-                case hb_subtitle_s_subsource.SSASUB:
-                    return "SSA";
-                case hb_subtitle_s_subsource.TX3GSUB:
-                    return "TX3G";
-                case hb_subtitle_s_subsource.UTF8SUB:
-                    return "UTF8";
-                case hb_subtitle_s_subsource.VOBSUB:
-                    return "VobSub";
-                case hb_subtitle_s_subsource.PGSSUB:
-                    return "PGS";
-                default:
-                    return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// Determines if the given encoder is compatible with the given track.
-        /// </summary>
-        /// <param name="codecId">
-        /// The codec Id.
-        /// </param>
-        /// <param name="encoder">
-        /// The encoder to examine.
-        /// </param>
-        /// <returns>
-        /// True if the given encoder is comatible with the given audio track.
-        /// </returns>
-        /// <remarks>
-        /// Only works with passthrough encoders.
-        /// </remarks>
-        public static bool AudioEncoderIsCompatible(int codecId, HBAudioEncoder encoder)
-        {
-            return (codecId & encoder.Id) > 0;
-        }
-
-        /// <summary>
-        /// Determines if the given mixdown supports the given channel layout.
-        /// </summary>
-        /// <param name="mixdown">
-        /// The mixdown to evaluate.
-        /// </param>
-        /// <param name="layout">
-        /// The channel layout to evaluate.
-        /// </param>
-        /// <returns>
-        /// True if the mixdown supports the given channel layout.
-        /// </returns>
-        public static bool MixdownHasRemixSupport(HBMixdown mixdown, ulong layout)
-        {
-            return HBFunctions.hb_mixdown_has_remix_support(mixdown.Id, layout) > 0;
-        }
-
-        /// <summary>
-        /// Determines if the given encoder supports the given mixdown.
-        /// </summary>
-        /// <param name="mixdown">
-        /// The mixdown to evaluate.
-        /// </param>
-        /// <param name="encoder">
-        /// The encoder to evaluate.
-        /// </param>
-        /// <returns>
-        /// True if the encoder supports the mixdown.
-        /// </returns>
-        public static bool MixdownHasCodecSupport(HBMixdown mixdown, HBAudioEncoder encoder)
-        {
-            return HBFunctions.hb_mixdown_has_codec_support(mixdown.Id, (uint)encoder.Id) > 0;
-        }
-
-        /// <summary>
-        /// Determines if a mixdown is available for a given track and encoder.
-        /// </summary>
-        /// <param name="mixdown">
-        /// The mixdown to evaluate.
-        /// </param>
-        /// <param name="encoder">
-        /// The encoder to evaluate.
-        /// </param>
-        /// <param name="channelLayout">channel layout of the source track</param>
-        /// <returns>True if available.</returns>
-        public static bool MixdownIsSupported(HBMixdown mixdown, HBAudioEncoder encoder, long channelLayout)
-        {
-            return HBFunctions.hb_mixdown_is_supported(mixdown.Id, (uint)encoder.Id, (uint)channelLayout) > 0;
-        }
-
-        /// <summary>
-        /// Determines if DRC can be applied to the given track with the given encoder.
-        /// </summary>
-        /// <param name="trackNumber">
-        /// The track Number.
-        /// </param>
-        /// <param name="encoder">
-        /// The encoder to use for DRC.
-        /// </param>
-        /// <param name="title">
-        /// The title.
-        /// </param>
-        /// <returns>
-        /// True if DRC can be applied to the track with the given encoder.
-        /// </returns>
-        public static bool CanApplyDrc(int trackNumber, HBAudioEncoder encoder, int title)
-        {
-            return HBFunctions.hb_audio_can_apply_drc2(HandBrakeInstanceManager.LastScanHandle, title, trackNumber, encoder.Id) > 0;
-        }
-
-        /// <summary>
-        /// Determines if the given input audio codec can be passed through.
-        /// </summary>
-        /// <param name="codecId">
-        /// The input codec to consider.
-        /// </param>
-        /// <returns>
-        /// True if the codec can be passed through.
-        /// </returns>
-        public static bool CanPassthroughAudio(int codecId)
-        {
-            return (codecId & NativeConstants.HB_ACODEC_PASS_MASK) > 0;
-        }
-
-        /// <summary>
-        /// Sanitizes a mixdown given the output codec and input channel layout.
-        /// </summary>
-        /// <param name="mixdown">
-        /// The desired mixdown.
-        /// </param>
-        /// <param name="encoder">
-        /// The output encoder to be used.
-        /// </param>
-        /// <param name="layout">
-        /// The input channel layout.
-        /// </param>
-        /// <returns>
-        /// A sanitized mixdown value.
-        /// </returns>
-        public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, ulong layout)
-        {
-            if (mixdown == null)
-            {
-                return null;
-            }
-
-            int sanitizedMixdown = HBFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
-            if (sanitizedMixdown != -1)
-            {
-                return Mixdowns.Single(m => m.Id == sanitizedMixdown);
-            }
-            return Mixdowns.FirstOrDefault(); // "none"
-        }
-
-        /// <summary>
-        /// Gets the default mixdown for the given audio encoder and channel layout.
-        /// </summary>
-        /// <param name="encoder">
-        /// The output codec to be used.
-        /// </param>
-        /// <param name="layout">
-        /// The input channel layout.
-        /// </param>
-        /// <returns>
-        /// The default mixdown for the given codec and channel layout.
-        /// </returns>
-        public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, ulong layout)
-        {
-            int defaultMixdown = HBFunctions.hb_mixdown_get_default((uint)encoder.Id, layout);
-            return Mixdowns.Single(m => m.Id == defaultMixdown);
-        }
-
-		/// <summary>
-		/// Sanitizes the given sample rate for the given encoder.
-		/// </summary>
-		/// <param name="encoder">The encoder.</param>
-		/// <param name="sampleRate">The sample rate to sanitize.</param>
-		/// <returns>The sanitized sample rate.</returns>
-	    public static int SanitizeSampleRate(HBAudioEncoder encoder, int sampleRate)
-	    {
-		    return HBFunctions.hb_audio_samplerate_find_closest(sampleRate, (uint)encoder.Id);
-	    }
-
-        /// <summary>
-        /// Gets the bitrate limits for the given audio codec, sample rate and mixdown.
-        /// </summary>
-        /// <param name="encoder">
-        /// The audio encoder used.
-        /// </param>
-        /// <param name="sampleRate">
-        /// The sample rate used (Hz).
-        /// </param>
-        /// <param name="mixdown">
-        /// The mixdown used.
-        /// </param>
-        /// <returns>
-        /// Limits on the audio bitrate for the given settings.
-        /// </returns>
-        public static BitrateLimits GetBitrateLimits(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-        {
-            int low = 0;
-            int high = 0;
-
-            HBFunctions.hb_audio_bitrate_get_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
-
-            return new BitrateLimits(low, high);
-        }
-
-        /// <summary>
-        /// Gets the video quality limits for the given video codec.
-        /// </summary>
-        /// <param name="encoder">
-        /// The video encoder to check.
-        /// </param>
-        /// <returns>
-        /// Limits on the video quality for the encoder.
-        /// </returns>
-        public static VideoQualityLimits GetVideoQualityLimits(HBVideoEncoder encoder)
-        {
-            float low = 0;
-            float high = 0;
-            float granularity = 0;
-            int direction = 0;
-
-            HBFunctions.hb_video_quality_get_limits((uint)encoder.Id, ref low, ref high, ref granularity, ref direction);
-
-            return new VideoQualityLimits(low, high, granularity, direction == 0);
-        }
-
-        /// <summary>
-        /// Sanitizes an audio bitrate given the output codec, sample rate and mixdown.
-        /// </summary>
-        /// <param name="audioBitrate">
-        /// The desired audio bitrate.
-        /// </param>
-        /// <param name="encoder">
-        /// The output encoder to be used.
-        /// </param>
-        /// <param name="sampleRate">
-        /// The output sample rate to be used.
-        /// </param>
-        /// <param name="mixdown">
-        /// The mixdown to be used.
-        /// </param>
-        /// <returns>
-        /// A sanitized audio bitrate.
-        /// </returns>
-        public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-        {
-            return HBFunctions.hb_audio_bitrate_get_best((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
-        }
-
-        /// <summary>
-        /// Gets the default audio bitrate for the given parameters.
-        /// </summary>
-        /// <param name="encoder">
-        /// The encoder to use.
-        /// </param>
-        /// <param name="sampleRate">
-        /// The sample rate to use.
-        /// </param>
-        /// <param name="mixdown">
-        /// The mixdown to use.
-        /// </param>
-        /// <returns>
-        /// The default bitrate for these parameters.
-        /// </returns>
-        public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
-        {
-            return HBFunctions.hb_audio_bitrate_get_default((uint)encoder.Id, sampleRate, mixdown.Id);
-        }
-
-        /// <summary>
-        /// Gets limits on audio quality for a given encoder.
-        /// </summary>
-        /// <param name="encoderId">
-        /// The audio encoder ID.
-        /// </param>
-        /// <returns>
-        /// Limits on the audio quality for the given encoder.
-        /// </returns>
-        public static RangeLimits GetAudioQualityLimits(int encoderId)
-        {
-            float low = 0, high = 0, granularity = 0;
-            int direction = 0;
-            HBFunctions.hb_audio_quality_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
-
-            return new RangeLimits(direction == 0, granularity, high, low);
-        }
-
-        /// <summary>
-        /// Gets limits on audio compression for a given encoder.
-        /// </summary>
-        /// <param name="encoderId">
-        /// The audio encoder ID.
-        /// </param>
-        /// <returns>
-        /// Limits on the audio compression for the given encoder.
-        /// </returns>
-        public static RangeLimits GetAudioCompressionLimits(int encoderId)
-        {
-            float low = 0, high = 0, granularity = 0;
-            int direction = 0;
-            HBFunctions.hb_audio_compression_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
-
-            return new RangeLimits(direction == 0, granularity, high, low);
-        }
-
-        /// <summary>
-        /// The get default quality.
-        /// </summary>
-        /// <param name="encoder">
-        /// The encoder.
-        /// </param>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public static double GetDefaultQuality(HBAudioEncoder encoder)
-        {
-           return HBFunctions.hb_audio_quality_get_default((uint)encoder.Id);
-        }
-
-        /// <summary>
-        /// The get default audio compression.
-        /// </summary>
-        /// <param name="encoder">
-        /// The encoder.
-        /// </param>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public static double GetDefaultAudioCompression(HBAudioEncoder encoder)
-        {
-            return HBFunctions.hb_audio_compression_get_default((uint)encoder.Id);
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeEncoderHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The encoders.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+
+    /// <summary>
+    /// The encoders.
+    /// </summary>
+    public static class HandBrakeEncoderHelpers
+    {
+        /// <summary>
+        /// The audio encoders.
+        /// </summary>
+        private static List<HBAudioEncoder> audioEncoders;
+
+        /// <summary>
+        /// The video encoders.
+        /// </summary>
+        private static List<HBVideoEncoder> videoEncoders;
+
+        /// <summary>
+        /// Video framerates in pts.
+        /// </summary>
+        private static List<HBRate> videoFramerates;
+
+        /// <summary>
+        /// List of HandBrake mixdowns.
+        /// </summary>
+        private static List<HBMixdown> mixdowns;
+
+        /// <summary>
+        /// List of HandBrake containers.
+        /// </summary> 
+        private static List<HBContainer> containers;
+
+        /// <summary>
+        /// The audio bitrates.
+        /// </summary>
+        private static List<int> audioBitrates;
+
+        /// <summary>
+        /// Audio sample rates in Hz.
+        /// </summary>
+        private static List<HBRate> audioSampleRates;
+
+        /// <summary>
+        /// Initializes static members of the HandBrakeEncoderHelpers class.
+        /// </summary>
+        static HandBrakeEncoderHelpers()
+        {
+            HandBrakeUtils.EnsureGlobalInit();
+        }
+
+        /// <summary>
+        /// Gets a list of supported audio encoders.
+        /// </summary>
+        public static List<HBAudioEncoder> AudioEncoders
+        {
+            get
+            {
+                if (audioEncoders == null)
+                {
+                    audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToAudioEncoder);
+                }
+
+                return audioEncoders;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported video encoders.
+        /// </summary>
+        public static List<HBVideoEncoder> VideoEncoders
+        {
+            get
+            {
+                if (videoEncoders == null)
+                {
+                    videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToVideoEncoder);
+                }
+
+                return videoEncoders;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported video framerates (in pts).
+        /// </summary>
+        public static List<HBRate> VideoFramerates
+        {
+            get
+            {
+                if (videoFramerates == null)
+                {
+                    videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
+                }
+
+                return videoFramerates;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported mixdowns.
+        /// </summary>
+        public static List<HBMixdown> Mixdowns
+        {
+            get
+            {
+                if (mixdowns == null)
+                {
+                    mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, HandBrakeUnitConversionHelpers.NativeToMixdown);
+                }
+
+                return mixdowns;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported audio bitrates.
+        /// </summary>
+        public static List<int> AudioBitrates
+        {
+            get
+            {
+                if (audioBitrates == null)
+                {
+                    audioBitrates = InteropUtilities.ToListFromIterator<hb_rate_s, int>(HBFunctions.hb_audio_bitrate_get_next, b => b.rate);
+                }
+
+                return audioBitrates;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported audio sample rates (in Hz).
+        /// </summary>
+        public static List<HBRate> AudioSampleRates
+        {
+            get
+            {
+                if (audioSampleRates == null)
+                {
+                    audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
+                }
+
+                return audioSampleRates;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of supported containers.
+        /// </summary>
+        public static List<HBContainer> Containers
+        {
+            get
+            {
+                if (containers == null)
+                {
+                    containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, HandBrakeUnitConversionHelpers.NativeToContainer);
+                }
+
+                return containers;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether SRT subtitles can be burnt in.
+        /// </summary>
+        public static bool CanBurnSrt
+        {
+            get
+            {
+                return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.SRTSUB) > 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets the audio encoder with the specified short name.
+        /// </summary>
+        /// <param name="shortName">
+        /// The name of the audio encoder.
+        /// </param>
+        /// <returns>
+        /// The requested audio encoder.
+        /// </returns>
+        public static HBAudioEncoder GetAudioEncoder(string shortName)
+        {
+            return AudioEncoders.SingleOrDefault(e => e.ShortName == shortName);
+        }
+
+        /// <summary>
+        /// Gets the audio encoder with the specified codec ID.
+        /// </summary>
+        /// <param name="codecId">
+        /// The ID of the audio encoder.
+        /// </param>
+        /// <returns>
+        /// The requested audio encoder.
+        /// </returns>
+        public static HBAudioEncoder GetAudioEncoder(int codecId)
+        {
+            return AudioEncoders.SingleOrDefault(e => e.Id == codecId);
+        }
+
+        /// <summary>
+        /// Gets the video encoder with the specified short name.
+        /// </summary>
+        /// <param name="shortName">
+        /// The name of the video encoder.
+        /// </param>
+        /// <returns>
+        /// The requested video encoder.
+        /// </returns>
+        public static HBVideoEncoder GetVideoEncoder(string shortName)
+        {
+            return VideoEncoders.SingleOrDefault(e => e.ShortName == shortName);
+        }
+
+        /// <summary>
+        /// Gets the mixdown with the specified short name.
+        /// </summary>
+        /// <param name="shortName">
+        /// The name of the mixdown.
+        /// </param>
+        /// <returns>
+        /// The requested mixdown.
+        /// </returns>
+        public static HBMixdown GetMixdown(string shortName)
+        {
+            return Mixdowns.SingleOrDefault(m => m.ShortName == shortName);
+        }
+
+		/// <summary>
+		/// Gets the mixdown with the specified ID.
+		/// </summary>
+		/// <param name="id">The mixdown ID.</param>
+		/// <returns>The requested mixdown.</returns>
+	    public static HBMixdown GetMixdown(int id)
+	    {
+		    return Mixdowns.SingleOrDefault(m => m.Id == id);
+	    }
+
+        /// <summary>
+        /// Gets the container with the specified short name.
+        /// </summary>
+        /// <param name="shortName">
+        /// The name of the container.
+        /// </param>
+        /// <returns>
+        /// The requested container.
+        /// </returns>
+        public static HBContainer GetContainer(string shortName)
+        {
+            return Containers.SingleOrDefault(c => c.ShortName == shortName);
+        }
+
+        /// <summary>
+        /// Returns true if the subtitle source type can be set to forced only.
+        /// </summary>
+        /// <param name="source">
+        /// The subtitle source type (SSA, VobSub, etc)
+        /// </param>
+        /// <returns>
+        /// True if the subtitle source type can be set to forced only.
+        /// </returns>
+        public static bool SubtitleCanSetForcedOnly(int source)
+        {
+            return HBFunctions.hb_subtitle_can_force(source) > 0;
+        }
+
+        /// <summary>
+        /// Returns true if the subtitle source type can be burned in.
+        /// </summary>
+        /// <param name="source">
+        /// The subtitle source type (SSA, VobSub, etc)
+        /// </param>
+        /// <returns>
+        /// True if the subtitle source type can be burned in.
+        /// </returns>
+        public static bool SubtitleCanBurn(int source)
+        {
+            return HBFunctions.hb_subtitle_can_burn(source) > 0;
+        }
+
+        /// <summary>
+        /// Returns true if the subtitle type can be passed through using the given muxer.
+        /// </summary>
+        /// <param name="subtitleSourceType">
+        /// The subtitle source type (SSA, VobSub, etc)
+        /// </param>
+        /// <param name="muxer">
+        /// The ID of the muxer.
+        /// </param>
+        /// <returns>
+        /// True if the subtitle type can be passed through with the given muxer.
+        /// </returns>
+        public static bool SubtitleCanPassthrough(int subtitleSourceType, int muxer)
+        {
+            return HBFunctions.hb_subtitle_can_pass(subtitleSourceType, muxer) > 0;
+        }
+
+        /// <summary>
+        /// Gets the subtitle source type's name.
+        /// </summary>
+        /// <param name="source">
+        /// The subtitle source type (SSA, VobSub, etc).
+        /// </param>
+        /// <returns>
+        /// The name of the subtitle source.
+        /// </returns>
+        public static string GetSubtitleSourceName(int source)
+        {
+            switch ((hb_subtitle_s_subsource)source)
+            {
+                case hb_subtitle_s_subsource.CC608SUB:
+                    return "CC608";
+                case hb_subtitle_s_subsource.CC708SUB:
+                    return "CC708";
+                case hb_subtitle_s_subsource.SRTSUB:
+                    return "SRT";
+                case hb_subtitle_s_subsource.SSASUB:
+                    return "SSA";
+                case hb_subtitle_s_subsource.TX3GSUB:
+                    return "TX3G";
+                case hb_subtitle_s_subsource.UTF8SUB:
+                    return "UTF8";
+                case hb_subtitle_s_subsource.VOBSUB:
+                    return "VobSub";
+                case hb_subtitle_s_subsource.PGSSUB:
+                    return "PGS";
+                default:
+                    return string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Determines if the given encoder is compatible with the given track.
+        /// </summary>
+        /// <param name="codecId">
+        /// The codec Id.
+        /// </param>
+        /// <param name="encoder">
+        /// The encoder to examine.
+        /// </param>
+        /// <returns>
+        /// True if the given encoder is comatible with the given audio track.
+        /// </returns>
+        /// <remarks>
+        /// Only works with passthrough encoders.
+        /// </remarks>
+        public static bool AudioEncoderIsCompatible(int codecId, HBAudioEncoder encoder)
+        {
+            return (codecId & encoder.Id) > 0;
+        }
+
+        /// <summary>
+        /// Determines if the given mixdown supports the given channel layout.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The mixdown to evaluate.
+        /// </param>
+        /// <param name="layout">
+        /// The channel layout to evaluate.
+        /// </param>
+        /// <returns>
+        /// True if the mixdown supports the given channel layout.
+        /// </returns>
+        public static bool MixdownHasRemixSupport(HBMixdown mixdown, ulong layout)
+        {
+            return HBFunctions.hb_mixdown_has_remix_support(mixdown.Id, layout) > 0;
+        }
+
+        /// <summary>
+        /// Determines if the given encoder supports the given mixdown.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The mixdown to evaluate.
+        /// </param>
+        /// <param name="encoder">
+        /// The encoder to evaluate.
+        /// </param>
+        /// <returns>
+        /// True if the encoder supports the mixdown.
+        /// </returns>
+        public static bool MixdownHasCodecSupport(HBMixdown mixdown, HBAudioEncoder encoder)
+        {
+            return HBFunctions.hb_mixdown_has_codec_support(mixdown.Id, (uint)encoder.Id) > 0;
+        }
+
+        /// <summary>
+        /// Determines if a mixdown is available for a given track and encoder.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The mixdown to evaluate.
+        /// </param>
+        /// <param name="encoder">
+        /// The encoder to evaluate.
+        /// </param>
+        /// <param name="channelLayout">channel layout of the source track</param>
+        /// <returns>True if available.</returns>
+        public static bool MixdownIsSupported(HBMixdown mixdown, HBAudioEncoder encoder, long channelLayout)
+        {
+            return HBFunctions.hb_mixdown_is_supported(mixdown.Id, (uint)encoder.Id, (uint)channelLayout) > 0;
+        }
+
+        /// <summary>
+        /// Determines if DRC can be applied to the given track with the given encoder.
+        /// </summary>
+        /// <param name="trackNumber">
+        /// The track Number.
+        /// </param>
+        /// <param name="encoder">
+        /// The encoder to use for DRC.
+        /// </param>
+        /// <param name="title">
+        /// The title.
+        /// </param>
+        /// <returns>
+        /// True if DRC can be applied to the track with the given encoder.
+        /// </returns>
+        public static bool CanApplyDrc(int trackNumber, HBAudioEncoder encoder, int title)
+        {
+            return HBFunctions.hb_audio_can_apply_drc2(HandBrakeInstanceManager.LastScanHandle, title, trackNumber, encoder.Id) > 0;
+        }
+
+        /// <summary>
+        /// Determines if the given input audio codec can be passed through.
+        /// </summary>
+        /// <param name="codecId">
+        /// The input codec to consider.
+        /// </param>
+        /// <returns>
+        /// True if the codec can be passed through.
+        /// </returns>
+        public static bool CanPassthroughAudio(int codecId)
+        {
+            return (codecId & NativeConstants.HB_ACODEC_PASS_MASK) > 0;
+        }
+
+        /// <summary>
+        /// Sanitizes a mixdown given the output codec and input channel layout.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The desired mixdown.
+        /// </param>
+        /// <param name="encoder">
+        /// The output encoder to be used.
+        /// </param>
+        /// <param name="layout">
+        /// The input channel layout.
+        /// </param>
+        /// <returns>
+        /// A sanitized mixdown value.
+        /// </returns>
+        public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, ulong layout)
+        {
+            if (mixdown == null)
+            {
+                return null;
+            }
+
+            int sanitizedMixdown = HBFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
+            if (sanitizedMixdown != -1)
+            {
+                return Mixdowns.Single(m => m.Id == sanitizedMixdown);
+            }
+            return Mixdowns.FirstOrDefault(); // "none"
+        }
+
+        /// <summary>
+        /// Gets the default mixdown for the given audio encoder and channel layout.
+        /// </summary>
+        /// <param name="encoder">
+        /// The output codec to be used.
+        /// </param>
+        /// <param name="layout">
+        /// The input channel layout.
+        /// </param>
+        /// <returns>
+        /// The default mixdown for the given codec and channel layout.
+        /// </returns>
+        public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, ulong layout)
+        {
+            int defaultMixdown = HBFunctions.hb_mixdown_get_default((uint)encoder.Id, layout);
+            return Mixdowns.Single(m => m.Id == defaultMixdown);
+        }
+
+		/// <summary>
+		/// Sanitizes the given sample rate for the given encoder.
+		/// </summary>
+		/// <param name="encoder">The encoder.</param>
+		/// <param name="sampleRate">The sample rate to sanitize.</param>
+		/// <returns>The sanitized sample rate.</returns>
+	    public static int SanitizeSampleRate(HBAudioEncoder encoder, int sampleRate)
+	    {
+		    return HBFunctions.hb_audio_samplerate_find_closest(sampleRate, (uint)encoder.Id);
+	    }
+
+        /// <summary>
+        /// Gets the bitrate limits for the given audio codec, sample rate and mixdown.
+        /// </summary>
+        /// <param name="encoder">
+        /// The audio encoder used.
+        /// </param>
+        /// <param name="sampleRate">
+        /// The sample rate used (Hz).
+        /// </param>
+        /// <param name="mixdown">
+        /// The mixdown used.
+        /// </param>
+        /// <returns>
+        /// Limits on the audio bitrate for the given settings.
+        /// </returns>
+        public static BitrateLimits GetBitrateLimits(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+        {
+            int low = 0;
+            int high = 0;
+
+            HBFunctions.hb_audio_bitrate_get_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
+
+            return new BitrateLimits(low, high);
+        }
+
+        /// <summary>
+        /// Gets the video quality limits for the given video codec.
+        /// </summary>
+        /// <param name="encoder">
+        /// The video encoder to check.
+        /// </param>
+        /// <returns>
+        /// Limits on the video quality for the encoder.
+        /// </returns>
+        public static VideoQualityLimits GetVideoQualityLimits(HBVideoEncoder encoder)
+        {
+            float low = 0;
+            float high = 0;
+            float granularity = 0;
+            int direction = 0;
+
+            HBFunctions.hb_video_quality_get_limits((uint)encoder.Id, ref low, ref high, ref granularity, ref direction);
+
+            return new VideoQualityLimits(low, high, granularity, direction == 0);
+        }
+
+        /// <summary>
+        /// Sanitizes an audio bitrate given the output codec, sample rate and mixdown.
+        /// </summary>
+        /// <param name="audioBitrate">
+        /// The desired audio bitrate.
+        /// </param>
+        /// <param name="encoder">
+        /// The output encoder to be used.
+        /// </param>
+        /// <param name="sampleRate">
+        /// The output sample rate to be used.
+        /// </param>
+        /// <param name="mixdown">
+        /// The mixdown to be used.
+        /// </param>
+        /// <returns>
+        /// A sanitized audio bitrate.
+        /// </returns>
+        public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+        {
+            return HBFunctions.hb_audio_bitrate_get_best((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
+        }
+
+        /// <summary>
+        /// Gets the default audio bitrate for the given parameters.
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder to use.
+        /// </param>
+        /// <param name="sampleRate">
+        /// The sample rate to use.
+        /// </param>
+        /// <param name="mixdown">
+        /// The mixdown to use.
+        /// </param>
+        /// <returns>
+        /// The default bitrate for these parameters.
+        /// </returns>
+        public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
+        {
+            return HBFunctions.hb_audio_bitrate_get_default((uint)encoder.Id, sampleRate, mixdown.Id);
+        }
+
+        /// <summary>
+        /// Gets limits on audio quality for a given encoder.
+        /// </summary>
+        /// <param name="encoderId">
+        /// The audio encoder ID.
+        /// </param>
+        /// <returns>
+        /// Limits on the audio quality for the given encoder.
+        /// </returns>
+        public static RangeLimits GetAudioQualityLimits(int encoderId)
+        {
+            float low = 0, high = 0, granularity = 0;
+            int direction = 0;
+            HBFunctions.hb_audio_quality_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+
+            return new RangeLimits(direction == 0, granularity, high, low);
+        }
+
+        /// <summary>
+        /// Gets limits on audio compression for a given encoder.
+        /// </summary>
+        /// <param name="encoderId">
+        /// The audio encoder ID.
+        /// </param>
+        /// <returns>
+        /// Limits on the audio compression for the given encoder.
+        /// </returns>
+        public static RangeLimits GetAudioCompressionLimits(int encoderId)
+        {
+            float low = 0, high = 0, granularity = 0;
+            int direction = 0;
+            HBFunctions.hb_audio_compression_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+
+            return new RangeLimits(direction == 0, granularity, high, low);
+        }
+
+        /// <summary>
+        /// The get default quality.
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder.
+        /// </param>
+        /// <returns>
+        /// The <see cref="double"/>.
+        /// </returns>
+        public static double GetDefaultQuality(HBAudioEncoder encoder)
+        {
+           return HBFunctions.hb_audio_quality_get_default((uint)encoder.Id);
+        }
+
+        /// <summary>
+        /// The get default audio compression.
+        /// </summary>
+        /// <param name="encoder">
+        /// The encoder.
+        /// </param>
+        /// <returns>
+        /// The <see cref="double"/>.
+        /// </returns>
+        public static double GetDefaultAudioCompression(HBAudioEncoder encoder)
+        {
+            return HBFunctions.hb_audio_compression_get_default((uint)encoder.Id);
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeFilterHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
index 0db9f4f37..e8d7f5f31 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeFilterHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
@@ -7,17 +7,17 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop
+namespace HandBrake.Interop.Interop
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Runtime.InteropServices;
 
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Json.Filters;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Json.Filters;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using Newtonsoft.Json;
 
@@ -33,7 +33,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// The filter.
         /// </param>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{T}"/>.
         /// </returns>
         public static List<HBPresetTune> GetFilterPresets(int filter)
         {
@@ -51,7 +51,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// The filter.
         /// </param>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{T}"/>.
         /// </returns>
         public static List<HBPresetTune> GetFilterTunes(int filter)
         {
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
index 7fe52a899..9f5420d3f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
@@ -1,552 +1,552 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   A wrapper for a HandBrake instance.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Runtime.ExceptionServices;
-    using System.Runtime.InteropServices;
-    using System.Timers;
-
-    using HandBrake.ApplicationServices.Interop.EventArgs;
-    using HandBrake.ApplicationServices.Interop.Factories;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Interfaces;
-    using HandBrake.ApplicationServices.Interop.Json.Encode;
-    using HandBrake.ApplicationServices.Interop.Json.Scan;
-    using HandBrake.ApplicationServices.Interop.Json.State;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Interop.Model.Preview;
-
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// A wrapper for a HandBrake instance.
-    /// </summary>
-    public class HandBrakeInstance : IHandBrakeInstance, IDisposable
-    {
-        /// <summary>
-        /// The number of MS between status polls when scanning.
-        /// </summary>
-        private const double ScanPollIntervalMs = 250;
-
-        /// <summary>
-        /// The number of MS between status polls when encoding.
-        /// </summary>
-        private const double EncodePollIntervalMs = 250;
-
-        /// <summary>
-        /// The native handle to the HandBrake instance.
-        /// </summary>
-        private IntPtr hbHandle;
-
-        /// <summary>
-        /// The number of previews created during scan.
-        /// </summary>
-        private int previewCount;
-
-        /// <summary>
-        /// The timer to poll for scan status.
-        /// </summary>
-        private Timer scanPollTimer;
-
-        /// <summary>
-        /// The timer to poll for encode status.
-        /// </summary>
-        private Timer encodePollTimer;
-
-        /// <summary>
-        /// The list of titles on this instance.
-        /// </summary>
-        private JsonScanObject titles;
-
-        /// <summary>
-        /// The raw JSON for the titles list.
-        /// </summary>
-        private string titlesJson;
-
-        /// <summary>
-        /// The index of the default title.
-        /// </summary>
-        private int featureTitle;
-
-        /// <summary>
-        /// A value indicating whether this object has been disposed or not.
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Finalizes an instance of the HandBrakeInstance class.
-        /// </summary>
-        ~HandBrakeInstance()
-        {
-            this.Dispose(false);
-        }
-
-        /// <summary>
-        /// Fires for progress updates when scanning.
-        /// </summary>
-        public event EventHandler<ScanProgressEventArgs> ScanProgress;
-
-        /// <summary>
-        /// Fires when a scan has completed.
-        /// </summary>
-        public event EventHandler<System.EventArgs> ScanCompleted;
-
-        /// <summary>
-        /// Fires for progress updates when encoding.
-        /// </summary>
-        public event EventHandler<EncodeProgressEventArgs> EncodeProgress;
-
-        /// <summary>
-        /// Fires when an encode has completed.
-        /// </summary>
-        public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
-
-        /// <summary>
-        /// Gets the handle.
-        /// </summary>
-        internal IntPtr Handle
-        {
-            get
-            {
-                return this.hbHandle;
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of previews created during scan.
-        /// </summary>
-        public int PreviewCount
-        {
-            get
-            {
-                return this.previewCount;
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of titles on this instance.
-        /// </summary>
-        public JsonScanObject Titles
-        {
-            get
-            {
-                return this.titles;
-            }
-        }
-
-        /// <summary>
-        /// Gets the raw JSON for the list of titles on this instance.
-        /// </summary>
-        public string TitlesJson
-        {
-            get
-            {
-                return this.titlesJson;
-            }
-        }
-
-        /// <summary>
-        /// Gets the index of the default title.
-        /// </summary>
-        public int FeatureTitle
-        {
-            get
-            {
-                return this.featureTitle;
-            }
-        }
-
-        /// <summary>
-        /// Gets the HandBrake version string.
-        /// </summary>
-        public string Version
-        {
-            get
-            {
-                var versionPtr = HBFunctions.hb_get_version(this.hbHandle);
-                return Marshal.PtrToStringAnsi(versionPtr);
-            }
-        }
-
-        /// <summary>
-        /// Gets the HandBrake build number.
-        /// </summary>
-        public int Build
-        {
-            get
-            {
-                return HBFunctions.hb_get_build(this.hbHandle);
-            }
-        }
-
-        /// <summary>
-        /// Initializes this instance.
-        /// </summary>
-        /// <param name="verbosity">
-        /// The code for the logging verbosity to use.
-        /// </param>
-        public void Initialize(int verbosity)
-        {
-            HandBrakeUtils.EnsureGlobalInit();
-
-            HandBrakeUtils.RegisterLogger();
-            this.hbHandle = HBFunctions.hb_init(verbosity, update_check: 0);
-        }
-
-        /// <summary>
-        /// Starts a scan of the given path.
-        /// </summary>
-        /// <param name="path">
-        /// The path of the video to scan.
-        /// </param>
-        /// <param name="previewCount">
-        /// The number of previews to make on each title.
-        /// </param>
-        /// <param name="minDuration">
-        /// The minimum duration of a title to show up on the scan.
-        /// </param>
-        /// <param name="titleIndex">
-        /// The title index to scan (1-based, 0 for all titles).
-        /// </param>
-        public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
-        {
-            this.previewCount = previewCount;
-
-            IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);
-            HBFunctions.hb_scan(this.hbHandle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
-            Marshal.FreeHGlobal(pathPtr);
-
-            this.scanPollTimer = new Timer();
-            this.scanPollTimer.Interval = ScanPollIntervalMs;
-
-            // Lambda notation used to make sure we can view any JIT exceptions the method throws
-            this.scanPollTimer.Elapsed += (o, e) =>
-            {
-                try
-                {
-                    this.PollScanProgress();
-                }
-                catch (Exception exc)
-                {
-                    Debug.WriteLine(exc);
-                    HandBrakeUtils.SendErrorEvent(exc.ToString());
-                }
-            };
-            this.scanPollTimer.Start();
-        }
-
-        /// <summary>
-        /// Stops an ongoing scan.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        public void StopScan()
-        {
-            HBFunctions.hb_scan_stop(this.hbHandle);
-        }
-
-        /// <summary>
-        /// Gets an image for the given job and preview
-        /// </summary>
-        /// <remarks>
-        /// Only incorporates sizing and aspect ratio into preview image.
-        /// </remarks>
-        /// <param name="settings">
-        /// The encode job to preview.
-        /// </param>
-        /// <param name="previewNumber">
-        /// The index of the preview to get (0-based).
-        /// </param>
-        /// <param name="deinterlace">
-        /// True to enable basic deinterlace of preview images.
-        /// </param>
-        /// <returns>
-        /// An image with the requested preview.
-        /// </returns>
-        [HandleProcessCorruptedStateExceptions]
-        public RawPreviewData GetPreview(PreviewSettings settings, int previewNumber, bool deinterlace)
-        {
-            SourceTitle title = this.Titles.TitleList.FirstOrDefault(t => t.Index == settings.TitleNumber);
-
-            // Create the Expected Output Geometry details for libhb.
-            hb_geometry_settings_s uiGeometry = new hb_geometry_settings_s
-            {
-                crop = new[] { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right },
-                itu_par = 0,
-                keep = (int)AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH + (settings.KeepDisplayAspect ? 0x04 : 0), // TODO Keep Width?
-                maxWidth = settings.MaxWidth,
-                maxHeight = settings.MaxHeight,
-                mode = (int)(hb_anamorphic_mode_t)settings.Anamorphic,
-                modulus = settings.Modulus ?? 16,
-                geometry = new hb_geometry_s
-                {
-                    height = settings.Height,
-                    width = settings.Width,
-                    par = settings.Anamorphic != Anamorphic.Custom && settings.Anamorphic != Anamorphic.Automatic
-                        ? new hb_rational_t { den = title.Geometry.PAR.Den, num = title.Geometry.PAR.Num }
-                        : new hb_rational_t { den = settings.PixelAspectY, num = settings.PixelAspectX }
-                }
-            };
-
-            // Fetch the image data from LibHb
-            IntPtr resultingImageStuct = HBFunctions.hb_get_preview2(this.hbHandle, settings.TitleNumber, previewNumber, ref uiGeometry, deinterlace ? 1 : 0);
-            hb_image_s image = InteropUtilities.ToStructureFromPtr<hb_image_s>(resultingImageStuct);
-
-            // Copy the filled image buffer to a managed array.
-            int stride_width = image.plane[0].stride;
-            int stride_height = image.plane[0].height_stride;
-            int imageBufferSize = stride_width * stride_height;  // int imageBufferSize = outputWidth * outputHeight * 4;
-
-            byte[] managedBuffer = new byte[imageBufferSize];
-            Marshal.Copy(image.plane[0].data, managedBuffer, 0, imageBufferSize);
-
-            RawPreviewData preview = new RawPreviewData(managedBuffer, stride_width, stride_height, image.width, image.height);
-
-            // Close the image so we don't leak memory.
-            IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-            Marshal.WriteIntPtr(nativeJobPtrPtr, resultingImageStuct);
-            HBFunctions.hb_image_close(nativeJobPtrPtr);
-            Marshal.FreeHGlobal(nativeJobPtrPtr);
-
-            return preview;
-        }
-
-        /// <summary>
-        /// Determines if DRC can be applied to the given track with the given encoder.
-        /// </summary>
-        /// <param name="trackNumber">The track Number.</param>
-        /// <param name="encoder">The encoder to use for DRC.</param>
-        /// <param name="title">The title.</param>
-        /// <returns>True if DRC can be applied to the track with the given encoder.</returns>
-        public bool CanApplyDrc(int trackNumber, HBAudioEncoder encoder, int title)
-        {
-            return HBFunctions.hb_audio_can_apply_drc2(this.hbHandle, title, trackNumber, encoder.Id) > 0;
-        }
-
-        /// <summary>
-        /// Starts an encode with the given job.
-        /// </summary>
-        /// <param name="encodeObject">
-        /// The encode Object.
-        /// </param>
-        [HandleProcessCorruptedStateExceptions]
-        public void StartEncode(JsonEncodeObject encodeObject)
-        {
-            JsonSerializerSettings settings = new JsonSerializerSettings
-            {
-                NullValueHandling = NullValueHandling.Ignore,
-            };
-
-            string encode = JsonConvert.SerializeObject(encodeObject, Formatting.Indented, settings);
-            this.StartEncode(encode);
-        }
-
-        /// <summary>
-        /// Starts an encode with the given job JSON.
-        /// </summary>
-        /// <param name="encodeJson">The JSON for the job to start.</param>
-        [HandleProcessCorruptedStateExceptions]
-        public void StartEncode(string encodeJson)
-        {
-            HBFunctions.hb_add_json(this.hbHandle, InteropUtilities.ToUtf8PtrFromString(encodeJson));
-            HBFunctions.hb_start(this.hbHandle);
-
-            this.encodePollTimer = new Timer();
-            this.encodePollTimer.Interval = EncodePollIntervalMs;
-
-            this.encodePollTimer.Elapsed += (o, e) =>
-            {
-                try
-                {
-                    this.PollEncodeProgress();
-                }
-                catch (Exception exc)
-                {
-                    Debug.WriteLine(exc);
-                }
-            };
-            this.encodePollTimer.Start();
-        }
-
-        /// <summary>
-        /// Pauses the current encode.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        public void PauseEncode()
-        {
-            HBFunctions.hb_pause(this.hbHandle);
-        }
-
-        /// <summary>
-        /// Resumes a paused encode.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        public void ResumeEncode()
-        {
-            HBFunctions.hb_resume(this.hbHandle);
-        }
-
-        /// <summary>
-        /// Stops the current encode.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        public void StopEncode()
-        {
-            HBFunctions.hb_stop(this.hbHandle);
-
-            // Also remove all jobs from the queue (in case we stopped a 2-pass encode)
-            var currentJobs = new List<IntPtr>();
-
-            int jobs = HBFunctions.hb_count(this.hbHandle);
-            for (int i = 0; i < jobs; i++)
-            {
-                currentJobs.Add(HBFunctions.hb_job(this.hbHandle, 0));
-            }
-
-            foreach (IntPtr job in currentJobs)
-            {
-                HBFunctions.hb_rem(this.hbHandle, job);
-            }
-        }
-
-        /// <summary>
-        /// Frees any resources associated with this object.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.disposed)
-            {
-                return;
-            }
-
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the object is disposed.
-        /// </summary>
-        public bool IsDisposed
-        {
-            get
-            {
-                return this.disposed;
-            }
-        }
-
-        /// <summary>
-        /// Frees any resources associated with this object.
-        /// </summary>
-        /// <param name="disposing">
-        /// True if managed objects as well as unmanaged should be disposed.
-        /// </param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // Free other state (managed objects).
-            }
-
-            // Free unmanaged objects.
-            IntPtr handlePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-            Marshal.WriteIntPtr(handlePtr, this.hbHandle);
-            HBFunctions.hb_close(handlePtr);
-            Marshal.FreeHGlobal(handlePtr);
-
-            this.disposed = true;
-        }
-
-        /// <summary>
-        /// Checks the status of the ongoing scan.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        private void PollScanProgress()
-        {
-            IntPtr json = HBFunctions.hb_get_state_json(this.hbHandle);
-            string statusJson = Marshal.PtrToStringAnsi(json);
-            JsonState state = null;
-            if (!string.IsNullOrEmpty(statusJson))
-            {
-                state = JsonConvert.DeserializeObject<JsonState>(statusJson);
-            }
-
-            TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
-
-            if (taskState != null && (taskState == TaskState.Scanning || taskState == TaskState.Searching))
-            {
-                if (this.ScanProgress != null && state.Scanning != null)
-                {
-                    this.ScanProgress(this, new ScanProgressEventArgs(state.Scanning.Progress, state.Scanning.Preview, state.Scanning.PreviewCount, state.Scanning.Title, state.Scanning.TitleCount));
-                }
-            }
-            else if (taskState != null && taskState == TaskState.ScanDone)
-            {
-                this.scanPollTimer.Stop();
-
-                var jsonMsg = HBFunctions.hb_get_title_set_json(this.hbHandle);
-                this.titlesJson = InteropUtilities.ToStringFromUtf8Ptr(jsonMsg);
-
-                if (!string.IsNullOrEmpty(this.titlesJson))
-                { 
-                    this.titles = JsonConvert.DeserializeObject<JsonScanObject>(this.titlesJson);
-                    if (this.titles != null)
-                    {
-                        this.featureTitle = this.titles.MainFeature;
-                    }
-                }
-
-                if (this.ScanCompleted != null)
-                {
-                    this.ScanCompleted(this, new System.EventArgs());
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks the status of the ongoing encode.
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        private void PollEncodeProgress()
-        {
-            IntPtr json = HBFunctions.hb_get_state_json(this.hbHandle);
-            string statusJson = Marshal.PtrToStringAnsi(json);
-
-            JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
-
-            TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
-
-            if (taskState != null && (taskState == TaskState.Working || taskState == TaskState.Muxing || taskState == TaskState.Searching))
-            {
-                if (this.EncodeProgress != null)
-                {
-                    var progressEventArgs = new EncodeProgressEventArgs(state.Working.Progress, state.Working.Rate, state.Working.RateAvg, new TimeSpan(state.Working.Hours, state.Working.Minutes, state.Working.Seconds),
-                        state.Working.PassID, state.Working.Pass, state.Working.PassCount, taskState.Code);
-
-                    this.EncodeProgress(this, progressEventArgs);
-                }
-            }
-            else if (taskState != null && taskState == TaskState.WorkDone)
-            {
-                this.encodePollTimer.Stop();
-
-                if (this.EncodeCompleted != null)
-                {
-                    this.EncodeCompleted(
-                        this,
-                        new EncodeCompletedEventArgs(state.WorkDone.Error != (int)hb_error_code.HB_ERROR_NONE));
-                }
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A wrapper for a HandBrake instance.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Linq;
+    using System.Runtime.ExceptionServices;
+    using System.Runtime.InteropServices;
+    using System.Timers;
+
+    using HandBrake.Interop.Interop.EventArgs;
+    using HandBrake.Interop.Interop.Factories;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Interfaces;
+    using HandBrake.Interop.Interop.Json.Encode;
+    using HandBrake.Interop.Interop.Json.Scan;
+    using HandBrake.Interop.Interop.Json.State;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Preview;
+
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// A wrapper for a HandBrake instance.
+    /// </summary>
+    public class HandBrakeInstance : IHandBrakeInstance, IDisposable
+    {
+        /// <summary>
+        /// The number of MS between status polls when scanning.
+        /// </summary>
+        private const double ScanPollIntervalMs = 250;
+
+        /// <summary>
+        /// The number of MS between status polls when encoding.
+        /// </summary>
+        private const double EncodePollIntervalMs = 250;
+
+        /// <summary>
+        /// The native handle to the HandBrake instance.
+        /// </summary>
+        private IntPtr hbHandle;
+
+        /// <summary>
+        /// The number of previews created during scan.
+        /// </summary>
+        private int previewCount;
+
+        /// <summary>
+        /// The timer to poll for scan status.
+        /// </summary>
+        private Timer scanPollTimer;
+
+        /// <summary>
+        /// The timer to poll for encode status.
+        /// </summary>
+        private Timer encodePollTimer;
+
+        /// <summary>
+        /// The list of titles on this instance.
+        /// </summary>
+        private JsonScanObject titles;
+
+        /// <summary>
+        /// The raw JSON for the titles list.
+        /// </summary>
+        private string titlesJson;
+
+        /// <summary>
+        /// The index of the default title.
+        /// </summary>
+        private int featureTitle;
+
+        /// <summary>
+        /// A value indicating whether this object has been disposed or not.
+        /// </summary>
+        private bool disposed;
+
+        /// <summary>
+        /// Finalizes an instance of the HandBrakeInstance class.
+        /// </summary>
+        ~HandBrakeInstance()
+        {
+            this.Dispose(false);
+        }
+
+        /// <summary>
+        /// Fires for progress updates when scanning.
+        /// </summary>
+        public event EventHandler<ScanProgressEventArgs> ScanProgress;
+
+        /// <summary>
+        /// Fires when a scan has completed.
+        /// </summary>
+        public event EventHandler<System.EventArgs> ScanCompleted;
+
+        /// <summary>
+        /// Fires for progress updates when encoding.
+        /// </summary>
+        public event EventHandler<EncodeProgressEventArgs> EncodeProgress;
+
+        /// <summary>
+        /// Fires when an encode has completed.
+        /// </summary>
+        public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
+
+        /// <summary>
+        /// Gets the handle.
+        /// </summary>
+        internal IntPtr Handle
+        {
+            get
+            {
+                return this.hbHandle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of previews created during scan.
+        /// </summary>
+        public int PreviewCount
+        {
+            get
+            {
+                return this.previewCount;
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of titles on this instance.
+        /// </summary>
+        public JsonScanObject Titles
+        {
+            get
+            {
+                return this.titles;
+            }
+        }
+
+        /// <summary>
+        /// Gets the raw JSON for the list of titles on this instance.
+        /// </summary>
+        public string TitlesJson
+        {
+            get
+            {
+                return this.titlesJson;
+            }
+        }
+
+        /// <summary>
+        /// Gets the index of the default title.
+        /// </summary>
+        public int FeatureTitle
+        {
+            get
+            {
+                return this.featureTitle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the HandBrake version string.
+        /// </summary>
+        public string Version
+        {
+            get
+            {
+                var versionPtr = HBFunctions.hb_get_version(this.hbHandle);
+                return Marshal.PtrToStringAnsi(versionPtr);
+            }
+        }
+
+        /// <summary>
+        /// Gets the HandBrake build number.
+        /// </summary>
+        public int Build
+        {
+            get
+            {
+                return HBFunctions.hb_get_build(this.hbHandle);
+            }
+        }
+
+        /// <summary>
+        /// Initializes this instance.
+        /// </summary>
+        /// <param name="verbosity">
+        /// The code for the logging verbosity to use.
+        /// </param>
+        public void Initialize(int verbosity)
+        {
+            HandBrakeUtils.EnsureGlobalInit();
+
+            HandBrakeUtils.RegisterLogger();
+            this.hbHandle = HBFunctions.hb_init(verbosity, update_check: 0);
+        }
+
+        /// <summary>
+        /// Starts a scan of the given path.
+        /// </summary>
+        /// <param name="path">
+        /// The path of the video to scan.
+        /// </param>
+        /// <param name="previewCount">
+        /// The number of previews to make on each title.
+        /// </param>
+        /// <param name="minDuration">
+        /// The minimum duration of a title to show up on the scan.
+        /// </param>
+        /// <param name="titleIndex">
+        /// The title index to scan (1-based, 0 for all titles).
+        /// </param>
+        public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
+        {
+            this.previewCount = previewCount;
+
+            IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);
+            HBFunctions.hb_scan(this.hbHandle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
+            Marshal.FreeHGlobal(pathPtr);
+
+            this.scanPollTimer = new Timer();
+            this.scanPollTimer.Interval = ScanPollIntervalMs;
+
+            // Lambda notation used to make sure we can view any JIT exceptions the method throws
+            this.scanPollTimer.Elapsed += (o, e) =>
+            {
+                try
+                {
+                    this.PollScanProgress();
+                }
+                catch (Exception exc)
+                {
+                    Debug.WriteLine(exc);
+                    HandBrakeUtils.SendErrorEvent(exc.ToString());
+                }
+            };
+            this.scanPollTimer.Start();
+        }
+
+        /// <summary>
+        /// Stops an ongoing scan.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        public void StopScan()
+        {
+            HBFunctions.hb_scan_stop(this.hbHandle);
+        }
+
+        /// <summary>
+        /// Gets an image for the given job and preview
+        /// </summary>
+        /// <remarks>
+        /// Only incorporates sizing and aspect ratio into preview image.
+        /// </remarks>
+        /// <param name="settings">
+        /// The encode job to preview.
+        /// </param>
+        /// <param name="previewNumber">
+        /// The index of the preview to get (0-based).
+        /// </param>
+        /// <param name="deinterlace">
+        /// True to enable basic deinterlace of preview images.
+        /// </param>
+        /// <returns>
+        /// An image with the requested preview.
+        /// </returns>
+        [HandleProcessCorruptedStateExceptions]
+        public RawPreviewData GetPreview(PreviewSettings settings, int previewNumber, bool deinterlace)
+        {
+            SourceTitle title = this.Titles.TitleList.FirstOrDefault(t => t.Index == settings.TitleNumber);
+
+            // Create the Expected Output Geometry details for libhb.
+            hb_geometry_settings_s uiGeometry = new hb_geometry_settings_s
+            {
+                crop = new[] { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right },
+                itu_par = 0,
+                keep = (int)AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH + (settings.KeepDisplayAspect ? 0x04 : 0), // TODO Keep Width?
+                maxWidth = settings.MaxWidth,
+                maxHeight = settings.MaxHeight,
+                mode = (int)(hb_anamorphic_mode_t)settings.Anamorphic,
+                modulus = settings.Modulus ?? 16,
+                geometry = new hb_geometry_s
+                {
+                    height = settings.Height,
+                    width = settings.Width,
+                    par = settings.Anamorphic != Anamorphic.Custom && settings.Anamorphic != Anamorphic.Automatic
+                        ? new hb_rational_t { den = title.Geometry.PAR.Den, num = title.Geometry.PAR.Num }
+                        : new hb_rational_t { den = settings.PixelAspectY, num = settings.PixelAspectX }
+                }
+            };
+
+            // Fetch the image data from LibHb
+            IntPtr resultingImageStuct = HBFunctions.hb_get_preview2(this.hbHandle, settings.TitleNumber, previewNumber, ref uiGeometry, deinterlace ? 1 : 0);
+            hb_image_s image = InteropUtilities.ToStructureFromPtr<hb_image_s>(resultingImageStuct);
+
+            // Copy the filled image buffer to a managed array.
+            int stride_width = image.plane[0].stride;
+            int stride_height = image.plane[0].height_stride;
+            int imageBufferSize = stride_width * stride_height;  // int imageBufferSize = outputWidth * outputHeight * 4;
+
+            byte[] managedBuffer = new byte[imageBufferSize];
+            Marshal.Copy(image.plane[0].data, managedBuffer, 0, imageBufferSize);
+
+            RawPreviewData preview = new RawPreviewData(managedBuffer, stride_width, stride_height, image.width, image.height);
+
+            // Close the image so we don't leak memory.
+            IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+            Marshal.WriteIntPtr(nativeJobPtrPtr, resultingImageStuct);
+            HBFunctions.hb_image_close(nativeJobPtrPtr);
+            Marshal.FreeHGlobal(nativeJobPtrPtr);
+
+            return preview;
+        }
+
+        /// <summary>
+        /// Determines if DRC can be applied to the given track with the given encoder.
+        /// </summary>
+        /// <param name="trackNumber">The track Number.</param>
+        /// <param name="encoder">The encoder to use for DRC.</param>
+        /// <param name="title">The title.</param>
+        /// <returns>True if DRC can be applied to the track with the given encoder.</returns>
+        public bool CanApplyDrc(int trackNumber, HBAudioEncoder encoder, int title)
+        {
+            return HBFunctions.hb_audio_can_apply_drc2(this.hbHandle, title, trackNumber, encoder.Id) > 0;
+        }
+
+        /// <summary>
+        /// Starts an encode with the given job.
+        /// </summary>
+        /// <param name="encodeObject">
+        /// The encode Object.
+        /// </param>
+        [HandleProcessCorruptedStateExceptions]
+        public void StartEncode(JsonEncodeObject encodeObject)
+        {
+            JsonSerializerSettings settings = new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore,
+            };
+
+            string encode = JsonConvert.SerializeObject(encodeObject, Formatting.Indented, settings);
+            this.StartEncode(encode);
+        }
+
+        /// <summary>
+        /// Starts an encode with the given job JSON.
+        /// </summary>
+        /// <param name="encodeJson">The JSON for the job to start.</param>
+        [HandleProcessCorruptedStateExceptions]
+        public void StartEncode(string encodeJson)
+        {
+            HBFunctions.hb_add_json(this.hbHandle, InteropUtilities.ToUtf8PtrFromString(encodeJson));
+            HBFunctions.hb_start(this.hbHandle);
+
+            this.encodePollTimer = new Timer();
+            this.encodePollTimer.Interval = EncodePollIntervalMs;
+
+            this.encodePollTimer.Elapsed += (o, e) =>
+            {
+                try
+                {
+                    this.PollEncodeProgress();
+                }
+                catch (Exception exc)
+                {
+                    Debug.WriteLine(exc);
+                }
+            };
+            this.encodePollTimer.Start();
+        }
+
+        /// <summary>
+        /// Pauses the current encode.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        public void PauseEncode()
+        {
+            HBFunctions.hb_pause(this.hbHandle);
+        }
+
+        /// <summary>
+        /// Resumes a paused encode.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        public void ResumeEncode()
+        {
+            HBFunctions.hb_resume(this.hbHandle);
+        }
+
+        /// <summary>
+        /// Stops the current encode.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        public void StopEncode()
+        {
+            HBFunctions.hb_stop(this.hbHandle);
+
+            // Also remove all jobs from the queue (in case we stopped a 2-pass encode)
+            var currentJobs = new List<IntPtr>();
+
+            int jobs = HBFunctions.hb_count(this.hbHandle);
+            for (int i = 0; i < jobs; i++)
+            {
+                currentJobs.Add(HBFunctions.hb_job(this.hbHandle, 0));
+            }
+
+            foreach (IntPtr job in currentJobs)
+            {
+                HBFunctions.hb_rem(this.hbHandle, job);
+            }
+        }
+
+        /// <summary>
+        /// Frees any resources associated with this object.
+        /// </summary>
+        public void Dispose()
+        {
+            if (this.disposed)
+            {
+                return;
+            }
+
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the object is disposed.
+        /// </summary>
+        public bool IsDisposed
+        {
+            get
+            {
+                return this.disposed;
+            }
+        }
+
+        /// <summary>
+        /// Frees any resources associated with this object.
+        /// </summary>
+        /// <param name="disposing">
+        /// True if managed objects as well as unmanaged should be disposed.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                // Free other state (managed objects).
+            }
+
+            // Free unmanaged objects.
+            IntPtr handlePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+            Marshal.WriteIntPtr(handlePtr, this.hbHandle);
+            HBFunctions.hb_close(handlePtr);
+            Marshal.FreeHGlobal(handlePtr);
+
+            this.disposed = true;
+        }
+
+        /// <summary>
+        /// Checks the status of the ongoing scan.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        private void PollScanProgress()
+        {
+            IntPtr json = HBFunctions.hb_get_state_json(this.hbHandle);
+            string statusJson = Marshal.PtrToStringAnsi(json);
+            JsonState state = null;
+            if (!string.IsNullOrEmpty(statusJson))
+            {
+                state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+            }
+
+            TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
+
+            if (taskState != null && (taskState == TaskState.Scanning || taskState == TaskState.Searching))
+            {
+                if (this.ScanProgress != null && state.Scanning != null)
+                {
+                    this.ScanProgress(this, new ScanProgressEventArgs(state.Scanning.Progress, state.Scanning.Preview, state.Scanning.PreviewCount, state.Scanning.Title, state.Scanning.TitleCount));
+                }
+            }
+            else if (taskState != null && taskState == TaskState.ScanDone)
+            {
+                this.scanPollTimer.Stop();
+
+                var jsonMsg = HBFunctions.hb_get_title_set_json(this.hbHandle);
+                this.titlesJson = InteropUtilities.ToStringFromUtf8Ptr(jsonMsg);
+
+                if (!string.IsNullOrEmpty(this.titlesJson))
+                { 
+                    this.titles = JsonConvert.DeserializeObject<JsonScanObject>(this.titlesJson);
+                    if (this.titles != null)
+                    {
+                        this.featureTitle = this.titles.MainFeature;
+                    }
+                }
+
+                if (this.ScanCompleted != null)
+                {
+                    this.ScanCompleted(this, new System.EventArgs());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Checks the status of the ongoing encode.
+        /// </summary>
+        [HandleProcessCorruptedStateExceptions]
+        private void PollEncodeProgress()
+        {
+            IntPtr json = HBFunctions.hb_get_state_json(this.hbHandle);
+            string statusJson = Marshal.PtrToStringAnsi(json);
+
+            JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+
+            TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
+
+            if (taskState != null && (taskState == TaskState.Working || taskState == TaskState.Muxing || taskState == TaskState.Searching))
+            {
+                if (this.EncodeProgress != null)
+                {
+                    var progressEventArgs = new EncodeProgressEventArgs(state.Working.Progress, state.Working.Rate, state.Working.RateAvg, new TimeSpan(state.Working.Hours, state.Working.Minutes, state.Working.Seconds),
+                        state.Working.PassID, state.Working.Pass, state.Working.PassCount, taskState.Code);
+
+                    this.EncodeProgress(this, progressEventArgs);
+                }
+            }
+            else if (taskState != null && taskState == TaskState.WorkDone)
+            {
+                this.encodePollTimer.Stop();
+
+                if (this.EncodeCompleted != null)
+                {
+                    this.EncodeCompleted(
+                        this,
+                        new EncodeCompletedEventArgs(state.WorkDone.Error != (int)hb_error_code.HB_ERROR_NONE));
+                }
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeInstanceManager.cs
index 5ceb70bdc..07ddb8a15 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeInstanceManager.cs
@@ -1,171 +1,171 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeInstanceManager.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hand brake instance manager.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System;
-
-    using HandBrake.ApplicationServices.Interop.Interfaces;
-
-    /// <summary>
-    /// The HandBrake Instance manager.
-    /// Only supports scanning right now.
-    /// </summary>
-    public static class HandBrakeInstanceManager
-    {
-        private static HandBrakeInstance scanInstance;
-        private static HandBrakeInstance encodeInstance;
-        private static HandBrakeInstance previewInstance;
-        private static HandBrakeInstance masterInstance;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="HandBrakeInstanceManager"/> class.
-        /// </summary>
-        static HandBrakeInstanceManager()
-        {
-            masterInstance = new HandBrakeInstance();
-            masterInstance.Initialize(2);
-        }
-
-        /// <summary>
-        /// The init.
-        /// </summary>
-        public static void Init()
-        {
-            // Nothing to do. Triggers static constructor.
-        }
-
-        /// <summary>
-        /// Gets the scanInstance.
-        /// </summary>
-        /// <param name="verbosity">
-        /// The verbosity.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IHandBrakeInstance"/>.
-        /// </returns>
-        public static IHandBrakeInstance GetScanInstance(int verbosity)
-        {
-            if (scanInstance != null)
-            {
-                scanInstance.Dispose();
-                scanInstance = null;
-            }
-
-            HandBrakeInstance newInstance = new HandBrakeInstance();
-            newInstance.Initialize(verbosity);
-            scanInstance = newInstance;
-
-            return scanInstance;
-        }
-
-        /// <summary>
-        /// The get encode instance.
-        /// </summary>
-        /// <param name="verbosity">
-        /// The verbosity.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IHandBrakeInstance"/>.
-        /// </returns>
-        public static IHandBrakeInstance GetEncodeInstance(int verbosity)
-        {
-            if (encodeInstance != null)
-            {
-                encodeInstance.Dispose();
-                encodeInstance = null;
-            }
-
-            HandBrakeInstance newInstance = new HandBrakeInstance();
-            newInstance.Initialize(verbosity);
-            encodeInstance = newInstance;
-
-            return encodeInstance;
-        }
-
-        /// <summary>
-        /// The get encode instance.
-        /// </summary>
-        /// <param name="verbosity">
-        /// The verbosity.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IHandBrakeInstance"/>.
-        /// </returns>
-        public static IHandBrakeInstance GetPreviewInstance(int verbosity)
-        {
-            if (previewInstance != null)
-            {
-                previewInstance.Dispose();
-                previewInstance = null;
-            }
-
-            HandBrakeInstance newInstance = new HandBrakeInstance();
-            newInstance.Initialize(verbosity);
-            previewInstance = newInstance;
-
-            return previewInstance;
-        }
-
-        /// <summary>
-        /// Gets the master instance.
-        /// </summary>
-        internal static IHandBrakeInstance MasterInstance
-        {
-            get
-            {
-                return masterInstance;
-            }
-        }
-
-        /// <summary>
-        /// Gets the last scan scan instance.
-        /// </summary>
-        internal static IHandBrakeInstance LastScanScanInstance
-        {
-            get
-            {
-                return scanInstance;
-            }
-        }
-
-        /// <summary>
-        /// Gets the handle.
-        /// </summary>
-        internal static IntPtr LastScanHandle 
-        {
-            get
-            {
-                return scanInstance.Handle;
-            }
-        }
-
-        /// <summary>
-        /// Gets the last encode scan instance.
-        /// </summary>
-        internal static IHandBrakeInstance LastEncodeScanInstance
-        {
-            get
-            {
-                return encodeInstance;
-            }
-        }
-
-        /// <summary>
-        /// Gets the encode handle.
-        /// </summary>
-        internal static IntPtr LastEncodeHandle
-        {
-            get
-            {
-                return encodeInstance.Handle;
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeInstanceManager.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hand brake instance manager.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System;
+
+    using HandBrake.Interop.Interop.Interfaces;
+
+    /// <summary>
+    /// The HandBrake Instance manager.
+    /// Only supports scanning right now.
+    /// </summary>
+    public static class HandBrakeInstanceManager
+    {
+        private static HandBrakeInstance scanInstance;
+        private static HandBrakeInstance encodeInstance;
+        private static HandBrakeInstance previewInstance;
+        private static HandBrakeInstance masterInstance;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="HandBrakeInstanceManager"/> class.
+        /// </summary>
+        static HandBrakeInstanceManager()
+        {
+            masterInstance = new HandBrakeInstance();
+            masterInstance.Initialize(2);
+        }
+
+        /// <summary>
+        /// The init.
+        /// </summary>
+        public static void Init()
+        {
+            // Nothing to do. Triggers static constructor.
+        }
+
+        /// <summary>
+        /// Gets the scanInstance.
+        /// </summary>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IHandBrakeInstance"/>.
+        /// </returns>
+        public static IHandBrakeInstance GetScanInstance(int verbosity)
+        {
+            if (scanInstance != null)
+            {
+                scanInstance.Dispose();
+                scanInstance = null;
+            }
+
+            HandBrakeInstance newInstance = new HandBrakeInstance();
+            newInstance.Initialize(verbosity);
+            scanInstance = newInstance;
+
+            return scanInstance;
+        }
+
+        /// <summary>
+        /// The get encode instance.
+        /// </summary>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IHandBrakeInstance"/>.
+        /// </returns>
+        public static IHandBrakeInstance GetEncodeInstance(int verbosity)
+        {
+            if (encodeInstance != null)
+            {
+                encodeInstance.Dispose();
+                encodeInstance = null;
+            }
+
+            HandBrakeInstance newInstance = new HandBrakeInstance();
+            newInstance.Initialize(verbosity);
+            encodeInstance = newInstance;
+
+            return encodeInstance;
+        }
+
+        /// <summary>
+        /// The get encode instance.
+        /// </summary>
+        /// <param name="verbosity">
+        /// The verbosity.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IHandBrakeInstance"/>.
+        /// </returns>
+        public static IHandBrakeInstance GetPreviewInstance(int verbosity)
+        {
+            if (previewInstance != null)
+            {
+                previewInstance.Dispose();
+                previewInstance = null;
+            }
+
+            HandBrakeInstance newInstance = new HandBrakeInstance();
+            newInstance.Initialize(verbosity);
+            previewInstance = newInstance;
+
+            return previewInstance;
+        }
+
+        /// <summary>
+        /// Gets the master instance.
+        /// </summary>
+        internal static IHandBrakeInstance MasterInstance
+        {
+            get
+            {
+                return masterInstance;
+            }
+        }
+
+        /// <summary>
+        /// Gets the last scan scan instance.
+        /// </summary>
+        internal static IHandBrakeInstance LastScanScanInstance
+        {
+            get
+            {
+                return scanInstance;
+            }
+        }
+
+        /// <summary>
+        /// Gets the handle.
+        /// </summary>
+        internal static IntPtr LastScanHandle 
+        {
+            get
+            {
+                return scanInstance.Handle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the last encode scan instance.
+        /// </summary>
+        internal static IHandBrakeInstance LastEncodeScanInstance
+        {
+            get
+            {
+                return encodeInstance;
+            }
+        }
+
+        /// <summary>
+        /// Gets the encode handle.
+        /// </summary>
+        internal static IntPtr LastEncodeHandle
+        {
+            get
+            {
+                return encodeInstance.Handle;
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeLanguagesHelper.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
index 343280031..36b7a19e1 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeLanguagesHelper.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
@@ -1,52 +1,52 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeLanguagesHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Contains utilities for converting language codes.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System.Collections.Generic;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Model;
-
-    /// <summary>
-    /// Contains utilities for converting language codes.
-    /// </summary>
-    public static class HandBrakeLanguagesHelper
-    {
-        /// <summary>
-        /// The list of all languages.
-        /// </summary>
-        private static IList<Language> allLanguages; 
-
-        /// <summary>
-        /// Gets a list of all languages.
-        /// </summary>
-        public static IList<Language> AllLanguages
-        {
-            get
-            {
-                return allLanguages
-                       ?? (allLanguages =
-                           InteropUtilities.ToListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, HandBrakeUnitConversionHelpers.NativeToLanguage));
-            }
-        }
-
-        /// <summary>
-        /// Gets the language object for the given code.
-        /// </summary>
-        /// <param name="code">The ISO-639-2 code for the language.</param>
-        /// <returns>Object that describes the language.</returns>
-        public static Language Get(string code)
-        {
-            iso639_lang_t language = InteropUtilities.ToStructureFromPtr<iso639_lang_t>(HBFunctions.lang_for_code2(code));
-            return HandBrakeUnitConversionHelpers.NativeToLanguage(language);
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeLanguagesHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Contains utilities for converting language codes.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System.Collections.Generic;
+
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Model;
+
+    /// <summary>
+    /// Contains utilities for converting language codes.
+    /// </summary>
+    public static class HandBrakeLanguagesHelper
+    {
+        /// <summary>
+        /// The list of all languages.
+        /// </summary>
+        private static IList<Language> allLanguages; 
+
+        /// <summary>
+        /// Gets a list of all languages.
+        /// </summary>
+        public static IList<Language> AllLanguages
+        {
+            get
+            {
+                return allLanguages
+                       ?? (allLanguages =
+                           InteropUtilities.ToListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, HandBrakeUnitConversionHelpers.NativeToLanguage));
+            }
+        }
+
+        /// <summary>
+        /// Gets the language object for the given code.
+        /// </summary>
+        /// <param name="code">The ISO-639-2 code for the language.</param>
+        /// <returns>Object that describes the language.</returns>
+        public static Language Get(string code)
+        {
+            iso639_lang_t language = InteropUtilities.ToStructureFromPtr<iso639_lang_t>(HBFunctions.lang_for_code2(code));
+            return HandBrakeUnitConversionHelpers.NativeToLanguage(language);
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
index e3667a966..a51a44fd1 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
@@ -1,92 +1,92 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakePresetService.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hand brake preset service.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Runtime.InteropServices;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Json.Presets;
-
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// The hand brake preset service.
-    /// </summary>
-    public class HandBrakePresetService
-    {
-        /// <summary>
-        /// The get built in presets.
-        /// Requires an hb_init to have been invoked.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public static IList<PresetCategory> GetBuiltInPresets()
-        {
-            IntPtr presets = HBFunctions.hb_presets_builtin_get_json();
-            string presetJson = Marshal.PtrToStringAnsi(presets);
-            IList<PresetCategory> presetList = JsonConvert.DeserializeObject<IList<PresetCategory>>(presetJson);
-
-            return presetList;
-        }
-
-        /// <summary>
-        /// The get preset from file.
-        /// </summary>
-        /// <param name="filename">
-        /// The filename.
-        /// </param>
-        /// <returns>
-        /// The <see cref="PresetCategory"/>.
-        /// </returns>
-        public static PresetTransportContainer GetPresetFromFile(string filename)
-        {
-            IntPtr presetStringPointer = HBFunctions.hb_presets_read_file_json(InteropUtilities.ToUtf8PtrFromString(filename));
-            string presetJson = Marshal.PtrToStringAnsi(presetStringPointer);
-
-            if (!string.IsNullOrEmpty(presetJson))
-            {
-                // Check to see if we have a list of presets.
-                if (presetJson.StartsWith("["))
-                {
-                    presetJson = "{ \"PresetList\":" + presetJson + " } ";
-                }
-
-                PresetTransportContainer preset = JsonConvert.DeserializeObject<PresetTransportContainer>(presetJson);
-
-                return preset;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// The export preset.
-        /// </summary>
-        /// <param name="filename">
-        /// The filename.
-        /// </param>
-        /// <param name="container">
-        /// The container.
-        /// </param>
-        public static void ExportPreset(string filename, PresetTransportContainer container)
-        {
-            string preset = JsonConvert.SerializeObject(container, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-            using (StreamWriter writer = new StreamWriter(filename))
-            {
-                writer.Write(preset);
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakePresetService.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hand brake preset service.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Runtime.InteropServices;
+
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Json.Presets;
+
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// The hand brake preset service.
+    /// </summary>
+    public class HandBrakePresetService
+    {
+        /// <summary>
+        /// The get built in presets.
+        /// Requires an hb_init to have been invoked.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static IList<PresetCategory> GetBuiltInPresets()
+        {
+            IntPtr presets = HBFunctions.hb_presets_builtin_get_json();
+            string presetJson = Marshal.PtrToStringAnsi(presets);
+            IList<PresetCategory> presetList = JsonConvert.DeserializeObject<IList<PresetCategory>>(presetJson);
+
+            return presetList;
+        }
+
+        /// <summary>
+        /// The get preset from file.
+        /// </summary>
+        /// <param name="filename">
+        /// The filename.
+        /// </param>
+        /// <returns>
+        /// The <see cref="PresetCategory"/>.
+        /// </returns>
+        public static PresetTransportContainer GetPresetFromFile(string filename)
+        {
+            IntPtr presetStringPointer = HBFunctions.hb_presets_read_file_json(InteropUtilities.ToUtf8PtrFromString(filename));
+            string presetJson = Marshal.PtrToStringAnsi(presetStringPointer);
+
+            if (!string.IsNullOrEmpty(presetJson))
+            {
+                // Check to see if we have a list of presets.
+                if (presetJson.StartsWith("["))
+                {
+                    presetJson = "{ \"PresetList\":" + presetJson + " } ";
+                }
+
+                PresetTransportContainer preset = JsonConvert.DeserializeObject<PresetTransportContainer>(presetJson);
+
+                return preset;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// The export preset.
+        /// </summary>
+        /// <param name="filename">
+        /// The filename.
+        /// </param>
+        /// <param name="container">
+        /// The container.
+        /// </param>
+        public static void ExportPreset(string filename, PresetTransportContainer container)
+        {
+            string preset = JsonConvert.SerializeObject(container, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            using (StreamWriter writer = new StreamWriter(filename))
+            {
+                writer.Write(preset);
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUnitConversionHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
index 5140ddba4..93cc0fc0c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUnitConversionHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
@@ -1,191 +1,191 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeUnitConversionHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the HandrakeUnitConversionHelpers type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-
-    /// <summary>
-    /// Converters for various encoding values.
-    /// </summary>
-    public static class HandBrakeUnitConversionHelpers
-    {
-        /// <summary>
-        /// Video Frame Rates
-        /// </summary>
-        private static readonly Dictionary<double, int> VideoRates;
-
-        /// <summary>
-        /// Initializes static members of the HandBrakeUnitConversionHelpers class.
-        /// </summary>
-        static HandBrakeUnitConversionHelpers()
-        {
-            HandBrakeUtils.EnsureGlobalInit();
-
-            VideoRates = new Dictionary<double, int>();
-            foreach (var framerate in HandBrakeEncoderHelpers.VideoFramerates)
-            {
-                VideoRates.Add(double.Parse(framerate.Name, CultureInfo.InvariantCulture), framerate.Rate);
-            }
-        }
-
-        /// <summary>
-        /// Convert Framerate to Video Rates
-        /// </summary>
-        /// <param name="framerate">
-        /// The framerate.
-        /// </param>
-        /// <returns>
-        /// The vrate if a valid framerate is passed in.
-        /// </returns>
-        /// <exception cref="ArgumentException">
-        /// Thrown when framerate is invalid.
-        /// </exception>
-        public static int FramerateToVrate(double framerate)
-        {
-            if (!VideoRates.ContainsKey(framerate))
-            {
-                throw new ArgumentException("Framerate not recognized.", "framerate");
-            }
-
-            return VideoRates[framerate];
-        }
-
-        /// <summary>
-        /// Converts a native HB encoder structure to an Encoder model.
-        /// </summary>
-        /// <param name="encoder">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted model.
-        /// </returns>
-        internal static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
-        {
-            return new HBVideoEncoder(encoder.muxers, encoder.name, encoder.codec, encoder.short_name);
-        }
-
-        /// <summary>
-        /// Converts a native HB encoder structure to an Encoder model.
-        /// </summary>
-        /// <param name="encoder">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted model.
-        /// </returns>
-        internal static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
-        {
-            var result = new HBAudioEncoder(
-                encoder.muxers,
-                HandBrakeEncoderHelpers.GetAudioCompressionLimits(encoder.codec),
-                HBFunctions.hb_audio_compression_get_default((uint)encoder.codec),
-                HBFunctions.hb_audio_quality_get_default((uint)encoder.codec),
-                encoder.name,
-                encoder.codec,
-                HandBrakeEncoderHelpers.GetAudioQualityLimits(encoder.codec),
-                encoder.short_name);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Converts a native HB rate structure to an HBRate object.
-        /// </summary>
-        /// <param name="rate">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted rate object.
-        /// </returns>
-        internal static HBRate NativeToRate(hb_rate_s rate)
-        {
-            return new HBRate(rate.name, rate.rate);
-        }
-
-        /// <summary>
-        /// Converts a native HB mixdown structure to a Mixdown model.
-        /// </summary>
-        /// <param name="mixdown">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted model.
-        /// </returns>
-        internal static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
-        {
-            return new HBMixdown(mixdown.name, mixdown.amixdown, mixdown.short_name);
-        }
-
-        /// <summary>
-        /// Converts a native HB container structure into an HBContainer object.
-        /// </summary>
-        /// <param name="container">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted structure.
-        /// </returns>
-        internal static HBContainer NativeToContainer(hb_container_s container)
-        {
-            return new HBContainer(container.default_extension, container.name, container.format, container.short_name);
-        }
-
-        /// <summary>
-        /// Converts a native language structure to a Language object.
-        /// </summary>
-        /// <param name="language">
-        /// The structure to convert.
-        /// </param>
-        /// <returns>
-        /// The converted structure.
-        /// </returns>
-        internal static Language NativeToLanguage(iso639_lang_t language)
-        {
-            string englishName = InteropUtilities.ToStringFromUtf8Ptr(language.eng_name);
-            string nativeName = InteropUtilities.ToStringFromUtf8Ptr(language.native_name);
-            return new Language(englishName, nativeName, language.iso639_2);
-        }
-
-        /// <summary>
-        /// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
-        /// </summary>
-        /// <param name="pts">
-        /// The PTS to convert.
-        /// </param>
-        /// <returns>
-        /// The timespan for it.
-        /// </returns>
-        public static TimeSpan PtsToTimeSpan(ulong pts)
-        {
-            return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
-        }
-
-        /// <summary>
-        /// Converts the PTS amount to seconds.
-        /// </summary>
-        /// <param name="pts">
-        /// The PTS to convert.
-        /// </param>
-        /// <returns>
-        /// The corresponding number of seconds.
-        /// </returns>
-        public static double PtsToSeconds(ulong pts)
-        {
-            return (double)pts / 90000;
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeUnitConversionHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the HandrakeUnitConversionHelpers type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+
+    /// <summary>
+    /// Converters for various encoding values.
+    /// </summary>
+    public static class HandBrakeUnitConversionHelpers
+    {
+        /// <summary>
+        /// Video Frame Rates
+        /// </summary>
+        private static readonly Dictionary<double, int> VideoRates;
+
+        /// <summary>
+        /// Initializes static members of the HandBrakeUnitConversionHelpers class.
+        /// </summary>
+        static HandBrakeUnitConversionHelpers()
+        {
+            HandBrakeUtils.EnsureGlobalInit();
+
+            VideoRates = new Dictionary<double, int>();
+            foreach (var framerate in HandBrakeEncoderHelpers.VideoFramerates)
+            {
+                VideoRates.Add(double.Parse(framerate.Name, CultureInfo.InvariantCulture), framerate.Rate);
+            }
+        }
+
+        /// <summary>
+        /// Convert Framerate to Video Rates
+        /// </summary>
+        /// <param name="framerate">
+        /// The framerate.
+        /// </param>
+        /// <returns>
+        /// The vrate if a valid framerate is passed in.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// Thrown when framerate is invalid.
+        /// </exception>
+        public static int FramerateToVrate(double framerate)
+        {
+            if (!VideoRates.ContainsKey(framerate))
+            {
+                throw new ArgumentException("Framerate not recognized.", "framerate");
+            }
+
+            return VideoRates[framerate];
+        }
+
+        /// <summary>
+        /// Converts a native HB encoder structure to an Encoder model.
+        /// </summary>
+        /// <param name="encoder">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted model.
+        /// </returns>
+        internal static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
+        {
+            return new HBVideoEncoder(encoder.muxers, encoder.name, encoder.codec, encoder.short_name);
+        }
+
+        /// <summary>
+        /// Converts a native HB encoder structure to an Encoder model.
+        /// </summary>
+        /// <param name="encoder">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted model.
+        /// </returns>
+        internal static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
+        {
+            var result = new HBAudioEncoder(
+                encoder.muxers,
+                HandBrakeEncoderHelpers.GetAudioCompressionLimits(encoder.codec),
+                HBFunctions.hb_audio_compression_get_default((uint)encoder.codec),
+                HBFunctions.hb_audio_quality_get_default((uint)encoder.codec),
+                encoder.name,
+                encoder.codec,
+                HandBrakeEncoderHelpers.GetAudioQualityLimits(encoder.codec),
+                encoder.short_name);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts a native HB rate structure to an HBRate object.
+        /// </summary>
+        /// <param name="rate">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted rate object.
+        /// </returns>
+        internal static HBRate NativeToRate(hb_rate_s rate)
+        {
+            return new HBRate(rate.name, rate.rate);
+        }
+
+        /// <summary>
+        /// Converts a native HB mixdown structure to a Mixdown model.
+        /// </summary>
+        /// <param name="mixdown">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted model.
+        /// </returns>
+        internal static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
+        {
+            return new HBMixdown(mixdown.name, mixdown.amixdown, mixdown.short_name);
+        }
+
+        /// <summary>
+        /// Converts a native HB container structure into an HBContainer object.
+        /// </summary>
+        /// <param name="container">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted structure.
+        /// </returns>
+        internal static HBContainer NativeToContainer(hb_container_s container)
+        {
+            return new HBContainer(container.default_extension, container.name, container.format, container.short_name);
+        }
+
+        /// <summary>
+        /// Converts a native language structure to a Language object.
+        /// </summary>
+        /// <param name="language">
+        /// The structure to convert.
+        /// </param>
+        /// <returns>
+        /// The converted structure.
+        /// </returns>
+        internal static Language NativeToLanguage(iso639_lang_t language)
+        {
+            string englishName = InteropUtilities.ToStringFromUtf8Ptr(language.eng_name);
+            string nativeName = InteropUtilities.ToStringFromUtf8Ptr(language.native_name);
+            return new Language(englishName, nativeName, language.iso639_2);
+        }
+
+        /// <summary>
+        /// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
+        /// </summary>
+        /// <param name="pts">
+        /// The PTS to convert.
+        /// </param>
+        /// <returns>
+        /// The timespan for it.
+        /// </returns>
+        public static TimeSpan PtsToTimeSpan(ulong pts)
+        {
+            return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
+        }
+
+        /// <summary>
+        /// Converts the PTS amount to seconds.
+        /// </summary>
+        /// <param name="pts">
+        /// The PTS to convert.
+        /// </param>
+        /// <returns>
+        /// The corresponding number of seconds.
+        /// </returns>
+        public static double PtsToSeconds(ulong pts)
+        {
+            return (double)pts / 90000;
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs
index a30f43133..bd8630911 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs
@@ -1,346 +1,346 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeUtils.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the HandBrakeUtils type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.InteropServices;
-
-    using HandBrake.ApplicationServices.Interop.EventArgs;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Json.Anamorphic;
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// HandBrake Interop Utilities
-    /// </summary>
-    public static class HandBrakeUtils
-    {
-        /// <summary>
-        /// The callback for log messages from HandBrake.
-        /// </summary>
-        private static LoggingCallback loggingCallback;
-
-        /// <summary>
-        /// The callback for error messages from HandBrake.
-        /// </summary>
-        private static LoggingCallback errorCallback;
-
-        /// <summary>
-        /// True if the global initialize function has been called.
-        /// </summary>
-        private static bool globalInitialized;
-
-        /// <summary>
-        /// Fires when HandBrake has logged a message.
-        /// </summary>
-        public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
-
-        /// <summary>
-        /// Fires when HandBrake has logged an error.
-        /// </summary>
-        public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
-
-        /// <summary>
-        /// Initializes static members of the HandBrakeUtils class.
-        /// </summary>
-        static HandBrakeUtils()
-        {
-            if (!globalInitialized)
-            {
-                if (HBFunctions.hb_global_init() == -1)
-                {
-                    throw new InvalidOperationException("HB global init failed.");
-                }
-
-                globalInitialized = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the HandBrake version string.
-        /// </summary>
-        public static string Version
-        {
-            get
-            {
-                var versionPtr = HBFunctions.hb_get_version(IntPtr.Zero); // Pointer isn't actually used.
-                return Marshal.PtrToStringAnsi(versionPtr);
-            }
-        }
-
-        /// <summary>
-        /// Gets the HandBrake build number.
-        /// </summary>
-        public static int Build
-        {
-            get
-            {
-                return HBFunctions.hb_get_build(IntPtr.Zero);
-            }
-        }
-
-        /// <summary>
-        /// Ensures the HB global initialize method has been called.
-        /// </summary>
-        public static void EnsureGlobalInit()
-        {
-            // Does nothing, but invokes static ctor.
-        }
-
-        /// <summary>
-        /// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
-        /// </summary>
-        /// <param name="enableDvdNav">
-        /// True to enable LibDVDNav.
-        /// </param>
-        public static void SetDvdNav(bool enableDvdNav)
-        {
-            HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
-        }
-
-        /// <summary>
-        /// Call before app shutdown. Performs global cleanup.
-        /// </summary>
-        public static void DisposeGlobal()
-        {
-            HBFunctions.hb_global_close();
-        }
-
-        /// <summary>
-        /// Register the logger.
-        /// </summary>
-        public static void RegisterLogger()
-        {
-            // Register the logger if we have not already
-            if (loggingCallback == null)
-            {
-                // Keep the callback as a member to prevent it from being garbage collected.
-                loggingCallback = LoggingHandler;
-                errorCallback = ErrorHandler;
-                HBFunctions.hb_register_logger(loggingCallback);
-                HBFunctions.hb_register_error_handler(errorCallback);
-            }
-        }
-
-        /// <summary>
-        /// Handles log messages from HandBrake.
-        /// </summary>
-        /// <param name="message">
-        /// The log message (including newline).
-        /// </param>
-        public static void LoggingHandler(string message)
-        {
-            message = message.TrimEnd();
-            if (!string.IsNullOrEmpty(message))
-            {
-                SendMessageEvent(message);
-            }
-        }
-
-        /// <summary>
-        /// Handles errors from HandBrake.
-        /// </summary>
-        /// <param name="message">
-        /// The error message.
-        /// </param>
-        public static void ErrorHandler(string message)
-        {
-            if (!string.IsNullOrEmpty(message))
-            {
-                // These errors happen in normal operations. Log them as messages.
-                if (message == "dvd: ifoOpen failed" || message.Contains("avformat_seek_file failed") || message.Contains("nav_get_title_list"))
-                {
-                    SendMessageEvent(message);
-                    return;
-                }
-
-                SendErrorEvent(message);
-            }
-        }
-
-        /// <summary>
-        /// Gets the standard x264 option name given the starting point.
-        /// </summary>
-        /// <param name="name">
-        /// The name.
-        /// </param>
-        /// <returns>
-        /// The standard x264 option name.
-        /// </returns>
-        public static string SanitizeX264OptName(string name)
-        {
-            IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
-            string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
-            Marshal.FreeHGlobal(namePtr);
-            return sanitizedName;
-        }
-
-        /// <summary>
-        /// Checks to see if the given H.264 level is valid given the inputs.
-        /// </summary>
-        /// <param name="level">
-        /// The level to check.
-        /// </param>
-        /// <param name="width">
-        /// The output picture width.
-        /// </param>
-        /// <param name="height">
-        /// The output picture height.
-        /// </param>
-        /// <param name="fpsNumerator">
-        /// The rate numerator.
-        /// </param>
-        /// <param name="fpsDenominator">
-        /// The rate denominator.
-        /// </param>
-        /// <param name="interlaced">
-        /// True if x264 interlaced output is enabled.
-        /// </param>
-        /// <param name="fakeInterlaced">
-        /// True if x264 fake interlacing is enabled.
-        /// </param>
-        /// <returns>
-        /// True if the level is valid.
-        /// </returns>
-        public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
-        {
-            return HBFunctions.hb_check_h264_level(
-                level,
-                width,
-                height,
-                fpsNumerator,
-                fpsDenominator,
-                interlaced ? 1 : 0,
-                fakeInterlaced ? 1 : 0) == 0;
-        }
-
-        /// <summary>
-        /// Creates an X264 options string from the given settings.
-        /// </summary>
-        /// <param name="preset">
-        /// The x264 preset.
-        /// </param>
-        /// <param name="tunes">
-        /// The x264 tunes being used.
-        /// </param>
-        /// <param name="extraOptions">
-        /// The extra options string.
-        /// </param>
-        /// <param name="profile">
-        /// The H.264 profile.
-        /// </param>
-        /// <param name="level">
-        /// The H.264 level.
-        /// </param>
-        /// <param name="width">
-        /// The width of the final picture.
-        /// </param>
-        /// <param name="height">
-        /// The height of the final picture.
-        /// </param>
-        /// <returns>
-        /// The full x264 options string from the given inputs.
-        /// </returns>
-        public static string CreateX264OptionsString(
-            string preset,
-            IList<string> tunes,
-            string extraOptions,
-            string profile,
-            string level,
-            int width,
-            int height)
-        {
-            if (width <= 0)
-            {
-                throw new ArgumentException("width must be positive.");
-            }
-
-            if (height <= 0)
-            {
-                throw new ArgumentException("height must be positive.");
-            }
-
-            IntPtr ptr = HBFunctions.hb_x264_param_unparse(
-                8,
-                preset,
-                string.Join(",", tunes),
-                extraOptions,
-                profile,
-                level,
-                width,
-                height); // TODO add bit-depth support.
-
-            string x264Settings = Marshal.PtrToStringAnsi(ptr);
-
-            return x264Settings;
-        }
-
-        /// <summary>
-        /// Gets the final size and PAR of the video, given anamorphic inputs.
-        /// </summary>
-        /// <param name="anamorphicGeometry">Anamorphic inputs.</param>
-        /// <returns>The final size and PAR of the video.</returns>
-        public static Geometry GetAnamorphicSize(AnamorphicGeometry anamorphicGeometry)
-        {
-            string encode = JsonConvert.SerializeObject(anamorphicGeometry, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-            IntPtr json = HBFunctions.hb_set_anamorphic_size_json(Marshal.StringToHGlobalAnsi(encode));
-            string result = Marshal.PtrToStringAnsi(json);
-            return JsonConvert.DeserializeObject<Geometry>(result);
-        }
-
-        public static void Reduce(long den, long num, out long x, out long y)
-        {
-            // find the greatest common divisor of num & den by Euclid's algorithm
-            long n = num, d = den;
-            while (d > 0)
-            {
-                long t = d;
-                d = n % d;
-                n = t;
-            }
-
-            // at this point n is the gcd. if it's non-zero remove it from num
-            // and den. Otherwise just return the original values.
-            if (n > 0)
-            {
-                num /= n;
-                den /= n;
-            }
-
-            x = num;
-            y = den;
-        }
-
-        /// <summary>
-        /// Sends the message logged event to any registered listeners.
-        /// </summary>
-        /// <param name="message">
-        /// The message to send.
-        /// </param>
-        public static void SendMessageEvent(string message)
-        {
-            MessageLogged?.Invoke(null, new MessageLoggedEventArgs(message));
-        }
-
-        /// <summary>
-        /// Sends the error logged event to any registered listeners.
-        /// </summary>
-        /// <param name="message">
-        /// The message to send
-        /// </param>
-        public static void SendErrorEvent(string message)
-        {
-            ErrorLogged?.Invoke(null, new MessageLoggedEventArgs(message));
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeUtils.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the HandBrakeUtils type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Runtime.InteropServices;
+
+    using HandBrake.Interop.Interop.EventArgs;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Json.Anamorphic;
+    using HandBrake.Interop.Interop.Json.Shared;
+
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// HandBrake Interop Utilities
+    /// </summary>
+    public static class HandBrakeUtils
+    {
+        /// <summary>
+        /// The callback for log messages from HandBrake.
+        /// </summary>
+        private static LoggingCallback loggingCallback;
+
+        /// <summary>
+        /// The callback for error messages from HandBrake.
+        /// </summary>
+        private static LoggingCallback errorCallback;
+
+        /// <summary>
+        /// True if the global initialize function has been called.
+        /// </summary>
+        private static bool globalInitialized;
+
+        /// <summary>
+        /// Fires when HandBrake has logged a message.
+        /// </summary>
+        public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
+
+        /// <summary>
+        /// Fires when HandBrake has logged an error.
+        /// </summary>
+        public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
+
+        /// <summary>
+        /// Initializes static members of the HandBrakeUtils class.
+        /// </summary>
+        static HandBrakeUtils()
+        {
+            if (!globalInitialized)
+            {
+                if (HBFunctions.hb_global_init() == -1)
+                {
+                    throw new InvalidOperationException("HB global init failed.");
+                }
+
+                globalInitialized = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the HandBrake version string.
+        /// </summary>
+        public static string Version
+        {
+            get
+            {
+                var versionPtr = HBFunctions.hb_get_version(IntPtr.Zero); // Pointer isn't actually used.
+                return Marshal.PtrToStringAnsi(versionPtr);
+            }
+        }
+
+        /// <summary>
+        /// Gets the HandBrake build number.
+        /// </summary>
+        public static int Build
+        {
+            get
+            {
+                return HBFunctions.hb_get_build(IntPtr.Zero);
+            }
+        }
+
+        /// <summary>
+        /// Ensures the HB global initialize method has been called.
+        /// </summary>
+        public static void EnsureGlobalInit()
+        {
+            // Does nothing, but invokes static ctor.
+        }
+
+        /// <summary>
+        /// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
+        /// </summary>
+        /// <param name="enableDvdNav">
+        /// True to enable LibDVDNav.
+        /// </param>
+        public static void SetDvdNav(bool enableDvdNav)
+        {
+            HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
+        }
+
+        /// <summary>
+        /// Call before app shutdown. Performs global cleanup.
+        /// </summary>
+        public static void DisposeGlobal()
+        {
+            HBFunctions.hb_global_close();
+        }
+
+        /// <summary>
+        /// Register the logger.
+        /// </summary>
+        public static void RegisterLogger()
+        {
+            // Register the logger if we have not already
+            if (loggingCallback == null)
+            {
+                // Keep the callback as a member to prevent it from being garbage collected.
+                loggingCallback = LoggingHandler;
+                errorCallback = ErrorHandler;
+                HBFunctions.hb_register_logger(loggingCallback);
+                HBFunctions.hb_register_error_handler(errorCallback);
+            }
+        }
+
+        /// <summary>
+        /// Handles log messages from HandBrake.
+        /// </summary>
+        /// <param name="message">
+        /// The log message (including newline).
+        /// </param>
+        public static void LoggingHandler(string message)
+        {
+            message = message.TrimEnd();
+            if (!string.IsNullOrEmpty(message))
+            {
+                SendMessageEvent(message);
+            }
+        }
+
+        /// <summary>
+        /// Handles errors from HandBrake.
+        /// </summary>
+        /// <param name="message">
+        /// The error message.
+        /// </param>
+        public static void ErrorHandler(string message)
+        {
+            if (!string.IsNullOrEmpty(message))
+            {
+                // These errors happen in normal operations. Log them as messages.
+                if (message == "dvd: ifoOpen failed" || message.Contains("avformat_seek_file failed") || message.Contains("nav_get_title_list"))
+                {
+                    SendMessageEvent(message);
+                    return;
+                }
+
+                SendErrorEvent(message);
+            }
+        }
+
+        /// <summary>
+        /// Gets the standard x264 option name given the starting point.
+        /// </summary>
+        /// <param name="name">
+        /// The name.
+        /// </param>
+        /// <returns>
+        /// The standard x264 option name.
+        /// </returns>
+        public static string SanitizeX264OptName(string name)
+        {
+            IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
+            string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
+            Marshal.FreeHGlobal(namePtr);
+            return sanitizedName;
+        }
+
+        /// <summary>
+        /// Checks to see if the given H.264 level is valid given the inputs.
+        /// </summary>
+        /// <param name="level">
+        /// The level to check.
+        /// </param>
+        /// <param name="width">
+        /// The output picture width.
+        /// </param>
+        /// <param name="height">
+        /// The output picture height.
+        /// </param>
+        /// <param name="fpsNumerator">
+        /// The rate numerator.
+        /// </param>
+        /// <param name="fpsDenominator">
+        /// The rate denominator.
+        /// </param>
+        /// <param name="interlaced">
+        /// True if x264 interlaced output is enabled.
+        /// </param>
+        /// <param name="fakeInterlaced">
+        /// True if x264 fake interlacing is enabled.
+        /// </param>
+        /// <returns>
+        /// True if the level is valid.
+        /// </returns>
+        public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
+        {
+            return HBFunctions.hb_check_h264_level(
+                level,
+                width,
+                height,
+                fpsNumerator,
+                fpsDenominator,
+                interlaced ? 1 : 0,
+                fakeInterlaced ? 1 : 0) == 0;
+        }
+
+        /// <summary>
+        /// Creates an X264 options string from the given settings.
+        /// </summary>
+        /// <param name="preset">
+        /// The x264 preset.
+        /// </param>
+        /// <param name="tunes">
+        /// The x264 tunes being used.
+        /// </param>
+        /// <param name="extraOptions">
+        /// The extra options string.
+        /// </param>
+        /// <param name="profile">
+        /// The H.264 profile.
+        /// </param>
+        /// <param name="level">
+        /// The H.264 level.
+        /// </param>
+        /// <param name="width">
+        /// The width of the final picture.
+        /// </param>
+        /// <param name="height">
+        /// The height of the final picture.
+        /// </param>
+        /// <returns>
+        /// The full x264 options string from the given inputs.
+        /// </returns>
+        public static string CreateX264OptionsString(
+            string preset,
+            IList<string> tunes,
+            string extraOptions,
+            string profile,
+            string level,
+            int width,
+            int height)
+        {
+            if (width <= 0)
+            {
+                throw new ArgumentException("width must be positive.");
+            }
+
+            if (height <= 0)
+            {
+                throw new ArgumentException("height must be positive.");
+            }
+
+            IntPtr ptr = HBFunctions.hb_x264_param_unparse(
+                8,
+                preset,
+                string.Join(",", tunes),
+                extraOptions,
+                profile,
+                level,
+                width,
+                height); // TODO add bit-depth support.
+
+            string x264Settings = Marshal.PtrToStringAnsi(ptr);
+
+            return x264Settings;
+        }
+
+        /// <summary>
+        /// Gets the final size and PAR of the video, given anamorphic inputs.
+        /// </summary>
+        /// <param name="anamorphicGeometry">Anamorphic inputs.</param>
+        /// <returns>The final size and PAR of the video.</returns>
+        public static Geometry GetAnamorphicSize(AnamorphicGeometry anamorphicGeometry)
+        {
+            string encode = JsonConvert.SerializeObject(anamorphicGeometry, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            IntPtr json = HBFunctions.hb_set_anamorphic_size_json(Marshal.StringToHGlobalAnsi(encode));
+            string result = Marshal.PtrToStringAnsi(json);
+            return JsonConvert.DeserializeObject<Geometry>(result);
+        }
+
+        public static void Reduce(long den, long num, out long x, out long y)
+        {
+            // find the greatest common divisor of num & den by Euclid's algorithm
+            long n = num, d = den;
+            while (d > 0)
+            {
+                long t = d;
+                d = n % d;
+                n = t;
+            }
+
+            // at this point n is the gcd. if it's non-zero remove it from num
+            // and den. Otherwise just return the original values.
+            if (n > 0)
+            {
+                num /= n;
+                den /= n;
+            }
+
+            x = num;
+            y = den;
+        }
+
+        /// <summary>
+        /// Sends the message logged event to any registered listeners.
+        /// </summary>
+        /// <param name="message">
+        /// The message to send.
+        /// </param>
+        public static void SendMessageEvent(string message)
+        {
+            MessageLogged?.Invoke(null, new MessageLoggedEventArgs(message));
+        }
+
+        /// <summary>
+        /// Sends the error logged event to any registered listeners.
+        /// </summary>
+        /// <param name="message">
+        /// The message to send
+        /// </param>
+        public static void SendErrorEvent(string message)
+        {
+            ErrorLogged?.Invoke(null, new MessageLoggedEventArgs(message));
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HBDelegates.cs b/win/CS/HandBrake.Interop/Interop/HbLib/HBDelegates.cs
index 3dff02a9d..33d3f0bca 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HBDelegates.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/HBDelegates.cs
@@ -1,17 +1,17 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBDelegates.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Contains delegates for HandBrake interop.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate void LoggingCallback(string message);
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBDelegates.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Contains delegates for HandBrake interop.
+// </summary>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate void LoggingCallback(string message);
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/Interop/HbLib/HbFunctions.cs
index 63eac3468..c55c8a927 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/HbFunctions.cs
@@ -1,462 +1,462 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBFunctions.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the HBFunctions type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Contains p-invoke function declarations to hblib.
-    /// </summary>
-    public static class HBFunctions
-    {
-        [DllImport("hb", EntryPoint = "hb_register_logger", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_register_logger(LoggingCallback callback);
-
-        [DllImport("hb", EntryPoint = "hb_register_error_handler", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_register_error_handler(LoggingCallback callback);
-
-        [DllImport("hb", EntryPoint = "hb_global_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_global_init();
-
-        /// Return Type: hb_handle_t*
-        ///verbose: int
-        ///update_check: int
-        [DllImport("hb", EntryPoint = "hb_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_init(int verbose, int update_check);
-
-
-        /// Return Type: hb_handle_t*
-        ///verbose: int
-        ///update_check: int
-        [DllImport("hb", EntryPoint = "hb_init_dl", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_init_dl(int verbose, int update_check);
-
-
-        /// Return Type: char*
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_get_version", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_version(IntPtr hbHandle);
-
-
-        /// Return Type: int
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_get_build", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_get_build(IntPtr hbHandle);
-
-
-        /// Return Type: int
-        ///h: hb_handle_t*
-        ///version: char**
-        [DllImport("hb", EntryPoint = "hb_check_update", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_check_update(IntPtr handle, ref IntPtr version);
-
-
-        /// Return Type: char*
-        ///path: char*
-        [DllImport("hb", EntryPoint = "hb_dvd_name", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_dvd_name(IntPtr path);
-
-
-        /// Return Type: void
-        ///enable: int
-        [DllImport("hb", EntryPoint = "hb_dvd_set_dvdnav", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_dvd_set_dvdnav(int enable);
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        ///path: char*
-        ///title_index: int
-        ///preview_count: int
-        ///store_previews: int
-        [DllImport("hb", EntryPoint = "hb_scan", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration);
-
-        [DllImport("hb", EntryPoint = "hb_scan_stop", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_scan_stop(IntPtr hbHandle);
-
-        /// Return Type: hb_list_t*
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_titles(IntPtr hbHandle);
-
-        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);
-        
-
-        /// Return Type: int
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_count", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_count(IntPtr hbHandle);
-
-
-        /// Return Type: hb_job_t*
-        ///param0: hb_handle_t*
-        ///param1: int
-        [DllImport("hb", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_job(IntPtr hbHandle, int jobIndex);
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        ///param1: hb_job_t*
-        [DllImport("hb", EntryPoint = "hb_rem", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_rem(IntPtr hbHandle, IntPtr job);
-
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_start", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_start(IntPtr hbHandle);
-
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_pause", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_pause(IntPtr hbHandle);
-
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_resume", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_resume(IntPtr hbHandle);
-
-
-        /// Return Type: void
-        ///param0: hb_handle_t*
-        [DllImport("hb", EntryPoint = "hb_stop", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_stop(IntPtr hbHandle);
-
-
-        /// Return Type: void
-        ///param0: hb_handle_t**
-        [DllImport("hb", EntryPoint = "hb_close", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_close(IntPtr hbHandle);
-
-        [DllImport("hb", EntryPoint = "hb_global_close", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_global_close();
-
-        //hb_list_t * hb_list_init();
-        [DllImport("hb", EntryPoint = "hb_list_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_list_init();
-
-        //int         hb_list_count( const hb_list_t * );
-        [DllImport("hb", EntryPoint = "hb_list_count", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_list_count(IntPtr listPtr);
-
-        //void        hb_list_add( hb_list_t *, void * );
-        [DllImport("hb", EntryPoint = "hb_list_add", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_list_add(IntPtr listPtr, IntPtr item);
-
-        //void        hb_list_insert( hb_list_t * l, int pos, void * p );
-        [DllImport("hb", EntryPoint = "hb_list_insert", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_list_insert(IntPtr listPtr, int pos, IntPtr item);
-
-        //void        hb_list_rem( hb_list_t *, void * );
-        [DllImport("hb", EntryPoint = "hb_list_rem", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_list_rem(IntPtr listPtr, IntPtr item);
-
-        //void      * hb_list_item( const hb_list_t *, int );
-        [DllImport("hb", EntryPoint = "hb_list_item", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_list_item(IntPtr listPtr, int itemIndex);
-
-        //void        hb_list_close( hb_list_t ** );
-        [DllImport("hb", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_list_close(IntPtr listPtrPtr);
-
-        [DllImport("hb", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_subtitle_can_force(int source);
-
-        [DllImport("hb", EntryPoint = "hb_subtitle_can_burn", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_subtitle_can_burn(int source);
-
-        [DllImport("hb", EntryPoint = "hb_subtitle_can_pass", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_subtitle_can_pass(int source, int mux);
-
-
-        // int hb_video_framerate_get_from_name(const char *name)
-        [DllImport("hb", EntryPoint = "hb_video_framerate_get_from_name", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_video_framerate_get_from_name(IntPtr name);
-
-//const char*      hb_video_framerate_get_name(int framerate);
-//const char*      hb_video_framerate_sanitize_name(const char *name);
-
-        // returns hb_rate_s
-        [DllImport("hb", EntryPoint = "hb_video_framerate_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_framerate_get_next(IntPtr last);
-
-
-//int              hb_audio_samplerate_get_best(uint32_t codec, int samplerate, int *sr_shift);
-//int              hb_audio_samplerate_get_from_name(const char *name);
-//const char*      hb_audio_samplerate_get_name(int samplerate);
-
-        // returns hb_rate_s
-        [DllImport("hb", EntryPoint = "hb_audio_samplerate_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_audio_samplerate_get_next(IntPtr last);
-
-        [DllImport("hb", EntryPoint = "hb_audio_samplerate_find_closest", CallingConvention = CallingConvention.Cdecl)]
-	    public static extern int hb_audio_samplerate_find_closest(int samplerate, uint codec);
-
-        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_best", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown);
-
-        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_default", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown);
-
-        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_limits", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);
-
-        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_audio_bitrate_get_next(IntPtr last);
-
-        [DllImport("hb", EntryPoint = "hb_video_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
-        [DllImport("hb", EntryPoint = "hb_video_quality_get_name", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_quality_get_name(uint codec);
-
-        [DllImport("hb", EntryPoint = "hb_audio_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
-//float hb_audio_quality_get_best(uint32_t codec, float quality);
-
-        [DllImport("hb", EntryPoint = "hb_audio_quality_get_default", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float hb_audio_quality_get_default(uint codec);
-
-
-        [DllImport("hb", EntryPoint = "hb_audio_compression_get_limits", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
-//float hb_audio_compression_get_best(uint32_t codec, float compression);
-
-        [DllImport("hb", EntryPoint = "hb_audio_compression_get_default", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float hb_audio_compression_get_default(uint codec);
-
-
-//int                hb_audio_dither_get_default();
-//int                hb_audio_dither_get_default_method(); // default method, if enabled && supported
-//int                hb_audio_dither_is_supported(uint32_t codec);
-//int                hb_audio_dither_get_from_name(const char *name);
-//const char*        hb_audio_dither_get_description(int method);
-//const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);
-
-        // hb_audio_can_apply_drc2(hb_handle_t *h, int title_idx, int audio_idx, int encoder)
-        [DllImport("hb", EntryPoint = "hb_audio_can_apply_drc2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_audio_can_apply_drc2(IntPtr handle, int title_index, int audio_index, int encoder);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_mixdown_has_codec_support(int mixdown, uint codec);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);
-
-//int                 hb_mixdown_get_discrete_channel_count(int mixdown);
-//int                 hb_mixdown_get_low_freq_channel_count(int mixdown);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_get_best", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_mixdown_get_best(uint codec, ulong layout, int mixdown);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_get_default", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_mixdown_get_default(uint codec, ulong layout);
-
-//int                 hb_mixdown_get_from_name(const char *name);
-//const char*         hb_mixdown_get_name(int mixdown);
-//const char*         hb_mixdown_get_short_name(int mixdown);
-//const char*         hb_mixdown_sanitize_name(const char *name);
-
-        [DllImport("hb", EntryPoint = "hb_mixdown_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_mixdown_get_next(IntPtr last);
-
-//int                 hb_video_encoder_get_default(int muxer);
-//int                 hb_video_encoder_get_from_name(const char *name);
-//const char*         hb_video_encoder_get_name(int encoder);
-//const char*         hb_video_encoder_get_short_name(int encoder);
-//const char*         hb_video_encoder_get_long_name(int encoder);
-//const char*         hb_video_encoder_sanitize_name(const char *name);
-
-        [DllImport("hb", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_encoder_get_next(IntPtr last);
-
-/*
- * hb_audio_encoder_get_fallback_for_passthru() will sanitize a passthru codec
- * to the matching audio encoder (if any is available).
- *
- * hb_audio_encoder_get_from_name(), hb_audio_encoder_sanitize_name() will
- * sanitize legacy encoder names, but won't convert passthru to an encoder.
- */
-//int                 hb_audio_encoder_get_fallback_for_passthru(int passthru);
-//int                 hb_audio_encoder_get_default(int muxer);
-//int                 hb_audio_encoder_get_from_name(const char *name);
-//const char*         hb_audio_encoder_get_name(int encoder);
-//const char*         hb_audio_encoder_get_short_name(int encoder);
-//const char*         hb_audio_encoder_get_long_name(int encoder);
-//const char*         hb_audio_encoder_sanitize_name(const char *name);
-
-        [DllImport("hb", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_audio_encoder_get_next(IntPtr last);
-
-//int                   hb_container_get_from_name(const char *name);
-//int                   hb_container_get_from_extension(const char *extension); // not really a container name
-//const char*           hb_container_get_name(int format);
-//const char*           hb_container_get_short_name(int format);
-//const char*           hb_container_get_long_name(int format);
-//const char*           hb_container_get_default_extension(int format);
-//const char*           hb_container_sanitize_name(const char *name);
-
-        [DllImport("hb", EntryPoint = "hb_container_get_from_name", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_container_get_from_name([In] [MarshalAs(UnmanagedType.LPStr)] string name);
-
-        [DllImport("hb", EntryPoint = "hb_container_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_container_get_next(IntPtr last);
-
-        [DllImport("hb", EntryPoint = "hb_video_encoder_get_presets", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_encoder_get_presets(int encoder);
-
-        [DllImport("hb", EntryPoint = "hb_video_encoder_get_tunes", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_encoder_get_tunes(int encoder);
-
-        [DllImport("hb", EntryPoint = "hb_video_encoder_get_profiles", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_encoder_get_profiles(int encoder);
-
-        [DllImport("hb", EntryPoint = "hb_video_encoder_get_levels", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_video_encoder_get_levels(int encoder);
-
-
-        [DllImport("hb", EntryPoint = "lang_get_next", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr lang_get_next(IntPtr last);
-
-        [DllImport("hb", EntryPoint = "lang_for_code2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr lang_for_code2([In] [MarshalAs(UnmanagedType.LPStr)] string code2);
-
-
-        ///hb_title_set_t  * hb_get_title_set( hb_handle_t * );
-        [DllImport("hb", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_title_set(IntPtr hbHandle);
-
-        ///hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );
-        [DllImport("hb", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_job_init_by_index(IntPtr hbHandle, int title_index);
-
-        ///void hb_job_close( hb_job_t ** job );
-        [DllImport("hb", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_job_close(IntPtr job);
-
-        ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
-        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);
-
-        ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
-        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_chapter_set_title__ptr(IntPtr chapter, IntPtr title);
-
-        /// hb_filter_object_t * hb_filter_init( int filter_id );
-        [DllImport("hb", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_filter_init(int filter_id);
-
-        [DllImport("hb", EntryPoint = "hb_generate_filter_settings_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_generate_filter_settings_json(
-            int filter_id,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string preset,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string tune,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string custom);
-
-        /// char* hb_filter_get_presets_json(int filter_id);
-        [DllImport("hb", EntryPoint = "hb_filter_get_presets_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_filter_get_presets_json(int filter_id);
-
-        /// char* hb_filter_get_tuness_json(int filter_id);
-        [DllImport("hb", EntryPoint = "hb_filter_get_tunes_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_filter_get_tunes_json(int filter_id);
-
-        // char ** hb_filter_get_keys(int filter_id);
-        [DllImport("hb", EntryPoint = "hb_filter_get_keys", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_filter_get_keys(int filter_id);
-
-        [DllImport("hb", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_x264_encopt_name(IntPtr name);
-
-        [DllImport("hb", EntryPoint = "hb_check_h264_level", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_check_h264_level([In] [MarshalAs(UnmanagedType.LPStr)] string level, int width, int height, int fps_num, int fps_den, int interlaced, int fake_interlaced);
-
-        [DllImport("hb", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_x264_param_unparse(
-            int bit_depth,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_preset,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_tune,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_encopts,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_profile,
-            [In] [MarshalAs(UnmanagedType.LPStr)] string h264_level,
-            int width,
-            int height);
-
-
-        [DllImport("hb", EntryPoint = "hb_get_opencl_env", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_get_opencl_env();
-
-        [DllImport("hb", EntryPoint = "hb_qsv_available", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_qsv_available();
-        
-        [DllImport("hb", EntryPoint = "hb_qsv_info_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_qsv_info_init();
-
-        // hb_image_t* hb_get_preview2(hb_handle_t* h, int title_idx, int picture, hb_geometry_settings_t* geo, int deinterlace);
-        [DllImport("hb", EntryPoint = "hb_get_preview2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_preview2(IntPtr hbHandle, int title_idx, int preview_idx,  ref hb_geometry_settings_s geo, int deinterlace);
-
-        // void hb_image_close(hb_image_t **_image);
-        [DllImport("hb", EntryPoint = "hb_image_close", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_image_close(IntPtr image);
-
-        /* JSON API */
-
-        // char     * hb_get_title_set_json(hb_handle_t * h);
-        [DllImport("hb", EntryPoint = "hb_get_title_set_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_title_set_json(IntPtr hbHandle);
-
-        // char     * hb_job_init_json(hb_handle_t *h, int title_index);
-        [DllImport("hb", EntryPoint = "hb_job_init_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_job_init_json(IntPtr hbHandle, int title_index);
-
-        // hb_job_t * hb_json_to_job(hb_handle_t * h, const char * json_job);
-        [DllImport("hb", EntryPoint = "hb_json_to_job", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job);
-
-        // int           hb_add_json( hb_handle_t *, const char * ) 
-        [DllImport("hb", EntryPoint = "hb_add_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int hb_add_json(IntPtr hbHandle, IntPtr json_job);
-
-        //char     * hb_set_anamorphic_size_json(const char * json_param);
-        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_set_anamorphic_size_json(IntPtr json_param);
-
-        // char     * hb_get_state_json(hb_handle_t * h);
-        [DllImport("hb", EntryPoint = "hb_get_state_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_state_json(IntPtr hbHandle);
-
-        // char* hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, hb_geometry_settings_t *settings)
-        [DllImport("hb", EntryPoint = "hb_get_preview_params_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, ref hb_geometry_settings_s settings);
-        
-        //void         hb_presets_builtin_init(void);
-        [DllImport("hb", EntryPoint = "hb_presets_builtin_init", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void hb_presets_builtin_init();
-
-        // char       * hb_presets_builtin_get_json(void); // Get list of HandBrake builtin presets as json string
-        [DllImport("hb", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_presets_builtin_get_json();
-
-        // 	char       * hb_presets_read_file_json(const char *filename);
-        [DllImport("hb", EntryPoint = "hb_presets_read_file_json", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr hb_presets_read_file_json(IntPtr filename);
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBFunctions.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the HBFunctions type.
+// </summary>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Contains p-invoke function declarations to hblib.
+    /// </summary>
+    public static class HBFunctions
+    {
+        [DllImport("hb", EntryPoint = "hb_register_logger", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_register_logger(LoggingCallback callback);
+
+        [DllImport("hb", EntryPoint = "hb_register_error_handler", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_register_error_handler(LoggingCallback callback);
+
+        [DllImport("hb", EntryPoint = "hb_global_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_global_init();
+
+        /// Return Type: hb_handle_t*
+        ///verbose: int
+        ///update_check: int
+        [DllImport("hb", EntryPoint = "hb_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_init(int verbose, int update_check);
+
+
+        /// Return Type: hb_handle_t*
+        ///verbose: int
+        ///update_check: int
+        [DllImport("hb", EntryPoint = "hb_init_dl", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_init_dl(int verbose, int update_check);
+
+
+        /// Return Type: char*
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_get_version", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_version(IntPtr hbHandle);
+
+
+        /// Return Type: int
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_get_build", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_get_build(IntPtr hbHandle);
+
+
+        /// Return Type: int
+        ///h: hb_handle_t*
+        ///version: char**
+        [DllImport("hb", EntryPoint = "hb_check_update", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_check_update(IntPtr handle, ref IntPtr version);
+
+
+        /// Return Type: char*
+        ///path: char*
+        [DllImport("hb", EntryPoint = "hb_dvd_name", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_dvd_name(IntPtr path);
+
+
+        /// Return Type: void
+        ///enable: int
+        [DllImport("hb", EntryPoint = "hb_dvd_set_dvdnav", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_dvd_set_dvdnav(int enable);
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        ///path: char*
+        ///title_index: int
+        ///preview_count: int
+        ///store_previews: int
+        [DllImport("hb", EntryPoint = "hb_scan", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration);
+
+        [DllImport("hb", EntryPoint = "hb_scan_stop", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_scan_stop(IntPtr hbHandle);
+
+        /// Return Type: hb_list_t*
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_titles(IntPtr hbHandle);
+
+        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);
+        
+
+        /// Return Type: int
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_count", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_count(IntPtr hbHandle);
+
+
+        /// Return Type: hb_job_t*
+        ///param0: hb_handle_t*
+        ///param1: int
+        [DllImport("hb", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_job(IntPtr hbHandle, int jobIndex);
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        ///param1: hb_job_t*
+        [DllImport("hb", EntryPoint = "hb_rem", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_rem(IntPtr hbHandle, IntPtr job);
+
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_start", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_start(IntPtr hbHandle);
+
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_pause", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_pause(IntPtr hbHandle);
+
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_resume", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_resume(IntPtr hbHandle);
+
+
+        /// Return Type: void
+        ///param0: hb_handle_t*
+        [DllImport("hb", EntryPoint = "hb_stop", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_stop(IntPtr hbHandle);
+
+
+        /// Return Type: void
+        ///param0: hb_handle_t**
+        [DllImport("hb", EntryPoint = "hb_close", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_close(IntPtr hbHandle);
+
+        [DllImport("hb", EntryPoint = "hb_global_close", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_global_close();
+
+        //hb_list_t * hb_list_init();
+        [DllImport("hb", EntryPoint = "hb_list_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_list_init();
+
+        //int         hb_list_count( const hb_list_t * );
+        [DllImport("hb", EntryPoint = "hb_list_count", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_list_count(IntPtr listPtr);
+
+        //void        hb_list_add( hb_list_t *, void * );
+        [DllImport("hb", EntryPoint = "hb_list_add", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_list_add(IntPtr listPtr, IntPtr item);
+
+        //void        hb_list_insert( hb_list_t * l, int pos, void * p );
+        [DllImport("hb", EntryPoint = "hb_list_insert", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_list_insert(IntPtr listPtr, int pos, IntPtr item);
+
+        //void        hb_list_rem( hb_list_t *, void * );
+        [DllImport("hb", EntryPoint = "hb_list_rem", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_list_rem(IntPtr listPtr, IntPtr item);
+
+        //void      * hb_list_item( const hb_list_t *, int );
+        [DllImport("hb", EntryPoint = "hb_list_item", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_list_item(IntPtr listPtr, int itemIndex);
+
+        //void        hb_list_close( hb_list_t ** );
+        [DllImport("hb", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_list_close(IntPtr listPtrPtr);
+
+        [DllImport("hb", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_subtitle_can_force(int source);
+
+        [DllImport("hb", EntryPoint = "hb_subtitle_can_burn", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_subtitle_can_burn(int source);
+
+        [DllImport("hb", EntryPoint = "hb_subtitle_can_pass", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_subtitle_can_pass(int source, int mux);
+
+
+        // int hb_video_framerate_get_from_name(const char *name)
+        [DllImport("hb", EntryPoint = "hb_video_framerate_get_from_name", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_video_framerate_get_from_name(IntPtr name);
+
+//const char*      hb_video_framerate_get_name(int framerate);
+//const char*      hb_video_framerate_sanitize_name(const char *name);
+
+        // returns hb_rate_s
+        [DllImport("hb", EntryPoint = "hb_video_framerate_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_framerate_get_next(IntPtr last);
+
+
+//int              hb_audio_samplerate_get_best(uint32_t codec, int samplerate, int *sr_shift);
+//int              hb_audio_samplerate_get_from_name(const char *name);
+//const char*      hb_audio_samplerate_get_name(int samplerate);
+
+        // returns hb_rate_s
+        [DllImport("hb", EntryPoint = "hb_audio_samplerate_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_audio_samplerate_get_next(IntPtr last);
+
+        [DllImport("hb", EntryPoint = "hb_audio_samplerate_find_closest", CallingConvention = CallingConvention.Cdecl)]
+	    public static extern int hb_audio_samplerate_find_closest(int samplerate, uint codec);
+
+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_best", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown);
+
+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_default", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown);
+
+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_limits", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);
+
+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_audio_bitrate_get_next(IntPtr last);
+
+        [DllImport("hb", EntryPoint = "hb_video_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+        [DllImport("hb", EntryPoint = "hb_video_quality_get_name", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_quality_get_name(uint codec);
+
+        [DllImport("hb", EntryPoint = "hb_audio_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+//float hb_audio_quality_get_best(uint32_t codec, float quality);
+
+        [DllImport("hb", EntryPoint = "hb_audio_quality_get_default", CallingConvention = CallingConvention.Cdecl)]
+        public static extern float hb_audio_quality_get_default(uint codec);
+
+
+        [DllImport("hb", EntryPoint = "hb_audio_compression_get_limits", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+//float hb_audio_compression_get_best(uint32_t codec, float compression);
+
+        [DllImport("hb", EntryPoint = "hb_audio_compression_get_default", CallingConvention = CallingConvention.Cdecl)]
+        public static extern float hb_audio_compression_get_default(uint codec);
+
+
+//int                hb_audio_dither_get_default();
+//int                hb_audio_dither_get_default_method(); // default method, if enabled && supported
+//int                hb_audio_dither_is_supported(uint32_t codec);
+//int                hb_audio_dither_get_from_name(const char *name);
+//const char*        hb_audio_dither_get_description(int method);
+//const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);
+
+        // hb_audio_can_apply_drc2(hb_handle_t *h, int title_idx, int audio_idx, int encoder)
+        [DllImport("hb", EntryPoint = "hb_audio_can_apply_drc2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_audio_can_apply_drc2(IntPtr handle, int title_index, int audio_index, int encoder);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_mixdown_has_codec_support(int mixdown, uint codec);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);
+
+//int                 hb_mixdown_get_discrete_channel_count(int mixdown);
+//int                 hb_mixdown_get_low_freq_channel_count(int mixdown);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_get_best", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_mixdown_get_best(uint codec, ulong layout, int mixdown);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_get_default", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_mixdown_get_default(uint codec, ulong layout);
+
+//int                 hb_mixdown_get_from_name(const char *name);
+//const char*         hb_mixdown_get_name(int mixdown);
+//const char*         hb_mixdown_get_short_name(int mixdown);
+//const char*         hb_mixdown_sanitize_name(const char *name);
+
+        [DllImport("hb", EntryPoint = "hb_mixdown_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_mixdown_get_next(IntPtr last);
+
+//int                 hb_video_encoder_get_default(int muxer);
+//int                 hb_video_encoder_get_from_name(const char *name);
+//const char*         hb_video_encoder_get_name(int encoder);
+//const char*         hb_video_encoder_get_short_name(int encoder);
+//const char*         hb_video_encoder_get_long_name(int encoder);
+//const char*         hb_video_encoder_sanitize_name(const char *name);
+
+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_encoder_get_next(IntPtr last);
+
+/*
+ * hb_audio_encoder_get_fallback_for_passthru() will sanitize a passthru codec
+ * to the matching audio encoder (if any is available).
+ *
+ * hb_audio_encoder_get_from_name(), hb_audio_encoder_sanitize_name() will
+ * sanitize legacy encoder names, but won't convert passthru to an encoder.
+ */
+//int                 hb_audio_encoder_get_fallback_for_passthru(int passthru);
+//int                 hb_audio_encoder_get_default(int muxer);
+//int                 hb_audio_encoder_get_from_name(const char *name);
+//const char*         hb_audio_encoder_get_name(int encoder);
+//const char*         hb_audio_encoder_get_short_name(int encoder);
+//const char*         hb_audio_encoder_get_long_name(int encoder);
+//const char*         hb_audio_encoder_sanitize_name(const char *name);
+
+        [DllImport("hb", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_audio_encoder_get_next(IntPtr last);
+
+//int                   hb_container_get_from_name(const char *name);
+//int                   hb_container_get_from_extension(const char *extension); // not really a container name
+//const char*           hb_container_get_name(int format);
+//const char*           hb_container_get_short_name(int format);
+//const char*           hb_container_get_long_name(int format);
+//const char*           hb_container_get_default_extension(int format);
+//const char*           hb_container_sanitize_name(const char *name);
+
+        [DllImport("hb", EntryPoint = "hb_container_get_from_name", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_container_get_from_name([In] [MarshalAs(UnmanagedType.LPStr)] string name);
+
+        [DllImport("hb", EntryPoint = "hb_container_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_container_get_next(IntPtr last);
+
+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_presets", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_encoder_get_presets(int encoder);
+
+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_tunes", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_encoder_get_tunes(int encoder);
+
+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_profiles", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_encoder_get_profiles(int encoder);
+
+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_levels", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_video_encoder_get_levels(int encoder);
+
+
+        [DllImport("hb", EntryPoint = "lang_get_next", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr lang_get_next(IntPtr last);
+
+        [DllImport("hb", EntryPoint = "lang_for_code2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr lang_for_code2([In] [MarshalAs(UnmanagedType.LPStr)] string code2);
+
+
+        ///hb_title_set_t  * hb_get_title_set( hb_handle_t * );
+        [DllImport("hb", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_title_set(IntPtr hbHandle);
+
+        ///hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );
+        [DllImport("hb", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_job_init_by_index(IntPtr hbHandle, int title_index);
+
+        ///void hb_job_close( hb_job_t ** job );
+        [DllImport("hb", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_job_close(IntPtr job);
+
+        ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
+        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);
+
+        ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
+        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_chapter_set_title__ptr(IntPtr chapter, IntPtr title);
+
+        /// hb_filter_object_t * hb_filter_init( int filter_id );
+        [DllImport("hb", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_filter_init(int filter_id);
+
+        [DllImport("hb", EntryPoint = "hb_generate_filter_settings_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_generate_filter_settings_json(
+            int filter_id,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string preset,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string tune,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string custom);
+
+        /// char* hb_filter_get_presets_json(int filter_id);
+        [DllImport("hb", EntryPoint = "hb_filter_get_presets_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_filter_get_presets_json(int filter_id);
+
+        /// char* hb_filter_get_tuness_json(int filter_id);
+        [DllImport("hb", EntryPoint = "hb_filter_get_tunes_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_filter_get_tunes_json(int filter_id);
+
+        // char ** hb_filter_get_keys(int filter_id);
+        [DllImport("hb", EntryPoint = "hb_filter_get_keys", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_filter_get_keys(int filter_id);
+
+        [DllImport("hb", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_x264_encopt_name(IntPtr name);
+
+        [DllImport("hb", EntryPoint = "hb_check_h264_level", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_check_h264_level([In] [MarshalAs(UnmanagedType.LPStr)] string level, int width, int height, int fps_num, int fps_den, int interlaced, int fake_interlaced);
+
+        [DllImport("hb", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_x264_param_unparse(
+            int bit_depth,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_preset,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_tune,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_encopts,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string x264_profile,
+            [In] [MarshalAs(UnmanagedType.LPStr)] string h264_level,
+            int width,
+            int height);
+
+
+        [DllImport("hb", EntryPoint = "hb_get_opencl_env", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_get_opencl_env();
+
+        [DllImport("hb", EntryPoint = "hb_qsv_available", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_qsv_available();
+        
+        [DllImport("hb", EntryPoint = "hb_qsv_info_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_qsv_info_init();
+
+        // hb_image_t* hb_get_preview2(hb_handle_t* h, int title_idx, int picture, hb_geometry_settings_t* geo, int deinterlace);
+        [DllImport("hb", EntryPoint = "hb_get_preview2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_preview2(IntPtr hbHandle, int title_idx, int preview_idx,  ref hb_geometry_settings_s geo, int deinterlace);
+
+        // void hb_image_close(hb_image_t **_image);
+        [DllImport("hb", EntryPoint = "hb_image_close", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_image_close(IntPtr image);
+
+        /* JSON API */
+
+        // char     * hb_get_title_set_json(hb_handle_t * h);
+        [DllImport("hb", EntryPoint = "hb_get_title_set_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_title_set_json(IntPtr hbHandle);
+
+        // char     * hb_job_init_json(hb_handle_t *h, int title_index);
+        [DllImport("hb", EntryPoint = "hb_job_init_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_job_init_json(IntPtr hbHandle, int title_index);
+
+        // hb_job_t * hb_json_to_job(hb_handle_t * h, const char * json_job);
+        [DllImport("hb", EntryPoint = "hb_json_to_job", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job);
+
+        // int           hb_add_json( hb_handle_t *, const char * ) 
+        [DllImport("hb", EntryPoint = "hb_add_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int hb_add_json(IntPtr hbHandle, IntPtr json_job);
+
+        //char     * hb_set_anamorphic_size_json(const char * json_param);
+        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_set_anamorphic_size_json(IntPtr json_param);
+
+        // char     * hb_get_state_json(hb_handle_t * h);
+        [DllImport("hb", EntryPoint = "hb_get_state_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_state_json(IntPtr hbHandle);
+
+        // char* hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, hb_geometry_settings_t *settings)
+        [DllImport("hb", EntryPoint = "hb_get_preview_params_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, ref hb_geometry_settings_s settings);
+        
+        //void         hb_presets_builtin_init(void);
+        [DllImport("hb", EntryPoint = "hb_presets_builtin_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_presets_builtin_init();
+
+        // char       * hb_presets_builtin_get_json(void); // Get list of HandBrake builtin presets as json string
+        [DllImport("hb", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_presets_builtin_get_json();
+
+        // 	char       * hb_presets_read_file_json(const char *filename);
+        [DllImport("hb", EntryPoint = "hb_presets_read_file_json", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr hb_presets_read_file_json(IntPtr filename);
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs
index 9f4615bbf..aacec1bcf 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs
@@ -1,69 +1,69 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NativeConstants.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the NativeConstants type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    public class NativeConstants
-    {
-        // Audio encoders
-        public const uint HB_ACODEC_MASK = 0x03FFFF00;
-        public const uint HB_ACODEC_LAME = 0x00000200;
-        public const uint HB_ACODEC_VORBIS = 0x00000400;
-        public const uint HB_ACODEC_AC3 = 0x00000800;
-        public const uint HB_ACODEC_LPCM = 0x00001000;
-        public const uint HB_ACODEC_DCA = 0x00002000;
-        public const uint HB_ACODEC_CA_AAC = 0x00004000;
-        public const uint HB_ACODEC_CA_HAAC = 0x00008000;
-        public const uint HB_ACODEC_FFAAC = 0x00010000;
-        public const uint HB_ACODEC_FFMPEG = 0x00020000;
-        public const uint HB_ACODEC_DCA_HD = 0x00040000;
-        public const uint HB_ACODEC_MP3 = 0x00080000;
-        public const uint HB_ACODEC_FFFLAC = 0x00100000;
-        public const uint HB_ACODEC_FFFLAC24 = 0x00200000;
-        public const uint HB_ACODEC_FDK_AAC = 0x00400000;
-        public const uint HB_ACODEC_FDK_HAAC = 0x00800000;
-        public const uint HB_ACODEC_FFEAC3 = 0x01000000;
-        public const uint HB_ACODEC_FFTRUEHD = 0x02000000;
-        public const uint HB_ACODEC_FF_MASK = 0x03FF2800;
-        public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
-        public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD);
-        public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_MP3_PASS = (HB_ACODEC_MP3 | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_AAC_PASS = (HB_ACODEC_FFAAC | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_AC3_PASS = (HB_ACODEC_AC3 | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_DCA_PASS = (HB_ACODEC_DCA | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_DCA_HD_PASS = (HB_ACODEC_DCA_HD | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_EAC3_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3);
-        public const uint HB_ACODEC_FLAC_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFFLAC);
-        public const uint HB_ACODEC_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_TRUEHD_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFTRUEHD);
-
-        // VideoEncoders
-        public const uint HB_VCODEC_QSV_H264 = 0x0000100;
-        public const uint HB_VCODEC_QSV_H265 = 0x0000200;
-        public const uint HB_VCODEC_QSV_H265_10BIT = 0x0000400;
-        public const uint HB_VCODEC_QSV_MASK = 0x0000F00;
-
-        // Encode state
-        public const int HB_STATE_IDLE = 1;
-        public const int HB_STATE_SCANNING = 2;
-        public const int HB_STATE_SCANDONE = 4;
-        public const int HB_STATE_WORKING = 8;
-        public const int HB_STATE_PAUSED = 16;
-        public const int HB_STATE_WORKDONE = 32;
-        public const int HB_STATE_MUXING = 64;
-        public const int HB_STATE_SEARCHING = 128;
-
-        // Keep aspect ratio values
-        public const int HB_KEEP_WIDTH = 0x01;
-        public const int HB_KEEP_HEIGHT = 0x02;
-        public const int HB_KEEP_DISPLAY_ASPECT = 0x04;
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NativeConstants.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the NativeConstants type.
+// </summary>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    public class NativeConstants
+    {
+        // Audio encoders
+        public const uint HB_ACODEC_MASK = 0x03FFFF00;
+        public const uint HB_ACODEC_LAME = 0x00000200;
+        public const uint HB_ACODEC_VORBIS = 0x00000400;
+        public const uint HB_ACODEC_AC3 = 0x00000800;
+        public const uint HB_ACODEC_LPCM = 0x00001000;
+        public const uint HB_ACODEC_DCA = 0x00002000;
+        public const uint HB_ACODEC_CA_AAC = 0x00004000;
+        public const uint HB_ACODEC_CA_HAAC = 0x00008000;
+        public const uint HB_ACODEC_FFAAC = 0x00010000;
+        public const uint HB_ACODEC_FFMPEG = 0x00020000;
+        public const uint HB_ACODEC_DCA_HD = 0x00040000;
+        public const uint HB_ACODEC_MP3 = 0x00080000;
+        public const uint HB_ACODEC_FFFLAC = 0x00100000;
+        public const uint HB_ACODEC_FFFLAC24 = 0x00200000;
+        public const uint HB_ACODEC_FDK_AAC = 0x00400000;
+        public const uint HB_ACODEC_FDK_HAAC = 0x00800000;
+        public const uint HB_ACODEC_FFEAC3 = 0x01000000;
+        public const uint HB_ACODEC_FFTRUEHD = 0x02000000;
+        public const uint HB_ACODEC_FF_MASK = 0x03FF2800;
+        public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
+        public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD);
+        public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_MP3_PASS = (HB_ACODEC_MP3 | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_AAC_PASS = (HB_ACODEC_FFAAC | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_AC3_PASS = (HB_ACODEC_AC3 | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_DCA_PASS = (HB_ACODEC_DCA | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_DCA_HD_PASS = (HB_ACODEC_DCA_HD | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_EAC3_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3);
+        public const uint HB_ACODEC_FLAC_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFFLAC);
+        public const uint HB_ACODEC_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);
+        public const uint HB_ACODEC_TRUEHD_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFTRUEHD);
+
+        // VideoEncoders
+        public const uint HB_VCODEC_QSV_H264 = 0x0000100;
+        public const uint HB_VCODEC_QSV_H265 = 0x0000200;
+        public const uint HB_VCODEC_QSV_H265_10BIT = 0x0000400;
+        public const uint HB_VCODEC_QSV_MASK = 0x0000F00;
+
+        // Encode state
+        public const int HB_STATE_IDLE = 1;
+        public const int HB_STATE_SCANNING = 2;
+        public const int HB_STATE_SCANDONE = 4;
+        public const int HB_STATE_WORKING = 8;
+        public const int HB_STATE_PAUSED = 16;
+        public const int HB_STATE_WORKDONE = 32;
+        public const int HB_STATE_MUXING = 64;
+        public const int HB_STATE_SEARCHING = 128;
+
+        // Keep aspect ratio values
+        public const int HB_KEEP_WIDTH = 0x01;
+        public const int HB_KEEP_HEIGHT = 0x02;
+        public const int HB_KEEP_DISPLAY_ASPECT = 0x04;
+	}
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_anamorphic_mode_t.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_anamorphic_mode_t.cs
index ba379c3ad..949f7d694 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_anamorphic_mode_t.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_anamorphic_mode_t.cs
@@ -1,21 +1,21 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_job_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the hb_job_s type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    internal enum hb_anamorphic_mode_t
-    {
-        HB_ANAMORPHIC_NONE,
-        HB_ANAMORPHIC_STRICT,
-        HB_ANAMORPHIC_LOOSE,
-        HB_ANAMORPHIC_CUSTOM,
-        HB_ANAMORPHIC_AUTO
-    } ;
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_job_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the hb_job_s type.
+// </summary>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    internal enum hb_anamorphic_mode_t
+    {
+        HB_ANAMORPHIC_NONE,
+        HB_ANAMORPHIC_STRICT,
+        HB_ANAMORPHIC_LOOSE,
+        HB_ANAMORPHIC_CUSTOM,
+        HB_ANAMORPHIC_AUTO
+    } ;
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_container_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_container_s.cs
index 156bc7554..2611cab47 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_container_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_container_s.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_container_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct hb_container_s
-    {
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string short_name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string long_name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string default_extension;
-
-        public int format;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_container_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct hb_container_s
+    {
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string short_name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string long_name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string default_extension;
+
+        public int format;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_encoder_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_encoder_s.cs
index 6fddc1827..54c5b182f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_encoder_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_encoder_s.cs
@@ -1,28 +1,28 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_encoder_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct hb_encoder_s
-    {
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string short_name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string long_name;
-
-        public int codec;
-
-        public int muxers;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_encoder_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct hb_encoder_s
+    {
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string short_name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string long_name;
+
+        public int codec;
+
+        public int muxers;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_error_code.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_error_code.cs
index 96a6fbe00..f0c996ca8 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_error_code.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_error_code.cs
@@ -1,24 +1,24 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_error_code.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the hb_error_code type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    /// <summary>
-    /// The hb_error_code.
-    /// </summary>
-    internal enum hb_error_code
-    {
-        HB_ERROR_NONE = 0,
-        HB_ERROR_CANCELED,
-        HB_ERROR_WRONG_INPUT,
-        HB_ERROR_INIT,
-        HB_ERROR_UNKNOWN,
-        HB_ERROR_READ
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_error_code.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the hb_error_code type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    /// <summary>
+    /// The hb_error_code.
+    /// </summary>
+    internal enum hb_error_code
+    {
+        HB_ERROR_NONE = 0,
+        HB_ERROR_CANCELED,
+        HB_ERROR_WRONG_INPUT,
+        HB_ERROR_INIT,
+        HB_ERROR_UNKNOWN,
+        HB_ERROR_READ
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_filter_ids.cs
index 63e279410..62b0889cb 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_filter_ids.cs
@@ -1,46 +1,46 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_filter_ids.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    public enum hb_filter_ids
-    {
-        HB_FILTER_INVALID = 0,
-        // for QSV - important to have before other filters
-        HB_FILTER_FIRST = 1,
-        HB_FILTER_QSV_PRE = 1,
-
-        // First, filters that may change the framerate (drop or dup frames)
-        HB_FILTER_DETELECINE,
-        HB_FILTER_COMB_DETECT,
-        HB_FILTER_DECOMB,
-        HB_FILTER_DEINTERLACE,
-        HB_FILTER_VFR,
-        // Filters that must operate on the original source image are next
-        HB_FILTER_DEBLOCK,
-        HB_FILTER_DENOISE,
-        HB_FILTER_HQDN3D = HB_FILTER_DENOISE,
-        HB_FILTER_NLMEANS,
-        HB_FILTER_RENDER_SUB,
-        HB_FILTER_CROP_SCALE,
-        HB_FILTER_LAPSHARP,
-        HB_FILTER_UNSHARP,
-        HB_FILTER_ROTATE,
-        HB_FILTER_GRAYSCALE,
-        HB_FILTER_PAD,
-
-        // Finally filters that don't care what order they are in,
-        // except that they must be after the above filters
-        HB_FILTER_AVFILTER,
-
-        // for QSV - important to have as a last one
-        HB_FILTER_QSV_POST,
-        // default MSDK VPP filter
-        HB_FILTER_QSV,
-        HB_FILTER_LAST = HB_FILTER_QSV
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_filter_ids.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    public enum hb_filter_ids
+    {
+        HB_FILTER_INVALID = 0,
+        // for QSV - important to have before other filters
+        HB_FILTER_FIRST = 1,
+        HB_FILTER_QSV_PRE = 1,
+
+        // First, filters that may change the framerate (drop or dup frames)
+        HB_FILTER_DETELECINE,
+        HB_FILTER_COMB_DETECT,
+        HB_FILTER_DECOMB,
+        HB_FILTER_DEINTERLACE,
+        HB_FILTER_VFR,
+        // Filters that must operate on the original source image are next
+        HB_FILTER_DEBLOCK,
+        HB_FILTER_DENOISE,
+        HB_FILTER_HQDN3D = HB_FILTER_DENOISE,
+        HB_FILTER_NLMEANS,
+        HB_FILTER_RENDER_SUB,
+        HB_FILTER_CROP_SCALE,
+        HB_FILTER_LAPSHARP,
+        HB_FILTER_UNSHARP,
+        HB_FILTER_ROTATE,
+        HB_FILTER_GRAYSCALE,
+        HB_FILTER_PAD,
+
+        // Finally filters that don't care what order they are in,
+        // except that they must be after the above filters
+        HB_FILTER_AVFILTER,
+
+        // for QSV - important to have as a last one
+        HB_FILTER_QSV_POST,
+        // default MSDK VPP filter
+        HB_FILTER_QSV,
+        HB_FILTER_LAST = HB_FILTER_QSV
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_geometry.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_geometry.cs
index 8a6cfa3e6..c665a5306 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_geometry.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_geometry.cs
@@ -1,101 +1,101 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_geometry.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the hb_geometry type.
-// </summary>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// The hb_geometry_s.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct hb_geometry_s
-    {
-        /// <summary>
-        /// The width.
-        /// </summary>
-        public int width;
-
-        /// <summary>
-        /// The height.
-        /// </summary>
-        public int height;
-
-        /// <summary>
-        /// The par.
-        /// </summary>
-        public hb_rational_t par;
-    }
-
-    /// <summary>
-    /// The hb_ui_geometry_s.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct hb_geometry_settings_s
-    {
-        /// <summary>
-        ///  Anamorphic mode, see job struct anamorphic
-        /// </summary>
-        public int mode;
-
-        /// <summary>
-        ///  Specifies settings that shouldn't be changed
-        /// </summary>
-        public int keep; 
-
-        /// <summary>
-        /// use dvd dimensions to determine PAR
-        /// </summary>
-        public int itu_par; 
-
-        /// <summary>
-        /// pixel alignment for loose anamorphic
-        /// </summary>
-        public int modulus; 
-
-        /// <summary>
-        /// Cropping
-        /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
-        public int[] crop;
-
-        /// <summary>
-        /// max destination storage width
-        /// </summary>
-        public int maxWidth; 
-
-        /// <summary>
-        ///  max destination storage height
-        /// </summary>
-        public int maxHeight;
-
-        /// <summary>
-        /// Pixel aspect used in custom anamorphic
-        /// </summary>
-        public hb_geometry_s geometry; 
-    }
-
-    /// <summary>
-    /// The hb_rational_t.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct hb_rational_t
-    {
-        /// <summary>
-        /// The num. W
-        /// </summary>
-        public int num;
-
-        /// <summary>
-        /// The den. H
-        /// </summary>
-        public int den;
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_geometry.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the hb_geometry type.
+// </summary>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// The hb_geometry_s.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct hb_geometry_s
+    {
+        /// <summary>
+        /// The width.
+        /// </summary>
+        public int width;
+
+        /// <summary>
+        /// The height.
+        /// </summary>
+        public int height;
+
+        /// <summary>
+        /// The par.
+        /// </summary>
+        public hb_rational_t par;
+    }
+
+    /// <summary>
+    /// The hb_ui_geometry_s.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct hb_geometry_settings_s
+    {
+        /// <summary>
+        ///  Anamorphic mode, see job struct anamorphic
+        /// </summary>
+        public int mode;
+
+        /// <summary>
+        ///  Specifies settings that shouldn't be changed
+        /// </summary>
+        public int keep; 
+
+        /// <summary>
+        /// use dvd dimensions to determine PAR
+        /// </summary>
+        public int itu_par; 
+
+        /// <summary>
+        /// pixel alignment for loose anamorphic
+        /// </summary>
+        public int modulus; 
+
+        /// <summary>
+        /// Cropping
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
+        public int[] crop;
+
+        /// <summary>
+        /// max destination storage width
+        /// </summary>
+        public int maxWidth; 
+
+        /// <summary>
+        ///  max destination storage height
+        /// </summary>
+        public int maxHeight;
+
+        /// <summary>
+        /// Pixel aspect used in custom anamorphic
+        /// </summary>
+        public hb_geometry_s geometry; 
+    }
+
+    /// <summary>
+    /// The hb_rational_t.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct hb_rational_t
+    {
+        /// <summary>
+        /// The num. W
+        /// </summary>
+        public int num;
+
+        /// <summary>
+        /// The den. H
+        /// </summary>
+        public int den;
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_image_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs
index 764a3ea43..2d2632622 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_image_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs
@@ -1,41 +1,41 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_image_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the hb_image_s type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// The hb_image_s.
-    /// </summary>
-    internal struct hb_image_s
-    {
-        public int format;
-        public int width;
-        public int height;
-        public IntPtr data;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
-        public image_plane[] plane;
-    }
-
-    /// <summary>
-    /// The image_plane.
-    /// </summary>
-    internal struct image_plane
-    {
-        public IntPtr data;
-        public int width;
-        public int height;
-        public int stride;
-        public int height_stride;
-        public int size;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_image_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the hb_image_s type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// The hb_image_s.
+    /// </summary>
+    internal struct hb_image_s
+    {
+        public int format;
+        public int width;
+        public int height;
+        public IntPtr data;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
+        public image_plane[] plane;
+    }
+
+    /// <summary>
+    /// The image_plane.
+    /// </summary>
+    internal struct image_plane
+    {
+        public IntPtr data;
+        public int width;
+        public int height;
+        public int stride;
+        public int height_stride;
+        public int size;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_mixdown_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_mixdown_s.cs
index 726ebf226..06fb6af6b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_mixdown_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_mixdown_s.cs
@@ -1,25 +1,25 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_mixdown_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct hb_mixdown_s
-    {
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string name;
-
-        /// char*
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string short_name;
-
-        /// int
-        public int amixdown;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_mixdown_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct hb_mixdown_s
+    {
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string name;
+
+        /// char*
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string short_name;
+
+        /// int
+        public int amixdown;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_rate_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_rate_s.cs
index 5a4f48b4a..f10c320ce 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_rate_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_rate_s.cs
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_rate_s.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct hb_rate_s
-    {
-        /// char*
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string name;
-
-        /// int
-        public int rate;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_rate_s.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct hb_rate_s
+    {
+        /// char*
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string name;
+
+        /// int
+        public int rate;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_subtitle.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_subtitle.cs
index 4d0351814..0cfb0038b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_subtitle.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_subtitle.cs
@@ -1,28 +1,28 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_subtitle.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    public enum hb_subtitle_s_subsource
-    {
-        VOBSUB,
-
-        SRTSUB,
-
-        CC608SUB,
-
-        CC708SUB,
-
-        UTF8SUB,
-
-        TX3GSUB,
-
-        SSASUB,
-
-        PGSSUB
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_subtitle.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file  </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    public enum hb_subtitle_s_subsource
+    {
+        VOBSUB,
+
+        SRTSUB,
+
+        CC608SUB,
+
+        CC708SUB,
+
+        UTF8SUB,
+
+        TX3GSUB,
+
+        SSASUB,
+
+        PGSSUB
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/iso639_lang_t.cs b/win/CS/HandBrake.Interop/Interop/HbLib/iso639_lang_t.cs
index 86aa71dd8..8a9d8ab64 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/iso639_lang_t.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/iso639_lang_t.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="iso639_lang_t.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.HbLib
-{
-    using System;
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct iso639_lang_t
-    {
-        public IntPtr eng_name;
-
-        public IntPtr native_name;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string iso639_1;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string iso639_2;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        public string iso639_2b;
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="iso639_lang_t.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.HbLib
+{
+    using System;
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct iso639_lang_t
+    {
+        public IntPtr eng_name;
+
+        public IntPtr native_name;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string iso639_1;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string iso639_2;
+
+        [MarshalAs(UnmanagedType.LPStr)]
+        public string iso639_2b;
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/InteropUtilities.cs b/win/CS/HandBrake.Interop/Interop/Helpers/InteropUtilities.cs
index 95c43aee8..c63fde326 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/InteropUtilities.cs
+++ b/win/CS/HandBrake.Interop/Interop/Helpers/InteropUtilities.cs
@@ -1,283 +1,283 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InteropUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Helper utilities for native interop.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Helpers
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-
-    /// <summary>
-    /// Helper utilities for native interop.
-    /// </summary>
-    internal static class InteropUtilities
-    {
-        /// <summary>
-        /// Reads the given native structure pointer.
-        /// </summary>
-        /// <typeparam name="T">The type to convert the structure to.</typeparam>
-        /// <param name="structPtr">The pointer to the native structure.</param>
-        /// <returns>The converted structure.</returns>
-        public static T ToStructureFromPtr<T>(IntPtr structPtr)
-        {
-            return (T)Marshal.PtrToStructure(structPtr, typeof(T));
-        }
-
-        /// <summary>
-        /// Reads the given native UTF-8 string.
-        /// </summary>
-        /// <param name="stringPtr">The pointer to the string.</param>
-        /// <returns>The resulting string.</returns>
-        public static string ToStringFromUtf8Ptr(IntPtr stringPtr)
-        {
-            var data = new List<byte>();
-            var ptr = stringPtr;
-            var offset = 0;
-            while (true)
-            {
-                byte ch = Marshal.ReadByte(ptr, offset++);
-                if (ch == 0)
-                {
-                    break;
-                }
-
-                data.Add(ch);
-            }
-
-            return Encoding.UTF8.GetString(data.ToArray());
-        }
-
-        /// <summary>
-        /// Creates a pointer to a UTF-8 null-terminated string.
-        /// </summary>
-        /// <param name="str">
-        /// The string to encode.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IntPtr"/>.
-        /// </returns>
-        public static IntPtr ToUtf8PtrFromString(string str)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(str);
-            IntPtr stringPtr = Marshal.AllocHGlobal(bytes.Length + 1);
-            var offset = 0;
-            foreach (byte b in bytes)
-            {
-                Marshal.WriteByte(stringPtr, offset, b);
-                offset++;
-            }
-
-            Marshal.WriteByte(stringPtr, offset, 0);
-            return stringPtr;
-        }
-
-        /// <summary>
-        /// Converts the given native HandBrake list to a managed list.
-        /// </summary>
-        /// <typeparam name="T">The type of structure in the list.</typeparam>
-        /// <param name="listPtr">The pointer to the native list.</param>
-        /// <returns>The converted managed list.</returns>
-        public static List<T> ToListFromHandBrakeList<T>(this IntPtr listPtr)
-        {
-            List<T> returnList = new List<T>();
-            NativeList nativeList = new NativeList(listPtr);
-
-            for (int i = 0; i < nativeList.Count; i++)
-            {
-                IntPtr itemPtr = nativeList[i];
-                returnList.Add(ToStructureFromPtr<T>(itemPtr));
-            }
-
-            return returnList;
-        }
-
-        /// <summary>
-        /// Converts the HB list to a managed list of pointers.
-        /// </summary>
-        /// <param name="listPtr">The list to convert.</param>
-        /// <returns>The managed list of pointers.</returns>
-        public static List<IntPtr> ToIntPtrList(this IntPtr listPtr)
-        {
-            var returnList = new List<IntPtr>();
-            NativeList nativeList = new NativeList(listPtr);
-
-            for (int i = 0; i < nativeList.Count; i++)
-            {
-                IntPtr itemPtr = nativeList[i];
-                returnList.Add(itemPtr);
-            }
-
-            return returnList;
-        }
-
-        /// <summary>
-        /// Converts the given native array to a managed collection.
-        /// </summary>
-        /// <typeparam name="T">The type of item in the list.</typeparam>
-        /// <param name="arrayPtr">The pointer to the array.</param>
-        /// <param name="count">The number of items in the array.</param>
-        /// <returns>The converted collection.</returns>
-        public static List<T> ToListFromNativeArray<T>(IntPtr arrayPtr, int count)
-        {
-            IntPtr currentItem = arrayPtr;
-
-            var result = new List<T>();
-            for (int i = 0; i < count; i++)
-            {
-                T nativeEncoder = ToStructureFromPtr<T>(currentItem);
-                result.Add(nativeEncoder);
-
-                currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Takes an array pointer and converts it into a list of strings.
-        /// </summary>
-        /// <param name="arrayPtr">A pointer to a raw list of strings.</param>
-        /// <returns>The list of strings.</returns>
-        public static List<string> ToStringListFromArrayPtr(IntPtr arrayPtr)
-        {
-            if (arrayPtr == IntPtr.Zero)
-            {
-                return null;
-            }
-
-            return ToPtrListFromPtr(arrayPtr).Select(ptr => Marshal.PtrToStringAnsi(ptr)).ToList();
-        }
-
-        /// <summary>
-        /// Finds all the pointers starting at the given location and puts them in a list. Stops when it finds zero for a pointer.
-        /// </summary>
-        /// <param name="arrayPtr">The address of the list of pointers.</param>
-        /// <returns>The list of pointers.</returns>
-        public static List<IntPtr> ToPtrListFromPtr(IntPtr arrayPtr)
-        {
-            var result = new List<IntPtr>();
-            int ptrSize = Marshal.SizeOf(typeof(IntPtr));
-            IntPtr currentPtr = Marshal.ReadIntPtr(arrayPtr);
-            for (int i = 0; currentPtr != IntPtr.Zero; i++)
-            {
-                result.Add(currentPtr);
-                currentPtr = Marshal.ReadIntPtr(arrayPtr, (i + 1) * ptrSize);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Creates a native HandBrake list from the given managed list of pointers.
-        /// </summary>
-        /// <param name="list">The managed list to convert.</param>
-        /// <returns>The converted native list.</returns>
-        public static NativeList ToHandBrakeListFromPtrList(List<IntPtr> list)
-        {
-            NativeList returnList = NativeList.CreateList();
-
-            foreach (IntPtr ptr in list)
-            {
-                returnList.Add(ptr);
-            }
-
-            return returnList;
-        }
-
-        /// <summary>
-        /// Creates a native HandBrake list from the given managed list of structures.
-        /// </summary>
-        /// <typeparam name="T">The type of structures in the list.</typeparam>
-        /// <param name="list">The managed list to convert.</param>
-        /// <returns>The converted native list.</returns>
-        public static NativeList ToHandBrakeListFromList<T>(List<T> list)
-        {
-            NativeList returnList = NativeList.CreateList();
-            foreach (T item in list)
-            {
-                IntPtr itemPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(T)));
-                returnList.AllocatedMemory.Add(itemPtr);
-                Marshal.StructureToPtr(item, itemPtr, false);
-
-                returnList.Add(itemPtr);
-            }
-
-            return returnList;
-        }
-
-        /// <summary>
-        /// Reads in a list of objects given an iterator and a conversion function.
-        /// </summary>
-        /// <typeparam name="T1">The type of the struct given by the iterator.</typeparam>
-        /// <typeparam name="T2">The object type to convert to.</typeparam>
-        /// <param name="iterator">The iterator to use to build the list.</param>
-        /// <param name="converter">The converter to convert from the struct to the object.</param>
-        /// <returns>The list of objects.</returns>
-        public static List<T2> ToListFromIterator<T1, T2>(Func<IntPtr, IntPtr> iterator, Func<T1, T2> converter)
-        {
-            return ToListFromIterator<T1>(iterator).Select(converter).ToList();
-        } 
-
-        /// <summary>
-        /// Reads in a list of structs given an iterator.
-        /// </summary>
-        /// <typeparam name="T">The type of the struct.</typeparam>
-        /// <param name="iterator">The iterator to use to build the list.</param>
-        /// <returns>The list of structs.</returns>
-        public static List<T> ToListFromIterator<T>(Func<IntPtr, IntPtr> iterator)
-        {
-            var structureList = new List<T>();
-            IntPtr current = IntPtr.Zero;
-
-            current = iterator(current);
-            while (current != IntPtr.Zero)
-            {
-                T encoder = ToStructureFromPtr<T>(current);
-                structureList.Add(encoder);
-
-                current = iterator(current);
-            }
-
-            return structureList;
-        }
-
-        /// <summary>
-        /// Closes the given job.
-        /// </summary>
-        /// <param name="nativeJobPtr">The pointer to the job.</param>
-        public static void CloseJob(IntPtr nativeJobPtr)
-        {
-            // Create a point to the job pointer first.
-            IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-
-            // Assign the new pointer to the job pointer and tell HB to clean the job up.
-            Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
-            HBFunctions.hb_job_close(nativeJobPtrPtr);
-
-            // Free the pointer we used.
-            Marshal.FreeHGlobal(nativeJobPtrPtr);
-        }
-
-        /// <summary>
-        /// Frees all the memory locations in the given list.
-        /// </summary>
-        /// <param name="memoryList">The list of memory locations to free.</param>
-        public static void FreeMemory(List<IntPtr> memoryList)
-        {
-            foreach (IntPtr memoryLocation in memoryList)
-            {
-                Marshal.FreeHGlobal(memoryLocation);
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InteropUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Helper utilities for native interop.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Helpers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    using HandBrake.Interop.Interop.HbLib;
+
+    /// <summary>
+    /// Helper utilities for native interop.
+    /// </summary>
+    internal static class InteropUtilities
+    {
+        /// <summary>
+        /// Reads the given native structure pointer.
+        /// </summary>
+        /// <typeparam name="T">The type to convert the structure to.</typeparam>
+        /// <param name="structPtr">The pointer to the native structure.</param>
+        /// <returns>The converted structure.</returns>
+        public static T ToStructureFromPtr<T>(IntPtr structPtr)
+        {
+            return (T)Marshal.PtrToStructure(structPtr, typeof(T));
+        }
+
+        /// <summary>
+        /// Reads the given native UTF-8 string.
+        /// </summary>
+        /// <param name="stringPtr">The pointer to the string.</param>
+        /// <returns>The resulting string.</returns>
+        public static string ToStringFromUtf8Ptr(IntPtr stringPtr)
+        {
+            var data = new List<byte>();
+            var ptr = stringPtr;
+            var offset = 0;
+            while (true)
+            {
+                byte ch = Marshal.ReadByte(ptr, offset++);
+                if (ch == 0)
+                {
+                    break;
+                }
+
+                data.Add(ch);
+            }
+
+            return Encoding.UTF8.GetString(data.ToArray());
+        }
+
+        /// <summary>
+        /// Creates a pointer to a UTF-8 null-terminated string.
+        /// </summary>
+        /// <param name="str">
+        /// The string to encode.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IntPtr"/>.
+        /// </returns>
+        public static IntPtr ToUtf8PtrFromString(string str)
+        {
+            byte[] bytes = Encoding.UTF8.GetBytes(str);
+            IntPtr stringPtr = Marshal.AllocHGlobal(bytes.Length + 1);
+            var offset = 0;
+            foreach (byte b in bytes)
+            {
+                Marshal.WriteByte(stringPtr, offset, b);
+                offset++;
+            }
+
+            Marshal.WriteByte(stringPtr, offset, 0);
+            return stringPtr;
+        }
+
+        /// <summary>
+        /// Converts the given native HandBrake list to a managed list.
+        /// </summary>
+        /// <typeparam name="T">The type of structure in the list.</typeparam>
+        /// <param name="listPtr">The pointer to the native list.</param>
+        /// <returns>The converted managed list.</returns>
+        public static List<T> ToListFromHandBrakeList<T>(this IntPtr listPtr)
+        {
+            List<T> returnList = new List<T>();
+            NativeList nativeList = new NativeList(listPtr);
+
+            for (int i = 0; i < nativeList.Count; i++)
+            {
+                IntPtr itemPtr = nativeList[i];
+                returnList.Add(ToStructureFromPtr<T>(itemPtr));
+            }
+
+            return returnList;
+        }
+
+        /// <summary>
+        /// Converts the HB list to a managed list of pointers.
+        /// </summary>
+        /// <param name="listPtr">The list to convert.</param>
+        /// <returns>The managed list of pointers.</returns>
+        public static List<IntPtr> ToIntPtrList(this IntPtr listPtr)
+        {
+            var returnList = new List<IntPtr>();
+            NativeList nativeList = new NativeList(listPtr);
+
+            for (int i = 0; i < nativeList.Count; i++)
+            {
+                IntPtr itemPtr = nativeList[i];
+                returnList.Add(itemPtr);
+            }
+
+            return returnList;
+        }
+
+        /// <summary>
+        /// Converts the given native array to a managed collection.
+        /// </summary>
+        /// <typeparam name="T">The type of item in the list.</typeparam>
+        /// <param name="arrayPtr">The pointer to the array.</param>
+        /// <param name="count">The number of items in the array.</param>
+        /// <returns>The converted collection.</returns>
+        public static List<T> ToListFromNativeArray<T>(IntPtr arrayPtr, int count)
+        {
+            IntPtr currentItem = arrayPtr;
+
+            var result = new List<T>();
+            for (int i = 0; i < count; i++)
+            {
+                T nativeEncoder = ToStructureFromPtr<T>(currentItem);
+                result.Add(nativeEncoder);
+
+                currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Takes an array pointer and converts it into a list of strings.
+        /// </summary>
+        /// <param name="arrayPtr">A pointer to a raw list of strings.</param>
+        /// <returns>The list of strings.</returns>
+        public static List<string> ToStringListFromArrayPtr(IntPtr arrayPtr)
+        {
+            if (arrayPtr == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            return ToPtrListFromPtr(arrayPtr).Select(ptr => Marshal.PtrToStringAnsi(ptr)).ToList();
+        }
+
+        /// <summary>
+        /// Finds all the pointers starting at the given location and puts them in a list. Stops when it finds zero for a pointer.
+        /// </summary>
+        /// <param name="arrayPtr">The address of the list of pointers.</param>
+        /// <returns>The list of pointers.</returns>
+        public static List<IntPtr> ToPtrListFromPtr(IntPtr arrayPtr)
+        {
+            var result = new List<IntPtr>();
+            int ptrSize = Marshal.SizeOf(typeof(IntPtr));
+            IntPtr currentPtr = Marshal.ReadIntPtr(arrayPtr);
+            for (int i = 0; currentPtr != IntPtr.Zero; i++)
+            {
+                result.Add(currentPtr);
+                currentPtr = Marshal.ReadIntPtr(arrayPtr, (i + 1) * ptrSize);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a native HandBrake list from the given managed list of pointers.
+        /// </summary>
+        /// <param name="list">The managed list to convert.</param>
+        /// <returns>The converted native list.</returns>
+        public static NativeList ToHandBrakeListFromPtrList(List<IntPtr> list)
+        {
+            NativeList returnList = NativeList.CreateList();
+
+            foreach (IntPtr ptr in list)
+            {
+                returnList.Add(ptr);
+            }
+
+            return returnList;
+        }
+
+        /// <summary>
+        /// Creates a native HandBrake list from the given managed list of structures.
+        /// </summary>
+        /// <typeparam name="T">The type of structures in the list.</typeparam>
+        /// <param name="list">The managed list to convert.</param>
+        /// <returns>The converted native list.</returns>
+        public static NativeList ToHandBrakeListFromList<T>(List<T> list)
+        {
+            NativeList returnList = NativeList.CreateList();
+            foreach (T item in list)
+            {
+                IntPtr itemPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(T)));
+                returnList.AllocatedMemory.Add(itemPtr);
+                Marshal.StructureToPtr(item, itemPtr, false);
+
+                returnList.Add(itemPtr);
+            }
+
+            return returnList;
+        }
+
+        /// <summary>
+        /// Reads in a list of objects given an iterator and a conversion function.
+        /// </summary>
+        /// <typeparam name="T1">The type of the struct given by the iterator.</typeparam>
+        /// <typeparam name="T2">The object type to convert to.</typeparam>
+        /// <param name="iterator">The iterator to use to build the list.</param>
+        /// <param name="converter">The converter to convert from the struct to the object.</param>
+        /// <returns>The list of objects.</returns>
+        public static List<T2> ToListFromIterator<T1, T2>(Func<IntPtr, IntPtr> iterator, Func<T1, T2> converter)
+        {
+            return ToListFromIterator<T1>(iterator).Select(converter).ToList();
+        } 
+
+        /// <summary>
+        /// Reads in a list of structs given an iterator.
+        /// </summary>
+        /// <typeparam name="T">The type of the struct.</typeparam>
+        /// <param name="iterator">The iterator to use to build the list.</param>
+        /// <returns>The list of structs.</returns>
+        public static List<T> ToListFromIterator<T>(Func<IntPtr, IntPtr> iterator)
+        {
+            var structureList = new List<T>();
+            IntPtr current = IntPtr.Zero;
+
+            current = iterator(current);
+            while (current != IntPtr.Zero)
+            {
+                T encoder = ToStructureFromPtr<T>(current);
+                structureList.Add(encoder);
+
+                current = iterator(current);
+            }
+
+            return structureList;
+        }
+
+        /// <summary>
+        /// Closes the given job.
+        /// </summary>
+        /// <param name="nativeJobPtr">The pointer to the job.</param>
+        public static void CloseJob(IntPtr nativeJobPtr)
+        {
+            // Create a point to the job pointer first.
+            IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+
+            // Assign the new pointer to the job pointer and tell HB to clean the job up.
+            Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
+            HBFunctions.hb_job_close(nativeJobPtrPtr);
+
+            // Free the pointer we used.
+            Marshal.FreeHGlobal(nativeJobPtrPtr);
+        }
+
+        /// <summary>
+        /// Frees all the memory locations in the given list.
+        /// </summary>
+        /// <param name="memoryList">The list of memory locations to free.</param>
+        public static void FreeMemory(List<IntPtr> memoryList)
+        {
+            foreach (IntPtr memoryLocation in memoryList)
+            {
+                Marshal.FreeHGlobal(memoryLocation);
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/NativeList.cs b/win/CS/HandBrake.Interop/Interop/Helpers/NativeList.cs
index a692b6c75..dc0f9c3db 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/NativeList.cs
+++ b/win/CS/HandBrake.Interop/Interop/Helpers/NativeList.cs
@@ -1,127 +1,127 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NativeList.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents a HandBrake style native list.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Helpers
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Runtime.InteropServices;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-
-    /// <summary>
-    /// Represents a HandBrake style native list.
-    /// </summary>
-    internal class NativeList : IDisposable
-    {
-        /// <summary>
-        /// Initializes a new instance of the NativeList class.
-        /// </summary>
-        /// <param name="listPtr">The pointer to use for the list.</param>
-        public NativeList(IntPtr listPtr)
-        {
-            this.Ptr = listPtr;
-        }
-
-        /// <summary>
-        /// The list of native memory locations allocated for this list.
-        /// </summary>
-        private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
-
-        /// <summary>
-        /// Gets the pointer to the native list.
-        /// </summary>
-        public IntPtr Ptr { get; private set; }
-
-        /// <summary>
-        /// Gets the number of items in the list.
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                Debug.WriteLine("Got a Zero Pointer in the NativeList");
-                return this.Ptr == IntPtr.Zero ? 0 : HBFunctions.hb_list_count(this.Ptr);
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of native memory locations allocated for this list.
-        /// </summary>
-        public List<IntPtr> AllocatedMemory
-        {
-            get
-            {
-                return this.allocatedMemory;
-            }
-        }
-
-        /// <summary>
-        /// Adds an item to the end of the list.
-        /// </summary>
-        /// <param name="item">The item to add.</param>
-        public void Add(IntPtr item)
-        {
-            HBFunctions.hb_list_add(this.Ptr, item);
-        }
-
-        /// <summary>
-        /// Inserts an item into the list.
-        /// </summary>
-        /// <param name="position">The index to insert the item at.</param>
-        /// <param name="item">The item to insert.</param>
-        public void Insert(int position, IntPtr item)
-        {
-            HBFunctions.hb_list_insert(this.Ptr, position, item);
-        }
-
-        /// <summary>
-        /// Removes an item from the list.
-        /// </summary>
-        /// <param name="item">The item to remove.</param>
-        public void Remove(IntPtr item)
-        {
-            HBFunctions.hb_list_rem(this.Ptr, item);
-        }
-
-        /// <summary>
-        /// Gets an item out of the list.
-        /// </summary>
-        /// <param name="i">Index in the list.</param>
-        /// <returns>The item at that index in the list.</returns>
-        public IntPtr this[int i]
-        {
-            get
-            {
-                return HBFunctions.hb_list_item(this.Ptr, i);
-            }
-        }
-
-        /// <summary>
-        /// Disposes resources associated with this object.
-        /// </summary>
-        public void Dispose()
-        {
-            IntPtr listPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-            Marshal.WriteIntPtr(listPtrPtr, this.Ptr);
-            HBFunctions.hb_list_close(listPtrPtr);
-            Marshal.FreeHGlobal(listPtrPtr);
-        }
-
-        /// <summary>
-        /// Creates a new list in unmanaged memory.
-        /// </summary>
-        /// <returns>The created list.</returns>
-        public static NativeList CreateList()
-        {
-            return new NativeList(HBFunctions.hb_list_init());
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NativeList.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents a HandBrake style native list.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Helpers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Runtime.InteropServices;
+
+    using HandBrake.Interop.Interop.HbLib;
+
+    /// <summary>
+    /// Represents a HandBrake style native list.
+    /// </summary>
+    internal class NativeList : IDisposable
+    {
+        /// <summary>
+        /// Initializes a new instance of the NativeList class.
+        /// </summary>
+        /// <param name="listPtr">The pointer to use for the list.</param>
+        public NativeList(IntPtr listPtr)
+        {
+            this.Ptr = listPtr;
+        }
+
+        /// <summary>
+        /// The list of native memory locations allocated for this list.
+        /// </summary>
+        private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
+
+        /// <summary>
+        /// Gets the pointer to the native list.
+        /// </summary>
+        public IntPtr Ptr { get; private set; }
+
+        /// <summary>
+        /// Gets the number of items in the list.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                Debug.WriteLine("Got a Zero Pointer in the NativeList");
+                return this.Ptr == IntPtr.Zero ? 0 : HBFunctions.hb_list_count(this.Ptr);
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of native memory locations allocated for this list.
+        /// </summary>
+        public List<IntPtr> AllocatedMemory
+        {
+            get
+            {
+                return this.allocatedMemory;
+            }
+        }
+
+        /// <summary>
+        /// Adds an item to the end of the list.
+        /// </summary>
+        /// <param name="item">The item to add.</param>
+        public void Add(IntPtr item)
+        {
+            HBFunctions.hb_list_add(this.Ptr, item);
+        }
+
+        /// <summary>
+        /// Inserts an item into the list.
+        /// </summary>
+        /// <param name="position">The index to insert the item at.</param>
+        /// <param name="item">The item to insert.</param>
+        public void Insert(int position, IntPtr item)
+        {
+            HBFunctions.hb_list_insert(this.Ptr, position, item);
+        }
+
+        /// <summary>
+        /// Removes an item from the list.
+        /// </summary>
+        /// <param name="item">The item to remove.</param>
+        public void Remove(IntPtr item)
+        {
+            HBFunctions.hb_list_rem(this.Ptr, item);
+        }
+
+        /// <summary>
+        /// Gets an item out of the list.
+        /// </summary>
+        /// <param name="i">Index in the list.</param>
+        /// <returns>The item at that index in the list.</returns>
+        public IntPtr this[int i]
+        {
+            get
+            {
+                return HBFunctions.hb_list_item(this.Ptr, i);
+            }
+        }
+
+        /// <summary>
+        /// Disposes resources associated with this object.
+        /// </summary>
+        public void Dispose()
+        {
+            IntPtr listPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+            Marshal.WriteIntPtr(listPtrPtr, this.Ptr);
+            HBFunctions.hb_list_close(listPtrPtr);
+            Marshal.FreeHGlobal(listPtrPtr);
+        }
+
+        /// <summary>
+        /// Creates a new list in unmanaged memory.
+        /// </summary>
+        /// <returns>The created list.</returns>
+        public static NativeList CreateList()
+        {
+            return new NativeList(HBFunctions.hb_list_init());
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/Utilities.cs b/win/CS/HandBrake.Interop/Interop/Helpers/Utilities.cs
index eba89bcaa..369216023 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Helpers/Utilities.cs
+++ b/win/CS/HandBrake.Interop/Interop/Helpers/Utilities.cs
@@ -1,49 +1,49 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Utilities.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Utilities type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Helpers
-{
-    /// <summary>
-    /// The utilities.
-    /// </summary>
-    internal static class Utilities
-    {
-        /// <summary>
-        /// Get the Greatest Common Factor
-        /// </summary>
-        /// <param name="a">
-        /// The a.
-        /// </param>
-        /// <param name="b">
-        /// The b.
-        /// </param>
-        /// <returns>
-        /// The greatest common factor
-        /// </returns>
-        public static int GreatestCommonFactor(int a, int b)
-        {
-            if (a == 0)
-            {
-                return b;
-            }
-
-            if (b == 0)
-            {
-                return a;
-            }
-
-            if (a > b)
-            {
-                return GreatestCommonFactor(a % b, b);
-            }
-            
-            return GreatestCommonFactor(a, b % a);
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Utilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Utilities type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Helpers
+{
+    /// <summary>
+    /// The utilities.
+    /// </summary>
+    internal static class Utilities
+    {
+        /// <summary>
+        /// Get the Greatest Common Factor
+        /// </summary>
+        /// <param name="a">
+        /// The a.
+        /// </param>
+        /// <param name="b">
+        /// The b.
+        /// </param>
+        /// <returns>
+        /// The greatest common factor
+        /// </returns>
+        public static int GreatestCommonFactor(int a, int b)
+        {
+            if (a == 0)
+            {
+                return b;
+            }
+
+            if (b == 0)
+            {
+                return a;
+            }
+
+            if (a > b)
+            {
+                return GreatestCommonFactor(a % b, b);
+            }
+            
+            return GreatestCommonFactor(a, b % a);
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
index 3f61499b9..7714e5222 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
@@ -1,151 +1,151 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IHandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The Interface for HandBrakeInstance
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Interfaces
-{
-    using System;
-
-    using HandBrake.ApplicationServices.Interop.EventArgs;
-    using HandBrake.ApplicationServices.Interop.Json.Encode;
-    using HandBrake.ApplicationServices.Interop.Json.Scan;
-    using HandBrake.ApplicationServices.Interop.Model.Preview;
-
-    /// <summary>
-    /// The Interface for HandBrakeInstance
-    /// </summary>
-    public interface IHandBrakeInstance
-    {
-        #region Events
-
-        /// <summary>
-        /// Fires when an encode has completed.
-        /// </summary>
-        event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
-
-        /// <summary>
-        /// Fires for progress updates when encoding.
-        /// </summary>
-        event EventHandler<EncodeProgressEventArgs> EncodeProgress;
-
-        /// <summary>
-        /// Fires when a scan has completed.
-        /// </summary>
-        event EventHandler<EventArgs> ScanCompleted;
-
-        /// <summary>
-        /// Fires for progress updates when scanning.
-        /// </summary>
-        event EventHandler<ScanProgressEventArgs> ScanProgress;
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the index of the default title.
-        /// </summary>
-        int FeatureTitle { get; }
-
-        /// <summary>
-        /// Gets the list of titles on this instance.
-        /// </summary>
-        JsonScanObject Titles { get; }
-
-        /// <summary>
-        /// Gets the HandBrake version string.
-        /// </summary>
-        string Version { get; }
-
-        /// <summary>
-        /// Gets the HandBrake build number.
-        /// </summary>
-        int Build { get; }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Initializes this instance.
-        /// </summary>
-        /// <param name="verbosity">
-        /// The code for the logging verbosity to use.
-        /// </param>
-        void Initialize(int verbosity);
-
-        /// <summary>
-        /// Frees any resources associated with this object.
-        /// </summary>
-        void Dispose();
-
-        /// <summary>
-        /// Gets an image for the given job and preview
-        /// </summary>
-        /// <remarks>
-        /// Only incorporates sizing and aspect ratio into preview image.
-        /// </remarks>
-        /// <param name="job">
-        /// The encode job to preview.
-        /// </param>
-        /// <param name="previewNumber">
-        /// The index of the preview to get (0-based).
-        /// </param>
-        /// <param name="deinterlace">
-        /// True to enable basic deinterlace of preview images.
-        /// </param>
-        /// <returns>
-        /// An image with the requested preview.
-        /// </returns>
-        RawPreviewData GetPreview(PreviewSettings job, int previewNumber, bool deinterlace);
-
-        /// <summary>
-        /// Pauses the current encode.
-        /// </summary>
-        void PauseEncode();
-
-        /// <summary>
-        /// Resumes a paused encode.
-        /// </summary>
-        void ResumeEncode();
-
-        /// <summary>
-        /// Starts an encode with the given job.
-        /// </summary>
-        /// <param name="jobToStart">
-        /// The job to start.
-        /// </param>
-        void StartEncode(JsonEncodeObject jobToStart);
-
-        /// <summary>
-        /// Starts a scan of the given path.
-        /// </summary>
-        /// <param name="path">
-        /// The path of the video to scan.
-        /// </param>
-        /// <param name="previewCount">
-        /// The number of previews to make on each title.
-        /// </param>
-        /// <param name="minDuration">
-        /// The min Duration.
-        /// </param>
-        void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex);
-
-        /// <summary>
-        /// Stops the current encode.
-        /// </summary>
-        void StopEncode();
-
-        /// <summary>
-        /// Stop any running scans
-        /// </summary>
-        void StopScan();
-
-        #endregion
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IHandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The Interface for HandBrakeInstance
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces
+{
+    using System;
+
+    using HandBrake.Interop.Interop.EventArgs;
+    using HandBrake.Interop.Interop.Json.Encode;
+    using HandBrake.Interop.Interop.Json.Scan;
+    using HandBrake.Interop.Interop.Model.Preview;
+
+    /// <summary>
+    /// The Interface for HandBrakeInstance
+    /// </summary>
+    public interface IHandBrakeInstance
+    {
+        #region Events
+
+        /// <summary>
+        /// Fires when an encode has completed.
+        /// </summary>
+        event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
+
+        /// <summary>
+        /// Fires for progress updates when encoding.
+        /// </summary>
+        event EventHandler<EncodeProgressEventArgs> EncodeProgress;
+
+        /// <summary>
+        /// Fires when a scan has completed.
+        /// </summary>
+        event EventHandler<EventArgs> ScanCompleted;
+
+        /// <summary>
+        /// Fires for progress updates when scanning.
+        /// </summary>
+        event EventHandler<ScanProgressEventArgs> ScanProgress;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the index of the default title.
+        /// </summary>
+        int FeatureTitle { get; }
+
+        /// <summary>
+        /// Gets the list of titles on this instance.
+        /// </summary>
+        JsonScanObject Titles { get; }
+
+        /// <summary>
+        /// Gets the HandBrake version string.
+        /// </summary>
+        string Version { get; }
+
+        /// <summary>
+        /// Gets the HandBrake build number.
+        /// </summary>
+        int Build { get; }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Initializes this instance.
+        /// </summary>
+        /// <param name="verbosity">
+        /// The code for the logging verbosity to use.
+        /// </param>
+        void Initialize(int verbosity);
+
+        /// <summary>
+        /// Frees any resources associated with this object.
+        /// </summary>
+        void Dispose();
+
+        /// <summary>
+        /// Gets an image for the given job and preview
+        /// </summary>
+        /// <remarks>
+        /// Only incorporates sizing and aspect ratio into preview image.
+        /// </remarks>
+        /// <param name="job">
+        /// The encode job to preview.
+        /// </param>
+        /// <param name="previewNumber">
+        /// The index of the preview to get (0-based).
+        /// </param>
+        /// <param name="deinterlace">
+        /// True to enable basic deinterlace of preview images.
+        /// </param>
+        /// <returns>
+        /// An image with the requested preview.
+        /// </returns>
+        RawPreviewData GetPreview(PreviewSettings job, int previewNumber, bool deinterlace);
+
+        /// <summary>
+        /// Pauses the current encode.
+        /// </summary>
+        void PauseEncode();
+
+        /// <summary>
+        /// Resumes a paused encode.
+        /// </summary>
+        void ResumeEncode();
+
+        /// <summary>
+        /// Starts an encode with the given job.
+        /// </summary>
+        /// <param name="jobToStart">
+        /// The job to start.
+        /// </param>
+        void StartEncode(JsonEncodeObject jobToStart);
+
+        /// <summary>
+        /// Starts a scan of the given path.
+        /// </summary>
+        /// <param name="path">
+        /// The path of the video to scan.
+        /// </param>
+        /// <param name="previewCount">
+        /// The number of previews to make on each title.
+        /// </param>
+        /// <param name="minDuration">
+        /// The min Duration.
+        /// </param>
+        void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex);
+
+        /// <summary>
+        /// Stops the current encode.
+        /// </summary>
+        void StopEncode();
+
+        /// <summary>
+        /// Stop any running scans
+        /// </summary>
+        void StopScan();
+
+        #endregion
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs b/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/AnamorphicGeometry.cs
index 96e257b57..6f6714caa 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/AnamorphicGeometry.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AnamorphicGeometry.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The geometry.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
-{
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-
-    /// <summary>
-    /// The geometry.
-    /// </summary>
-    public class AnamorphicGeometry
-    {
-        /// <summary>
-        /// Gets or sets the dest geometry.
-        /// </summary>
-        public DestSettings DestSettings { get; set; }
-
-        /// <summary>
-        /// Gets or sets the source geometry.
-        /// </summary>
-        public Geometry SourceGeometry { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AnamorphicGeometry.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The geometry.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Anamorphic
+{
+    using HandBrake.Interop.Interop.Json.Shared;
+
+    /// <summary>
+    /// The geometry.
+    /// </summary>
+    public class AnamorphicGeometry
+    {
+        /// <summary>
+        /// Gets or sets the dest geometry.
+        /// </summary>
+        public DestSettings DestSettings { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source geometry.
+        /// </summary>
+        public Geometry SourceGeometry { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs b/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/DestSettings.cs
index 28971308b..99f38439b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/DestSettings.cs
@@ -1,69 +1,69 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="DestSettings.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The dest geometry.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
-{
-    using System.Collections.Generic;
-
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-
-    /// <summary>
-    /// The dest geometry.
-    /// </summary>
-    public class DestSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DestSettings"/> class.
-        /// </summary>
-        public DestSettings()
-        {
-            this.Geometry = new Geometry();
-        }
-
-        /// <summary>
-        /// Gets or sets the anamorphic mode.
-        /// </summary>
-        public int AnamorphicMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the crop.
-        /// </summary>
-        public List<int> Crop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Geometry
-        /// </summary>
-        public Geometry Geometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether itu par.
-        /// </summary>
-        public bool ItuPAR { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether keep display aspect.
-        /// </summary>
-        public int Keep { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max height.
-        /// </summary>
-        public int MaxHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max width.
-        /// </summary>
-        public int MaxWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the modulus.
-        /// </summary>
-        public int Modulus { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DestSettings.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The dest geometry.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Anamorphic
+{
+    using System.Collections.Generic;
+
+    using HandBrake.Interop.Interop.Json.Shared;
+
+    /// <summary>
+    /// The dest geometry.
+    /// </summary>
+    public class DestSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DestSettings"/> class.
+        /// </summary>
+        public DestSettings()
+        {
+            this.Geometry = new Geometry();
+        }
+
+        /// <summary>
+        /// Gets or sets the anamorphic mode.
+        /// </summary>
+        public int AnamorphicMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the crop.
+        /// </summary>
+        public List<int> Crop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Geometry
+        /// </summary>
+        public Geometry Geometry { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether itu par.
+        /// </summary>
+        public bool ItuPAR { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether keep display aspect.
+        /// </summary>
+        public int Keep { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max height.
+        /// </summary>
+        public int MaxHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max width.
+        /// </summary>
+        public int MaxWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the modulus.
+        /// </summary>
+        public int Modulus { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs
index 4e4b61d6b..924185f50 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs
@@ -1,34 +1,34 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Audio.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The audio.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The audio.
-    /// </summary>
-    public class Audio
-    {
-        /// <summary>
-        /// Gets or sets the audio list.
-        /// </summary>
-        public List<AudioTrack> AudioList { get; set; }
-
-        /// <summary>
-        /// Gets or sets the copy mask.
-        /// </summary>
-        public uint[] CopyMask { get; set; }
-
-        /// <summary>
-        /// Gets or sets the fallback encoder.
-        /// </summary>
-        public int FallbackEncoder { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Audio.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The audio.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The audio.
+    /// </summary>
+    public class Audio
+    {
+        /// <summary>
+        /// Gets or sets the audio list.
+        /// </summary>
+        public List<AudioTrack> AudioList { get; set; }
+
+        /// <summary>
+        /// Gets or sets the copy mask.
+        /// </summary>
+        public uint[] CopyMask { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fallback encoder.
+        /// </summary>
+        public int FallbackEncoder { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs
index 2bde4cca4..64ef94fd7 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs
@@ -1,77 +1,77 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioTrack.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents an audio track to encode.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// Represents an audio track to encode.
-    /// </summary>
-    public class AudioTrack
-    {
-        /// <summary>
-        /// Gets or sets the bitrate.
-        /// </summary>
-        public int? Bitrate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the compression level.
-        /// </summary>
-        public double? CompressionLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the drc.
-        /// </summary>
-        public double DRC { get; set; }
-
-        /// <summary>
-        /// Gets or sets the encoder.
-        /// </summary>
-        public int Encoder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the gain.
-        /// </summary>
-        public double Gain { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mixdown.
-        /// </summary>
-        public int Mixdown { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether normalize mix level.
-        /// </summary>
-        public bool NormalizeMixLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the quality.
-        /// </summary>
-        public double? Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the samplerate.
-        /// </summary>
-        public int Samplerate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Name of the audio track.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the track.
-        /// </summary>
-        public int Track { get; set; }
-
-        /// <summary>
-        /// Gets or sets the dither method.
-        /// </summary>
-        public int DitherMethod { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioTrack.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents an audio track to encode.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents an audio track to encode.
+    /// </summary>
+    public class AudioTrack
+    {
+        /// <summary>
+        /// Gets or sets the bitrate.
+        /// </summary>
+        public int? Bitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the compression level.
+        /// </summary>
+        public double? CompressionLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the drc.
+        /// </summary>
+        public double DRC { get; set; }
+
+        /// <summary>
+        /// Gets or sets the encoder.
+        /// </summary>
+        public int Encoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the gain.
+        /// </summary>
+        public double Gain { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mixdown.
+        /// </summary>
+        public int Mixdown { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether normalize mix level.
+        /// </summary>
+        public bool NormalizeMixLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the quality.
+        /// </summary>
+        public double? Quality { get; set; }
+
+        /// <summary>
+        /// Gets or sets the samplerate.
+        /// </summary>
+        public int Samplerate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Name of the audio track.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the track.
+        /// </summary>
+        public int Track { get; set; }
+
+        /// <summary>
+        /// Gets or sets the dither method.
+        /// </summary>
+        public int DitherMethod { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Chapter.cs
index 95eeb0057..ae8924e5d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Chapter.cs
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Chapter.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents a chapter to encode.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// Represents a chapter to encode.
-    /// </summary>
-    public class Chapter
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Chapter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents a chapter to encode.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents a chapter to encode.
+    /// </summary>
+    public class Chapter
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs
index 910a541ca..0d8b2daeb 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs
@@ -1,49 +1,49 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Destination.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The destination.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The destination.
-    /// </summary>
-    public class Destination
-    {
-        /// <summary>
-        /// Gets or sets the chapter list.
-        /// </summary>
-        public List<Chapter> ChapterList { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether chapter markers.
-        /// </summary>
-        public bool ChapterMarkers { get; set; }
-
-        /// <summary>
-        /// Use Legacy A/V Alignment rather than Edit Lists.
-        /// </summary>
-        public bool AlignAVStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the file.
-        /// </summary>
-        public string File { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mp 4 options.
-        /// </summary>
-        public Mp4Options Mp4Options { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mux.
-        /// </summary>
-        public int Mux { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Destination.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The destination.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The destination.
+    /// </summary>
+    public class Destination
+    {
+        /// <summary>
+        /// Gets or sets the chapter list.
+        /// </summary>
+        public List<Chapter> ChapterList { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether chapter markers.
+        /// </summary>
+        public bool ChapterMarkers { get; set; }
+
+        /// <summary>
+        /// Use Legacy A/V Alignment rather than Edit Lists.
+        /// </summary>
+        public bool AlignAVStart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file.
+        /// </summary>
+        public string File { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mp 4 options.
+        /// </summary>
+        public Mp4Options Mp4Options { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mux.
+        /// </summary>
+        public int Mux { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Filter.cs
index 4479f5d77..9cd5161ac 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filter.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Filter.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Filter.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The filter list.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using Newtonsoft.Json.Linq;
-
-    /// <summary>
-    /// The filter list.
-    /// </summary>
-    public class Filter
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        public int ID { get; set; }
-
-        /// <summary>
-        /// Gets or sets the settings.
-        /// </summary>
-        public JToken Settings { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Filter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The filter list.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using Newtonsoft.Json.Linq;
+
+    /// <summary>
+    /// The filter list.
+    /// </summary>
+    public class Filter
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        public int ID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the settings.
+        /// </summary>
+        public JToken Settings { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Filters.cs
index 2e767b18a..9c664cfa5 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Filters.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Filters.cs
@@ -1,24 +1,24 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Filters.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The filter.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The filter.
-    /// </summary>
-    public class Filters
-    {
-        /// <summary>
-        /// Gets or sets the filter list.
-        /// </summary>
-        public List<Filter> FilterList { get; set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Filters.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The filter.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The filter.
+    /// </summary>
+    public class Filters
+    {
+        /// <summary>
+        /// Gets or sets the filter list.
+        /// </summary>
+        public List<Filter> FilterList { get; set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/JsonEncodeObject.cs
index 68baffcb4..fa3d26c26 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/JsonEncodeObject.cs
@@ -1,64 +1,64 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="JsonEncodeObject.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The root object.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-
-    /// <summary>
-    /// The root object.
-    /// </summary>
-    public class JsonEncodeObject
-    {
-        /// <summary>
-        /// Gets or sets the audio.
-        /// </summary>
-        public Audio Audio { get; set; }
-
-        /// <summary>
-        /// Gets or sets the destination.
-        /// </summary>
-        public Destination Destination { get; set; }
-
-        /// <summary>
-        /// Gets or sets the filter.
-        /// </summary>
-        public Filters Filters { get; set; }
-
-        /// <summary>
-        /// Gets or sets the PAR
-        /// </summary>
-        public PAR PAR { get; set; }
-
-        /// <summary>
-        /// Gets or sets the meta data.
-        /// </summary>
-        public Metadata Metadata { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sequence id.
-        /// </summary>
-        public int SequenceID { get; set; }
-
-        /// <summary>
-        /// Gets or sets the source.
-        /// </summary>
-        public Source Source { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subtitle.
-        /// </summary>
-        public Subtitles Subtitle { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video.
-        /// </summary>
-        public Video Video { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="JsonEncodeObject.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The root object.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using HandBrake.Interop.Interop.Json.Shared;
+
+    /// <summary>
+    /// The root object.
+    /// </summary>
+    public class JsonEncodeObject
+    {
+        /// <summary>
+        /// Gets or sets the audio.
+        /// </summary>
+        public Audio Audio { get; set; }
+
+        /// <summary>
+        /// Gets or sets the destination.
+        /// </summary>
+        public Destination Destination { get; set; }
+
+        /// <summary>
+        /// Gets or sets the filter.
+        /// </summary>
+        public Filters Filters { get; set; }
+
+        /// <summary>
+        /// Gets or sets the PAR
+        /// </summary>
+        public PAR PAR { get; set; }
+
+        /// <summary>
+        /// Gets or sets the meta data.
+        /// </summary>
+        public Metadata Metadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sequence id.
+        /// </summary>
+        public int SequenceID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source.
+        /// </summary>
+        public Source Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle.
+        /// </summary>
+        public Subtitles Subtitle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video.
+        /// </summary>
+        public Video Video { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Metadata.cs
index c193527eb..adf82c09c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Metadata.cs
@@ -1,62 +1,62 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Metadata.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The meta data.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    ///     The meta data.
-    /// </summary>
-    public class Metadata
-    {
-        /// <summary>
-        ///     Gets or sets the album artist.
-        /// </summary>
-        public string AlbumArtist { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the artist.
-        /// </summary>
-        public string Artist { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the comment.
-        /// </summary>
-        public string Comment { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the composer.
-        /// </summary>
-        public string Composer { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the description.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the genre.
-        /// </summary>
-        public string Genre { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the long description.
-        /// </summary>
-        public string LongDescription { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the release date.
-        /// </summary>
-        public string ReleaseDate { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Metadata.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The meta data.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    ///     The meta data.
+    /// </summary>
+    public class Metadata
+    {
+        /// <summary>
+        ///     Gets or sets the album artist.
+        /// </summary>
+        public string AlbumArtist { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the artist.
+        /// </summary>
+        public string Artist { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the comment.
+        /// </summary>
+        public string Comment { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the composer.
+        /// </summary>
+        public string Composer { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the description.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the genre.
+        /// </summary>
+        public string Genre { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the long description.
+        /// </summary>
+        public string LongDescription { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the release date.
+        /// </summary>
+        public string ReleaseDate { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Mp4Options.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Mp4Options.cs
index ad12e4e69..2dc833375 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Mp4Options.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Mp4Options.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Mp4Options.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The mp 4 options.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The mp 4 options.
-    /// </summary>
-    public class Mp4Options
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether ipod atom.
-        /// </summary>
-        public bool IpodAtom { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether mp 4 optimize.
-        /// </summary>
-        public bool Mp4Optimize { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Mp4Options.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The mp 4 options.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The mp 4 options.
+    /// </summary>
+    public class Mp4Options
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether ipod atom.
+        /// </summary>
+        public bool IpodAtom { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether mp 4 optimize.
+        /// </summary>
+        public bool Mp4Optimize { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/QSV.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/QSV.cs
index 0ca120643..64286ab28 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/QSV.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/QSV.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="QSV.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The qsv.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The qsv.
-    /// </summary>
-    public class QSV
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether decode.
-        /// </summary>
-        public bool Decode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the async depth.
-        /// </summary>
-        public int AsyncDepth { get; set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QSV.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The qsv.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The qsv.
+    /// </summary>
+    public class QSV
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether decode.
+        /// </summary>
+        public bool Decode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the async depth.
+        /// </summary>
+        public int AsyncDepth { get; set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Range.cs
index f4b3724d2..2327e359f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Range.cs
@@ -1,38 +1,38 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Range.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The range.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The range.
-    /// </summary>
-    public class Range
-    {
-        /// <summary>
-        /// Gets or sets the chapter end.
-        /// Type is "chapter", "time", "frame", or "preview".
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the chapter start.
-        /// </summary>
-        public long? Start { get; set; }
-
-        /// <summary>
-        /// Gets or sets the frame to start.
-        /// </summary>
-        public long? End { get; set; }
-
-        /// <summary>
-        /// Gets or sets the seek points.
-        /// </summary>
-        public long? SeekPoints { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Range.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The range.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The range.
+    /// </summary>
+    public class Range
+    {
+        /// <summary>
+        /// Gets or sets the chapter end.
+        /// Type is "chapter", "time", "frame", or "preview".
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the chapter start.
+        /// </summary>
+        public long? Start { get; set; }
+
+        /// <summary>
+        /// Gets or sets the frame to start.
+        /// </summary>
+        public long? End { get; set; }
+
+        /// <summary>
+        /// Gets or sets the seek points.
+        /// </summary>
+        public long? SeekPoints { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SRT.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/SRT.cs
index 94229c97b..96f42a52f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SRT.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/SRT.cs
@@ -1,32 +1,32 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SRT.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The srt.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The srt.
-    /// </summary>
-    public class SRT
-    {
-        /// <summary>
-        /// Gets or sets the codeset.
-        /// </summary>
-        public string Codeset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the filename.
-        /// </summary>
-        public string Filename { get; set; }
-
-        /// <summary>
-        /// Gets or sets the language.
-        /// </summary>
-        public string Language { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SRT.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The srt.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The srt.
+    /// </summary>
+    public class SRT
+    {
+        /// <summary>
+        /// Gets or sets the codeset.
+        /// </summary>
+        public string Codeset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the filename.
+        /// </summary>
+        public string Filename { get; set; }
+
+        /// <summary>
+        /// Gets or sets the language.
+        /// </summary>
+        public string Language { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Source.cs
index 27a746c36..7f156c0c6 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Source.cs
@@ -1,37 +1,37 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Source.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The source.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The source.
-    /// </summary>
-    public class Source
-    {
-        /// <summary>
-        /// Gets or sets the angle.
-        /// </summary>
-        public int Angle { get; set; }
-
-        /// <summary>
-        /// Gets or sets the range.
-        /// </summary>
-        public Range Range { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title.
-        /// </summary>
-        public int Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path.
-        /// </summary>
-        public string Path { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Source.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The source.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The source.
+    /// </summary>
+    public class Source
+    {
+        /// <summary>
+        /// Gets or sets the angle.
+        /// </summary>
+        public int Angle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the range.
+        /// </summary>
+        public Range Range { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title.
+        /// </summary>
+        public int Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path.
+        /// </summary>
+        public string Path { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleSearch.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleSearch.cs
index b6c5cbd63..28558f48b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleSearch.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleSearch.cs
@@ -1,37 +1,37 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SubtitleSearch.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The search.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The search.
-    /// </summary>
-    public class SubtitleSearch
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether burn.
-        /// </summary>
-        public bool Burn { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether default.
-        /// </summary>
-        public bool Default { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether enable.
-        /// </summary>
-        public bool Enable { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether forced.
-        /// </summary>
-        public bool Forced { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleSearch.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The search.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The search.
+    /// </summary>
+    public class SubtitleSearch
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether burn.
+        /// </summary>
+        public bool Burn { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether enable.
+        /// </summary>
+        public bool Enable { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether forced.
+        /// </summary>
+        public bool Forced { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs
index 929c001d0..ab51a1db9 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs
@@ -1,52 +1,52 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SubtitleTrack.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents a subtitle track to encode.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// Represents a subtitle track to encode.
-    /// </summary>
-    public class SubtitleTrack
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether burn.
-        /// </summary>
-        public bool Burn { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether default.
-        /// </summary>
-        public bool Default { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether force.
-        /// </summary>
-        public bool Forced { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        public int ID { get; set; }
-
-        /// <summary>
-        /// Gets or sets the offset.
-        /// </summary>
-        public int Offset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the track.
-        /// </summary>
-        public int Track { get; set; }
-
-        /// <summary>
-        /// Gets or sets the srt.
-        /// </summary>
-        public SRT SRT { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleTrack.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents a subtitle track to encode.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents a subtitle track to encode.
+    /// </summary>
+    public class SubtitleTrack
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether burn.
+        /// </summary>
+        public bool Burn { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether force.
+        /// </summary>
+        public bool Forced { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        public int ID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset.
+        /// </summary>
+        public int Offset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the track.
+        /// </summary>
+        public int Track { get; set; }
+
+        /// <summary>
+        /// Gets or sets the srt.
+        /// </summary>
+        public SRT SRT { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Subtitles.cs
index 248801789..8c565d185 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Subtitles.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Subtitles.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The subtitle.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The subtitle.
-    /// </summary>
-    public class Subtitles
-    {
-        /// <summary>
-        /// Gets or sets the search.
-        /// </summary>
-        public SubtitleSearch Search { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subtitle list.
-        /// </summary>
-        public List<SubtitleTrack> SubtitleList { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Subtitles.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The subtitle.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The subtitle.
+    /// </summary>
+    public class Subtitles
+    {
+        /// <summary>
+        /// Gets or sets the search.
+        /// </summary>
+        public SubtitleSearch Search { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle list.
+        /// </summary>
+        public List<SubtitleTrack> SubtitleList { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs
index b22910768..f77c0d335 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs
@@ -1,90 +1,90 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Video.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The video.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// The video.
-    /// </summary>
-    public class Video
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Video"/> class.
-        /// </summary>
-        public Video()
-        {
-            this.QSV = new QSV();
-        }
-
-        /// <summary>
-        /// Gets or sets the codec.
-        /// </summary>
-        public int Encoder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the level.
-        /// </summary>
-        public string Level { get; set; }
-
-        /// <summary>
-        /// Gets or sets the bitrate for the encode.
-        /// </summary>
-        public int? Bitrate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether two pass.
-        /// </summary>
-        public bool TwoPass { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether Turbo First Pass. For x264/5
-        /// </summary>
-        public bool Turbo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Colour Matrix Code
-        /// </summary>
-        public int ColorMatrixCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the options.
-        /// </summary>
-        public string Options { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preset.
-        /// </summary>
-        public string Preset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the profile.
-        /// </summary>
-        public string Profile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the quality.
-        /// </summary>
-        public double? Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tune.
-        /// </summary>
-        public string Tune { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether hw decode.
-        /// </summary>
-        public bool HWDecode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the qsv.
-        /// </summary>
-        public QSV QSV { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Video.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The video.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Encode
+{
+    /// <summary>
+    /// The video.
+    /// </summary>
+    public class Video
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Video"/> class.
+        /// </summary>
+        public Video()
+        {
+            this.QSV = new QSV();
+        }
+
+        /// <summary>
+        /// Gets or sets the codec.
+        /// </summary>
+        public int Encoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the level.
+        /// </summary>
+        public string Level { get; set; }
+
+        /// <summary>
+        /// Gets or sets the bitrate for the encode.
+        /// </summary>
+        public int? Bitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether two pass.
+        /// </summary>
+        public bool TwoPass { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether Turbo First Pass. For x264/5
+        /// </summary>
+        public bool Turbo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Colour Matrix Code
+        /// </summary>
+        public int ColorMatrixCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the options.
+        /// </summary>
+        public string Options { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preset.
+        /// </summary>
+        public string Preset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the profile.
+        /// </summary>
+        public string Profile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the quality.
+        /// </summary>
+        public double? Quality { get; set; }
+
+        /// <summary>
+        /// Gets or sets the tune.
+        /// </summary>
+        public string Tune { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether hw decode.
+        /// </summary>
+        public bool HWDecode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the qsv.
+        /// </summary>
+        public QSV QSV { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Filters/PresetTune.cs b/win/CS/HandBrake.Interop/Interop/Json/Filters/PresetTune.cs
index f69cec099..ad7648901 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Filters/PresetTune.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Filters/PresetTune.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Filters
+namespace HandBrake.Interop.Interop.Json.Filters
 {
     /// <summary>
     /// The preset tune.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs b/win/CS/HandBrake.Interop/Interop/Json/Presets/AudioList.cs
index 8ad95d173..49f875de9 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Presets/AudioList.cs
@@ -1,72 +1,72 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioList.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The audio list.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Presets
-{
-    /// <summary>
-    /// The audio list.
-    /// </summary>
-    public class AudioList
-    {
-        /// <summary>
-        /// Gets or sets the audio bitrate.
-        /// </summary>
-        public int AudioBitrate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio compression level.
-        /// </summary>
-        public double AudioCompressionLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio dither method.
-        /// </summary>
-        public string AudioDitherMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio encoder.
-        /// </summary>
-        public string AudioEncoder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio mixdown. (ShortName)
-        /// </summary>
-        public string AudioMixdown { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether audio normalize mix level.
-        /// </summary>
-        public bool AudioNormalizeMixLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio samplerate.
-        /// </summary>
-        public string AudioSamplerate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether audio track quality enable.
-        /// </summary>
-        public bool AudioTrackQualityEnable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio track quality.
-        /// </summary>
-        public double AudioTrackQuality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio track gain slider.
-        /// </summary>
-        public double AudioTrackGainSlider { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio track drc slider.
-        /// </summary>
-        public double AudioTrackDRCSlider { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioList.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The audio list.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Presets
+{
+    /// <summary>
+    /// The audio list.
+    /// </summary>
+    public class AudioList
+    {
+        /// <summary>
+        /// Gets or sets the audio bitrate.
+        /// </summary>
+        public int AudioBitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio compression level.
+        /// </summary>
+        public double AudioCompressionLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio dither method.
+        /// </summary>
+        public string AudioDitherMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio encoder.
+        /// </summary>
+        public string AudioEncoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio mixdown. (ShortName)
+        /// </summary>
+        public string AudioMixdown { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether audio normalize mix level.
+        /// </summary>
+        public bool AudioNormalizeMixLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio samplerate.
+        /// </summary>
+        public string AudioSamplerate { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether audio track quality enable.
+        /// </summary>
+        public bool AudioTrackQualityEnable { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio track quality.
+        /// </summary>
+        public double AudioTrackQuality { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio track gain slider.
+        /// </summary>
+        public double AudioTrackGainSlider { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio track drc slider.
+        /// </summary>
+        public double AudioTrackDRCSlider { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs b/win/CS/HandBrake.Interop/Interop/Json/Presets/HBPreset.cs
index 118b5cbf7..2ea758d5d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Presets/HBPreset.cs
@@ -1,416 +1,416 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBPreset.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The preset.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Presets
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    ///     The preset.
-    /// </summary>
-    public class HBPreset
-    {
-        public bool AlignAVStart { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio copy mask.
-        /// </summary>
-        public List<string> AudioCopyMask { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio encoder fallback.
-        /// </summary>
-        public string AudioEncoderFallback { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio language list.
-        /// </summary>
-        public List<string> AudioLanguageList { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio list.
-        /// </summary>
-        public List<AudioList> AudioList { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether audio secondary encoder mode.
-        /// </summary>
-        public bool AudioSecondaryEncoderMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the audio track selection behavior.
-        /// </summary>
-        public string AudioTrackSelectionBehavior { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether chapter markers.
-        /// </summary>
-        public bool ChapterMarkers { get; set; }
-
-        /// <summary>
-        /// Gets or sets the children array.
-        /// </summary>
-        public List<object> ChildrenArray { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether default.
-        /// </summary>
-        public bool Default { get; set; }
-
-        /// <summary>
-        /// Gets or sets the file format.
-        /// </summary>
-        public string FileFormat { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether folder.
-        /// </summary>
-        public bool Folder { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether folder open.
-        /// </summary>
-        public bool FolderOpen { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether mp 4 http optimize.
-        /// </summary>
-        public bool Mp4HttpOptimize { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether mp 4 i pod compatible.
-        /// </summary>
-        public bool Mp4iPodCompatible { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether picture auto crop.
-        /// </summary>
-        public bool PictureAutoCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture bottom crop.
-        /// </summary>
-        public int PictureBottomCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture left crop.
-        /// </summary>
-        public int PictureLeftCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture right crop.
-        /// </summary>
-        public int PictureRightCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture top crop.
-        /// </summary>
-        public int PictureTopCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture dar width.
-        /// </summary>
-        public int PictureDARWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture deblock.
-        /// </summary>
-        public int PictureDeblock { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether picture decomb deinterlace.
-        /// </summary>
-        public string PictureDeinterlaceFilter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture comb detect preset.
-        /// </summary>
-        public string PictureCombDetectPreset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture comb detect custom.
-        /// </summary>
-        public string PictureCombDetectCustom { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture deinterlace preset.
-        /// </summary>
-        public string PictureDeinterlacePreset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture deinterlace custom.
-        /// </summary>
-        public string PictureDeinterlaceCustom { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture denoise custom.
-        /// </summary>
-        public string PictureDenoiseCustom { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture denoise filter.
-        /// </summary>
-        public string PictureDenoiseFilter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture denoise preset.
-        /// </summary>
-        public string PictureDenoisePreset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture denoise tune.
-        /// </summary>
-        public string PictureDenoiseTune { get; set; }
-
-        public string PictureSharpenCustom { get; set; }
-        public string PictureSharpenFilter { get; set; }
-        public string PictureSharpenPreset { get; set; }
-        public string PictureSharpenTune { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture detelecine.
-        /// </summary>
-        public string PictureDetelecine { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture detelecine custom.
-        /// </summary>
-        public string PictureDetelecineCustom { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether picture itu par.
-        /// </summary>
-        public bool PictureItuPAR { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether picture keep ratio.
-        /// </summary>
-        public bool PictureKeepRatio { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether picture loose crop.
-        /// </summary>
-        public bool PictureLooseCrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture modulus.
-        /// </summary>
-        public int PictureModulus { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture par.
-        /// </summary>
-        public string PicturePAR { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture par width.
-        /// </summary>
-        public int PicturePARWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture par height.
-        /// </summary>
-        public int PicturePARHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture rotate.
-        /// </summary>
-        public string PictureRotate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture width.
-        /// </summary>
-        public int? PictureWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture height.
-        /// </summary>
-        public int? PictureHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture force height.
-        /// </summary>
-        public int PictureForceHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the picture force width.
-        /// </summary>
-        public int PictureForceWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preset description.
-        /// </summary>
-        public string PresetDescription { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preset name.
-        /// </summary>
-        public string PresetName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether uses picture filters.
-        /// </summary>
-        public bool UsesPictureFilters { get; set; }
-
-        /// <summary>
-        /// Gets or sets the uses picture settings.
-        /// </summary>
-        public int UsesPictureSettings { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether subtitle add cc.
-        /// </summary>
-        public bool SubtitleAddCC { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether subtitle add foreign audio search.
-        /// </summary>
-        public bool SubtitleAddForeignAudioSearch { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether subtitle add foreign audio subtitle.
-        /// </summary>
-        public bool SubtitleAddForeignAudioSubtitle { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subtitle burn behavior.
-        /// </summary>
-        public string SubtitleBurnBehavior { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether subtitle burn bd sub.
-        /// </summary>
-        public bool SubtitleBurnBDSub { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether subtitle burn dvd sub.
-        /// </summary>
-        public bool SubtitleBurnDVDSub { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subtitle language list.
-        /// </summary>
-        public List<string> SubtitleLanguageList { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subtitle track selection behavior.
-        /// </summary>
-        public string SubtitleTrackSelectionBehavior { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video avg bitrate.
-        /// </summary>
-        public int? VideoAvgBitrate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video color matrix code.
-        /// </summary>
-        public int VideoColorMatrixCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video encoder.
-        /// </summary>
-        public string VideoEncoder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video framerate.
-        /// </summary>
-        public string VideoFramerate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video framerate mode.
-        /// </summary>
-        public string VideoFramerateMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether video gray scale.
-        /// </summary>
-        public bool VideoGrayScale { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether video hw decode.
-        /// </summary>
-        public bool VideoHWDecode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video scaler.
-        /// </summary>
-        public string VideoScaler { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video preset.
-        /// </summary>
-        public string VideoPreset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video tune.
-        /// </summary>
-        public string VideoTune { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video profile.
-        /// </summary>
-        public string VideoProfile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video level.
-        /// </summary>
-        public string VideoLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video option extra.
-        /// </summary>
-        public string VideoOptionExtra { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video quality type.
-        /// </summary>
-        public int VideoQualityType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video quality slider.
-        /// </summary>
-        public double VideoQualitySlider { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether video qsv decode.
-        /// </summary>
-        public bool VideoQSVDecode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video qsv async depth.
-        /// </summary>
-        public int VideoQSVAsyncDepth { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether video two pass.
-        /// </summary>
-        public bool VideoTwoPass { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether video turbo two pass.
-        /// </summary>
-        public bool VideoTurboTwoPass { get; set; }
-
-        /// <summary>
-        /// Gets or sets the x 264 option.
-        /// </summary>
-        public string x264Option { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether x 264 use advanced options.
-        /// </summary>
-        public bool x264UseAdvancedOptions { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBPreset.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The preset.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Presets
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    ///     The preset.
+    /// </summary>
+    public class HBPreset
+    {
+        public bool AlignAVStart { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio copy mask.
+        /// </summary>
+        public List<string> AudioCopyMask { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio encoder fallback.
+        /// </summary>
+        public string AudioEncoderFallback { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio language list.
+        /// </summary>
+        public List<string> AudioLanguageList { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio list.
+        /// </summary>
+        public List<AudioList> AudioList { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether audio secondary encoder mode.
+        /// </summary>
+        public bool AudioSecondaryEncoderMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio track selection behavior.
+        /// </summary>
+        public string AudioTrackSelectionBehavior { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether chapter markers.
+        /// </summary>
+        public bool ChapterMarkers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the children array.
+        /// </summary>
+        public List<object> ChildrenArray { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file format.
+        /// </summary>
+        public string FileFormat { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether folder.
+        /// </summary>
+        public bool Folder { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether folder open.
+        /// </summary>
+        public bool FolderOpen { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether mp 4 http optimize.
+        /// </summary>
+        public bool Mp4HttpOptimize { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether mp 4 i pod compatible.
+        /// </summary>
+        public bool Mp4iPodCompatible { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether picture auto crop.
+        /// </summary>
+        public bool PictureAutoCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture bottom crop.
+        /// </summary>
+        public int PictureBottomCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture left crop.
+        /// </summary>
+        public int PictureLeftCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture right crop.
+        /// </summary>
+        public int PictureRightCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture top crop.
+        /// </summary>
+        public int PictureTopCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture dar width.
+        /// </summary>
+        public int PictureDARWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture deblock.
+        /// </summary>
+        public int PictureDeblock { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether picture decomb deinterlace.
+        /// </summary>
+        public string PictureDeinterlaceFilter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture comb detect preset.
+        /// </summary>
+        public string PictureCombDetectPreset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture comb detect custom.
+        /// </summary>
+        public string PictureCombDetectCustom { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture deinterlace preset.
+        /// </summary>
+        public string PictureDeinterlacePreset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture deinterlace custom.
+        /// </summary>
+        public string PictureDeinterlaceCustom { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture denoise custom.
+        /// </summary>
+        public string PictureDenoiseCustom { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture denoise filter.
+        /// </summary>
+        public string PictureDenoiseFilter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture denoise preset.
+        /// </summary>
+        public string PictureDenoisePreset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture denoise tune.
+        /// </summary>
+        public string PictureDenoiseTune { get; set; }
+
+        public string PictureSharpenCustom { get; set; }
+        public string PictureSharpenFilter { get; set; }
+        public string PictureSharpenPreset { get; set; }
+        public string PictureSharpenTune { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture detelecine.
+        /// </summary>
+        public string PictureDetelecine { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture detelecine custom.
+        /// </summary>
+        public string PictureDetelecineCustom { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether picture itu par.
+        /// </summary>
+        public bool PictureItuPAR { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether picture keep ratio.
+        /// </summary>
+        public bool PictureKeepRatio { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether picture loose crop.
+        /// </summary>
+        public bool PictureLooseCrop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture modulus.
+        /// </summary>
+        public int PictureModulus { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture par.
+        /// </summary>
+        public string PicturePAR { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture par width.
+        /// </summary>
+        public int PicturePARWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture par height.
+        /// </summary>
+        public int PicturePARHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture rotate.
+        /// </summary>
+        public string PictureRotate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture width.
+        /// </summary>
+        public int? PictureWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture height.
+        /// </summary>
+        public int? PictureHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture force height.
+        /// </summary>
+        public int PictureForceHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the picture force width.
+        /// </summary>
+        public int PictureForceWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preset description.
+        /// </summary>
+        public string PresetDescription { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preset name.
+        /// </summary>
+        public string PresetName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether uses picture filters.
+        /// </summary>
+        public bool UsesPictureFilters { get; set; }
+
+        /// <summary>
+        /// Gets or sets the uses picture settings.
+        /// </summary>
+        public int UsesPictureSettings { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether subtitle add cc.
+        /// </summary>
+        public bool SubtitleAddCC { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether subtitle add foreign audio search.
+        /// </summary>
+        public bool SubtitleAddForeignAudioSearch { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether subtitle add foreign audio subtitle.
+        /// </summary>
+        public bool SubtitleAddForeignAudioSubtitle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle burn behavior.
+        /// </summary>
+        public string SubtitleBurnBehavior { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether subtitle burn bd sub.
+        /// </summary>
+        public bool SubtitleBurnBDSub { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether subtitle burn dvd sub.
+        /// </summary>
+        public bool SubtitleBurnDVDSub { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle language list.
+        /// </summary>
+        public List<string> SubtitleLanguageList { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle track selection behavior.
+        /// </summary>
+        public string SubtitleTrackSelectionBehavior { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video avg bitrate.
+        /// </summary>
+        public int? VideoAvgBitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video color matrix code.
+        /// </summary>
+        public int VideoColorMatrixCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video encoder.
+        /// </summary>
+        public string VideoEncoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video framerate.
+        /// </summary>
+        public string VideoFramerate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video framerate mode.
+        /// </summary>
+        public string VideoFramerateMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether video gray scale.
+        /// </summary>
+        public bool VideoGrayScale { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether video hw decode.
+        /// </summary>
+        public bool VideoHWDecode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video scaler.
+        /// </summary>
+        public string VideoScaler { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video preset.
+        /// </summary>
+        public string VideoPreset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video tune.
+        /// </summary>
+        public string VideoTune { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video profile.
+        /// </summary>
+        public string VideoProfile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video level.
+        /// </summary>
+        public string VideoLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video option extra.
+        /// </summary>
+        public string VideoOptionExtra { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video quality type.
+        /// </summary>
+        public int VideoQualityType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video quality slider.
+        /// </summary>
+        public double VideoQualitySlider { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether video qsv decode.
+        /// </summary>
+        public bool VideoQSVDecode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video qsv async depth.
+        /// </summary>
+        public int VideoQSVAsyncDepth { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether video two pass.
+        /// </summary>
+        public bool VideoTwoPass { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether video turbo two pass.
+        /// </summary>
+        public bool VideoTurboTwoPass { get; set; }
+
+        /// <summary>
+        /// Gets or sets the x 264 option.
+        /// </summary>
+        public string x264Option { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether x 264 use advanced options.
+        /// </summary>
+        public bool x264UseAdvancedOptions { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs b/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetCategory.cs
index 182772106..2cab7d25d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetCategory.cs
@@ -1,44 +1,44 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PresetCategory.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The preset category.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Presets
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The preset category.
-    /// </summary>
-    public class PresetCategory
-    {
-        /// <summary>
-        /// Gets or sets the children array.
-        /// </summary>
-        public List<HBPreset> ChildrenArray { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether folder.
-        /// </summary>
-        public bool Folder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preset name.
-        /// </summary>
-        public string PresetName { get; set; }
-
-        /// <summary>
-        /// Description for the preset group.
-        /// </summary>
-        public string PresetDescription { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        public int Type { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetCategory.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The preset category.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Presets
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The preset category.
+    /// </summary>
+    public class PresetCategory
+    {
+        /// <summary>
+        /// Gets or sets the children array.
+        /// </summary>
+        public List<HBPreset> ChildrenArray { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether folder.
+        /// </summary>
+        public bool Folder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preset name.
+        /// </summary>
+        public string PresetName { get; set; }
+
+        /// <summary>
+        /// Description for the preset group.
+        /// </summary>
+        public string PresetDescription { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        public int Type { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetTransportContainer.cs b/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetTransportContainer.cs
index 34a7c0996..91ce48de5 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetTransportContainer.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetTransportContainer.cs
@@ -1,67 +1,67 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PresetTransportContainer.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The preset transport container.
-//   This is a model for importing the JSON / Plist presets into the GUI.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Presets
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The preset transport container.
-    /// This is a model for importing the JSON / Plist presets into the GUI.
-    /// </summary>
-    public class PresetTransportContainer
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PresetTransportContainer"/> class.
-        /// </summary>
-        public PresetTransportContainer()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PresetTransportContainer"/> class.
-        /// </summary>
-        /// <param name="versionMajor">
-        /// The version major.
-        /// </param>
-        /// <param name="versionMinor">
-        /// The version minor.
-        /// </param>
-        /// <param name="versionMicro">
-        /// The version micro.
-        /// </param>
-        public PresetTransportContainer(string versionMajor, string versionMinor, string versionMicro)
-        {
-            this.VersionMajor = versionMajor;
-            this.VersionMicro = versionMicro;
-            this.VersionMinor = versionMinor;
-        }
-
-        /// <summary>
-        /// Gets or sets the children array.
-        /// </summary>
-        public List<object> PresetList { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version major.
-        /// </summary>
-        public string VersionMajor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version micro.
-        /// </summary>
-        public string VersionMicro { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version minor.
-        /// </summary>
-        public string VersionMinor { get; set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetTransportContainer.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The preset transport container.
+//   This is a model for importing the JSON / Plist presets into the GUI.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Presets
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The preset transport container.
+    /// This is a model for importing the JSON / Plist presets into the GUI.
+    /// </summary>
+    public class PresetTransportContainer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PresetTransportContainer"/> class.
+        /// </summary>
+        public PresetTransportContainer()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PresetTransportContainer"/> class.
+        /// </summary>
+        /// <param name="versionMajor">
+        /// The version major.
+        /// </param>
+        /// <param name="versionMinor">
+        /// The version minor.
+        /// </param>
+        /// <param name="versionMicro">
+        /// The version micro.
+        /// </param>
+        public PresetTransportContainer(string versionMajor, string versionMinor, string versionMicro)
+        {
+            this.VersionMajor = versionMajor;
+            this.VersionMicro = versionMicro;
+            this.VersionMinor = versionMinor;
+        }
+
+        /// <summary>
+        /// Gets or sets the children array.
+        /// </summary>
+        public List<object> PresetList { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version major.
+        /// </summary>
+        public string VersionMajor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version micro.
+        /// </summary>
+        public string VersionMicro { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version minor.
+        /// </summary>
+        public string VersionMinor { get; set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Queue/Task.cs b/win/CS/HandBrake.Interop/Interop/Json/Queue/Task.cs
index e1805c3d9..e7a1da64e 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Queue/Task.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Queue/Task.cs
@@ -7,9 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Queue
+namespace HandBrake.Interop.Interop.Json.Queue
 {
-    using HandBrake.ApplicationServices.Interop.Json.Encode;
+    using HandBrake.Interop.Interop.Json.Encode;
 
     /// <summary>
     /// The task.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioAttributes.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/AudioAttributes.cs
index b6a29e194..96c6b9065 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioAttributes.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/AudioAttributes.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
+namespace HandBrake.Interop.Interop.Json.Scan
 {
     public class AudioAttributes
     {
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/Color.cs
index b99495440..65af225c7 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/Color.cs
@@ -1,32 +1,32 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Color.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The color.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    /// <summary>
-    /// The color.
-    /// </summary>
-    public class Color
-    {
-        /// <summary>
-        /// Gets or sets the matrix.
-        /// </summary>
-        public int Matrix { get; set; }
-
-        /// <summary>
-        /// Gets or sets the primary.
-        /// </summary>
-        public int Primary { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transfer.
-        /// </summary>
-        public int Transfer { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Color.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The color.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    /// <summary>
+    /// The color.
+    /// </summary>
+    public class Color
+    {
+        /// <summary>
+        /// Gets or sets the matrix.
+        /// </summary>
+        public int Matrix { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary.
+        /// </summary>
+        public int Primary { get; set; }
+
+        /// <summary>
+        /// Gets or sets the transfer.
+        /// </summary>
+        public int Transfer { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/Duration.cs
index 6ae496901..533ec05ae 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/Duration.cs
@@ -1,37 +1,37 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Duration.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The duration.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    /// <summary>
-    /// The duration.
-    /// </summary>
-    public class Duration
-    {
-        /// <summary>
-        /// Gets or sets the hours.
-        /// </summary>
-        public int Hours { get; set; }
-
-        /// <summary>
-        /// Gets or sets the minutes.
-        /// </summary>
-        public int Minutes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the seconds.
-        /// </summary>
-        public int Seconds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ticks.
-        /// </summary>
-        public long Ticks { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Duration.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The duration.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    /// <summary>
+    /// The duration.
+    /// </summary>
+    public class Duration
+    {
+        /// <summary>
+        /// Gets or sets the hours.
+        /// </summary>
+        public int Hours { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minutes.
+        /// </summary>
+        public int Minutes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the seconds.
+        /// </summary>
+        public int Seconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ticks.
+        /// </summary>
+        public long Ticks { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/FrameRate.cs
index a85042320..04fa33c37 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/FrameRate.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="FrameRate.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The frame rate.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    /// <summary>
-    /// The frame rate.
-    /// </summary>
-    public class FrameRate
-    {
-        /// <summary>
-        /// Gets or sets the den.
-        /// </summary>
-        public int Den { get; set; }
-
-        /// <summary>
-        /// Gets or sets the num.
-        /// </summary>
-        public int Num { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FrameRate.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The frame rate.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    /// <summary>
+    /// The frame rate.
+    /// </summary>
+    public class FrameRate
+    {
+        /// <summary>
+        /// Gets or sets the den.
+        /// </summary>
+        public int Den { get; set; }
+
+        /// <summary>
+        /// Gets or sets the num.
+        /// </summary>
+        public int Num { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/JsonScanObject.cs
index 4232ee49f..cc19e4923 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/JsonScanObject.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="JsonScanObject.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The root object.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The root object.
-    /// </summary>
-    public class JsonScanObject
-    {
-        /// <summary>
-        /// Gets or sets the main feature.
-        /// </summary>
-        public int MainFeature { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title list.
-        /// </summary>
-        public List<SourceTitle> TitleList { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="JsonScanObject.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The root object.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// The root object.
+    /// </summary>
+    public class JsonScanObject
+    {
+        /// <summary>
+        /// Gets or sets the main feature.
+        /// </summary>
+        public int MainFeature { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title list.
+        /// </summary>
+        public List<SourceTitle> TitleList { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceAudioTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceAudioTrack.cs
index 3cdba5794..e0d9bafd8 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceAudioTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceAudioTrack.cs
@@ -1,62 +1,62 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceAudioTrack.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   An audio track from the source video.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    /// <summary>
-    /// An audio track from the source video.
-    /// </summary>
-    public class SourceAudioTrack
-    {
-        /// <summary>
-        /// Gets or sets the bit rate.
-        /// </summary>
-        public int BitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the channel layout.
-        /// </summary>
-        public long ChannelLayout { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the language.
-        /// </summary>
-        public string Language { get; set; }
-
-        /// <summary>
-        /// Gets or sets the language code.
-        /// </summary>
-        public string LanguageCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sample rate.
-        /// </summary>
-        public int SampleRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the codec.
-        /// </summary>
-        public int Codec { get; set; }
-
-        public string CodecName { get; set; }
-
-        public long LFECount { get; set; }
-
-        public string ChannelLayoutName { get; set; }
-
-        public int ChannelCount { get; set; }
-
-        public AudioAttributes Attributes { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceAudioTrack.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   An audio track from the source video.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    /// <summary>
+    /// An audio track from the source video.
+    /// </summary>
+    public class SourceAudioTrack
+    {
+        /// <summary>
+        /// Gets or sets the bit rate.
+        /// </summary>
+        public int BitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channel layout.
+        /// </summary>
+        public long ChannelLayout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Gets or sets the language.
+        /// </summary>
+        public string Language { get; set; }
+
+        /// <summary>
+        /// Gets or sets the language code.
+        /// </summary>
+        public string LanguageCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sample rate.
+        /// </summary>
+        public int SampleRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the codec.
+        /// </summary>
+        public int Codec { get; set; }
+
+        public string CodecName { get; set; }
+
+        public long LFECount { get; set; }
+
+        public string ChannelLayoutName { get; set; }
+
+        public int ChannelCount { get; set; }
+
+        public AudioAttributes Attributes { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceChapter.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceChapter.cs
index 93b5e1ce3..02e83fe1d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceChapter.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceChapter.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceChapter.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The a chapter from a video source.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    /// <summary>
-    /// The a chapter from a video source.
-    /// </summary>
-    public class SourceChapter
-    {
-        /// <summary>
-        /// Gets or sets the duration.
-        /// </summary>
-        public Duration Duration { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceChapter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The a chapter from a video source.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    /// <summary>
+    /// The a chapter from a video source.
+    /// </summary>
+    public class SourceChapter
+    {
+        /// <summary>
+        /// Gets or sets the duration.
+        /// </summary>
+        public Duration Duration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceMetadata.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceMetadata.cs
index f575dc637..240635cc6 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceMetadata.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceMetadata.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
+namespace HandBrake.Interop.Interop.Json.Scan
 {
     /// <summary>
     /// The meta data.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceSubtitleTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceSubtitleTrack.cs
index 67be629a2..eaeda2a69 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceSubtitleTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceSubtitleTrack.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
+namespace HandBrake.Interop.Interop.Json.Scan
 {
     /// <summary>
     /// The subtitle list.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceTitle.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceTitle.cs
index e8f62c8d0..4fd5232ff 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceTitle.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceTitle.cs
@@ -1,28 +1,28 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceTitle.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The title list.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
-    using System.Collections.Generic;
-
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-
-    /// <summary>
-    /// The title list.
-    /// </summary>
-    public class SourceTitle
-    {
-        /// <summary>
-        /// Gets or sets the angle count.
-        /// </summary>
-        public int AngleCount { get; set; }
-
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceTitle.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The title list.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+    using System.Collections.Generic;
+
+    using HandBrake.Interop.Interop.Json.Shared;
+
+    /// <summary>
+    /// The title list.
+    /// </summary>
+    public class SourceTitle
+    {
+        /// <summary>
+        /// Gets or sets the angle count.
+        /// </summary>
+        public int AngleCount { get; set; }
+
         /// <summary>
         /// Gets or sets the audio list.
         /// </summary>
@@ -35,44 +35,44 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
 
         /// <summary>
         /// Gets or sets the color.
-        /// </summary>
-        public Color Color { get; set; }
-
-        /// <summary>
-        /// Gets or sets the input file container.
-        /// </summary>
-        public string Container { get; set; }
-
-        /// <summary>
-        /// Gets or sets the cropping values
-        /// </summary>
-        public List<int> Crop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the duration.
-        /// </summary>
-        public Duration Duration { get; set; }
-
-        /// <summary>
-        /// Gets or sets the frame rate.
-        /// </summary>
-        public FrameRate FrameRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the geometry.
-        /// </summary>
-        public Geometry Geometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index.
-        /// </summary>
-        public int Index { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether interlace detected.
-        /// </summary>
-        public bool InterlaceDetected { get; set; }
-
+        /// </summary>
+        public Color Color { get; set; }
+
+        /// <summary>
+        /// Gets or sets the input file container.
+        /// </summary>
+        public string Container { get; set; }
+
+        /// <summary>
+        /// Gets or sets the cropping values
+        /// </summary>
+        public List<int> Crop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the duration.
+        /// </summary>
+        public Duration Duration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the frame rate.
+        /// </summary>
+        public FrameRate FrameRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the geometry.
+        /// </summary>
+        public Geometry Geometry { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index.
+        /// </summary>
+        public int Index { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether interlace detected.
+        /// </summary>
+        public bool InterlaceDetected { get; set; }
+
         /// <summary>
         /// Gets or sets the meta data.
         /// </summary>
@@ -80,19 +80,19 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
 
         /// <summary>
         /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path.
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playlist.
-        /// </summary>
-        public int Playlist { get; set; }
-
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path.
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playlist.
+        /// </summary>
+        public int Playlist { get; set; }
+
         /// <summary>
         /// Gets or sets the subtitle list.
         /// </summary>
@@ -100,13 +100,13 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
 
         /// <summary>
         /// Gets or sets the type.
-        ///  HB_DVD_TYPE = 0, HB_BD_TYPE, HB_STREAM_TYPE, HB_FF_STREAM_TYPE
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video codec.
-        /// </summary>
-        public string VideoCodec { get; set; }
-    }
+        ///  HB_DVD_TYPE = 0, HB_BD_TYPE, HB_STREAM_TYPE, HB_FF_STREAM_TYPE
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video codec.
+        /// </summary>
+        public string VideoCodec { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleAttributes.cs b/win/CS/HandBrake.Interop/Interop/Json/Scan/SubtitleAttributes.cs
index b22a470be..07ac8b032 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleAttributes.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Scan/SubtitleAttributes.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
+namespace HandBrake.Interop.Interop.Json.Scan
 {
     using Newtonsoft.Json;
 
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/Geometry.cs b/win/CS/HandBrake.Interop/Interop/Json/Shared/Geometry.cs
index 429deb615..5632b3736 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/Geometry.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Shared/Geometry.cs
@@ -1,32 +1,32 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Geometry.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The geometry.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Shared
-{
-    /// <summary>
-    /// The geometry.
-    /// </summary>
-    public class Geometry
-    {
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the par.
-        /// </summary>
-        public PAR PAR { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        public int Width { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Geometry.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The geometry.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Shared
+{
+    /// <summary>
+    /// The geometry.
+    /// </summary>
+    public class Geometry
+    {
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        public int Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the par.
+        /// </summary>
+        public PAR PAR { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        public int Width { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/PAR.cs b/win/CS/HandBrake.Interop/Interop/Json/Shared/PAR.cs
index 503acf2f7..075c26672 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/PAR.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Shared/PAR.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PAR.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The par.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Shared
-{
-    /// <summary>
-    /// The par.
-    /// </summary>
-    public class PAR
-    {
-        /// <summary>
-        /// Gets or sets the Number.
-        /// </summary>
-        public int Num { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Denominator.
-        /// </summary>
-        public int Den { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PAR.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The par.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Shared
+{
+    /// <summary>
+    /// The par.
+    /// </summary>
+    public class PAR
+    {
+        /// <summary>
+        /// Gets or sets the Number.
+        /// </summary>
+        public int Num { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Denominator.
+        /// </summary>
+        public int Den { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/JsonState.cs b/win/CS/HandBrake.Interop/Interop/Json/State/JsonState.cs
index 2309b0d16..6f8513671 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/JsonState.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/State/JsonState.cs
@@ -1,37 +1,37 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="JsonState.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hand brake state.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.State
-{
-    /// <summary>
-    /// The hand brake state.
-    /// </summary>
-    public class JsonState
-    {
-        /// <summary>
-        /// Gets or sets the scanning.
-        /// </summary>
-        public Scanning Scanning { get; set; }
-
-        /// <summary>
-        /// Gets or sets the working.
-        /// </summary>
-        public Working Working { get; set; }
-
-        /// <summary>
-        /// Gets or sets the work done.
-        /// </summary>
-        public WorkDone WorkDone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        public string State { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="JsonState.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hand brake state.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.State
+{
+    /// <summary>
+    /// The hand brake state.
+    /// </summary>
+    public class JsonState
+    {
+        /// <summary>
+        /// Gets or sets the scanning.
+        /// </summary>
+        public Scanning Scanning { get; set; }
+
+        /// <summary>
+        /// Gets or sets the working.
+        /// </summary>
+        public Working Working { get; set; }
+
+        /// <summary>
+        /// Gets or sets the work done.
+        /// </summary>
+        public WorkDone WorkDone { get; set; }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        public string State { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Scanning.cs b/win/CS/HandBrake.Interop/Interop/Json/State/Scanning.cs
index 033bef017..4f3cfb22d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Scanning.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/State/Scanning.cs
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Scanning.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The scanning.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.State
-{
-    /// <summary>
-    /// The scanning.
-    /// </summary>
-    public class Scanning
-    {
-        /// <summary>
-        /// Gets or sets the preview.
-        /// </summary>
-        public int Preview { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preview count.
-        /// </summary>
-        public int PreviewCount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the progress.
-        /// </summary>
-        public double Progress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title.
-        /// </summary>
-        public int Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title count.
-        /// </summary>
-        public int TitleCount { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Scanning.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The scanning.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.State
+{
+    /// <summary>
+    /// The scanning.
+    /// </summary>
+    public class Scanning
+    {
+        /// <summary>
+        /// Gets or sets the preview.
+        /// </summary>
+        public int Preview { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preview count.
+        /// </summary>
+        public int PreviewCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets the progress.
+        /// </summary>
+        public double Progress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title.
+        /// </summary>
+        public int Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title count.
+        /// </summary>
+        public int TitleCount { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/TaskState.cs b/win/CS/HandBrake.Interop/Interop/Json/State/TaskState.cs
index 168303e1d..5d0f5f92f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/TaskState.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/State/TaskState.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Json.State
+namespace HandBrake.Interop.Interop.Json.State
 {
     using System.Collections.Generic;
 
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/WorkDone.cs b/win/CS/HandBrake.Interop/Interop/Json/State/WorkDone.cs
index 76f85ba90..aa821f286 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/WorkDone.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/State/WorkDone.cs
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="WorkDone.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The work done.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.State
-{
-    /// <summary>
-    ///     The work done.
-    /// </summary>
-    public class WorkDone
-    {
-        /// <summary>
-        /// Gets or sets the error.
-        /// </summary>
-        public int Error { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="WorkDone.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The work done.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.State
+{
+    /// <summary>
+    ///     The work done.
+    /// </summary>
+    public class WorkDone
+    {
+        /// <summary>
+        /// Gets or sets the error.
+        /// </summary>
+        public int Error { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs b/win/CS/HandBrake.Interop/Interop/Json/State/Working.cs
index 2347eb4c2..a1b7fb0e5 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/State/Working.cs
@@ -1,73 +1,73 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Working.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The working.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.State
-{
-    /// <summary>
-    /// The working.
-    /// </summary>
-    public class Working
-    {
-        /// <summary>
-        /// Gets or sets the hours.
-        /// </summary>
-        public int Hours { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Pass ID.
-        /// </summary>
-        /// <remarks>
-        /// -1: Subtitle scan
-        ///  0: Encode
-        ///  1: Encode first pass
-        ///  2: Encode second pass
-        /// </remarks>
-        public int PassID { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pass number (1-based).
-        /// </summary>
-        public int Pass { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pass count.
-        /// </summary>
-        public int PassCount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the minutes.
-        /// </summary>
-        public int Minutes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the progress.
-        /// </summary>
-        public double Progress { get; set; }
-
-        /// <summary>
-        /// Gets or sets the rate.
-        /// </summary>
-        public double Rate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the rate avg.
-        /// </summary>
-        public double RateAvg { get; set; }
-
-        /// <summary>
-        /// Gets or sets the seconds.
-        /// </summary>
-        public int Seconds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sequence id.
-        /// </summary>
-        public int SequenceID { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Working.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The working.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.State
+{
+    /// <summary>
+    /// The working.
+    /// </summary>
+    public class Working
+    {
+        /// <summary>
+        /// Gets or sets the hours.
+        /// </summary>
+        public int Hours { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Pass ID.
+        /// </summary>
+        /// <remarks>
+        /// -1: Subtitle scan
+        ///  0: Encode
+        ///  1: Encode first pass
+        ///  2: Encode second pass
+        /// </remarks>
+        public int PassID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pass number (1-based).
+        /// </summary>
+        public int Pass { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pass count.
+        /// </summary>
+        public int PassCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minutes.
+        /// </summary>
+        public int Minutes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the progress.
+        /// </summary>
+        public double Progress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the rate.
+        /// </summary>
+        public double Rate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the rate avg.
+        /// </summary>
+        public double RateAvg { get; set; }
+
+        /// <summary>
+        /// Gets or sets the seconds.
+        /// </summary>
+        public int Seconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sequence id.
+        /// </summary>
+        public int SequenceID { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/BitrateLimits.cs b/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs
index 533c73a5b..91ee98356 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/BitrateLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the BitrateLimits type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// Represents bitrate limits as a range.
-    /// </summary>
-    public class BitrateLimits
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BitrateLimits"/> class.
-        /// </summary>
-        /// <param name="low">
-        /// The low.
-        /// </param>
-        /// <param name="high">
-        /// The high.
-        /// </param>
-        public BitrateLimits(int low, int high)
-        {
-            this.Low = low;
-            this.High = high;
-        }
-
-        /// <summary>
-        /// Gets the inclusive lower limit for the bitrate.
-        /// </summary>
-        public int Low { get; private set; }
-
-        /// <summary>
-        /// Gets the inclusive upper limit for the bitrate.
-        /// </summary>
-        public int High { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the BitrateLimits type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// Represents bitrate limits as a range.
+    /// </summary>
+    public class BitrateLimits
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BitrateLimits"/> class.
+        /// </summary>
+        /// <param name="low">
+        /// The low.
+        /// </param>
+        /// <param name="high">
+        /// The high.
+        /// </param>
+        public BitrateLimits(int low, int high)
+        {
+            this.Low = low;
+            this.High = high;
+        }
+
+        /// <summary>
+        /// Gets the inclusive lower limit for the bitrate.
+        /// </summary>
+        public int Low { get; private set; }
+
+        /// <summary>
+        /// Gets the inclusive upper limit for the bitrate.
+        /// </summary>
+        public int High { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Cropping.cs b/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs
index 52c9e64d5..63a1b176a 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Cropping.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs
@@ -1,99 +1,99 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Cropping.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Cropping type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// The Cropping Model
-    /// </summary>
-    public class Cropping
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Cropping"/> class. 
-        /// </summary>
-        public Cropping()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Cropping"/> class.
-        /// Copy Constructor
-        /// </summary>
-        /// <param name="croping">
-        /// The croping.
-        /// </param>
-        public Cropping(Cropping croping)
-        {
-            this.Top = croping.Top;
-            this.Bottom = croping.Bottom;
-            this.Left = croping.Left;
-            this.Right = croping.Right;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Cropping"/> class. 
-        /// </summary>
-        /// <param name="top">
-        /// The Top Value
-        /// </param>
-        /// <param name="bottom">
-        /// The Bottom Value
-        /// </param>
-        /// <param name="left">
-        /// The Left Value
-        /// </param>
-        /// <param name="right">
-        /// The Right Value
-        /// </param>
-        public Cropping(int top, int bottom, int left, int right)
-        {
-            this.Top = top;
-            this.Bottom = bottom;
-            this.Left = left;
-            this.Right = right;
-        }
-
-        /// <summary>
-        /// Gets or sets Top.
-        /// </summary>
-        public int Top { get; set; }
-
-        /// <summary>
-        /// Gets or sets Bottom.
-        /// </summary>
-        public int Bottom { get; set; }
-
-        /// <summary>
-        /// Gets or sets Left.
-        /// </summary>
-        public int Left { get; set; }
-
-        /// <summary>
-        /// Gets or sets Right.
-        /// </summary>
-        public int Right { get; set; }
-
-        /// <summary>
-        /// Clone this model
-        /// </summary>
-        /// <returns>
-        /// A Cloned copy
-        /// </returns>
-        public Cropping Clone()
-        {
-            return new Cropping
-            {
-                Top = this.Top,
-                Bottom = this.Bottom,
-                Left = this.Left,
-                Right = this.Right
-            };
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Cropping.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Cropping type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// The Cropping Model
+    /// </summary>
+    public class Cropping
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cropping"/> class. 
+        /// </summary>
+        public Cropping()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cropping"/> class.
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="croping">
+        /// The croping.
+        /// </param>
+        public Cropping(Cropping croping)
+        {
+            this.Top = croping.Top;
+            this.Bottom = croping.Bottom;
+            this.Left = croping.Left;
+            this.Right = croping.Right;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cropping"/> class. 
+        /// </summary>
+        /// <param name="top">
+        /// The Top Value
+        /// </param>
+        /// <param name="bottom">
+        /// The Bottom Value
+        /// </param>
+        /// <param name="left">
+        /// The Left Value
+        /// </param>
+        /// <param name="right">
+        /// The Right Value
+        /// </param>
+        public Cropping(int top, int bottom, int left, int right)
+        {
+            this.Top = top;
+            this.Bottom = bottom;
+            this.Left = left;
+            this.Right = right;
+        }
+
+        /// <summary>
+        /// Gets or sets Top.
+        /// </summary>
+        public int Top { get; set; }
+
+        /// <summary>
+        /// Gets or sets Bottom.
+        /// </summary>
+        public int Bottom { get; set; }
+
+        /// <summary>
+        /// Gets or sets Left.
+        /// </summary>
+        public int Left { get; set; }
+
+        /// <summary>
+        /// Gets or sets Right.
+        /// </summary>
+        public int Right { get; set; }
+
+        /// <summary>
+        /// Clone this model
+        /// </summary>
+        /// <returns>
+        /// A Cloned copy
+        /// </returns>
+        public Cropping Clone()
+        {
+            return new Cropping
+            {
+                Top = this.Top,
+                Bottom = this.Bottom,
+                Left = this.Left,
+                Right = this.Right
+            };
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs
index 26ac4883c..f98875a16 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs
@@ -1,32 +1,32 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Anamorphic.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Anamorphic type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The anamorphic.
-    /// </summary>
-    public enum Anamorphic
-    {
-        [DisplayName("None")]
-        [ShortName("none")]
-        None = 0,
-        [DisplayName("Automatic")]
-        [ShortName("auto")]
-        Automatic = 4,
-        [DisplayName("Loose")]
-        [ShortName("loose")]
-        Loose = 2,
-        [DisplayName("Custom")]
-        [ShortName("custom")]
-        Custom = 3
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Anamorphic.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Anamorphic type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The anamorphic.
+    /// </summary>
+    public enum Anamorphic
+    {
+        [DisplayName("None")]
+        [ShortName("none")]
+        None = 0,
+        [DisplayName("Automatic")]
+        [ShortName("auto")]
+        Automatic = 4,
+        [DisplayName("Loose")]
+        [ShortName("loose")]
+        Loose = 2,
+        [DisplayName("Custom")]
+        [ShortName("custom")]
+        Custom = 3
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/CombDetect.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs
index d98d0d2ec..922cdbc24 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/CombDetect.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs
@@ -7,9 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Model.Encoding
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The CombDetect Type.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
index b8eab8dad..8950d2b92 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
@@ -1,29 +1,29 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Container type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using System;
-
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The container.
-    /// </summary>
-    [Flags]
-    public enum Container
-    {
-        None = 0x0,
-
-        [DisplayName("MP4")]
-        MP4,
-        [DisplayName("MKV")]
-        MKV
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Container type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using System;
+
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The container.
+    /// </summary>
+    [Flags]
+    public enum Container
+    {
+        None = 0x0,
+
+        [DisplayName("MP4")]
+        MP4,
+        [DisplayName("MKV")]
+        MKV
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Decomb.cs
index a2b544029..1fe70b421 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Decomb.cs
@@ -1,34 +1,34 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Decomb.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Decomb type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The decomb.
-    /// </summary>
-    public enum Decomb
-    {
-        [ShortName("default")]
-        Default,
-
-        [ShortName("bob")]
-        Bob,
-
-        [ShortName("custom")]
-        Custom,
-
-        [ShortName("eedi2")]
-        EEDI2,
-
-        [ShortName("eedi2bob")]
-        EEDI2Bob
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Decomb.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Decomb type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The decomb.
+    /// </summary>
+    public enum Decomb
+    {
+        [ShortName("default")]
+        Default,
+
+        [ShortName("bob")]
+        Bob,
+
+        [ShortName("custom")]
+        Custom,
+
+        [ShortName("eedi2")]
+        EEDI2,
+
+        [ShortName("eedi2bob")]
+        EEDI2Bob
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Deinterlace.cs
index 162400b5d..07c519a35 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Deinterlace.cs
@@ -1,31 +1,31 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Deinterlace.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Deinterlace type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The deinterlace.
-    /// </summary>
-    public enum Deinterlace
-    {
-        [ShortName("custom")]
-        Custom,
-
-        [ShortName("default")]
-        Default,
-
-        [ShortName("skip-spatial")]
-        SkipSpatialCheck,
-
-        [ShortName("bob")]
-        Bob
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Deinterlace.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Deinterlace type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The deinterlace.
+    /// </summary>
+    public enum Deinterlace
+    {
+        [ShortName("custom")]
+        Custom,
+
+        [ShortName("default")]
+        Default,
+
+        [ShortName("skip-spatial")]
+        SkipSpatialCheck,
+
+        [ShortName("bob")]
+        Bob
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/DeinterlaceFilter.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs
index 03d7bce60..1ebc03cc6 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/DeinterlaceFilter.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs
@@ -7,9 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Model.Encoding
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The deinterlace.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Denoise.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs
index 4374372ff..fb6440188 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Denoise.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs
@@ -1,28 +1,28 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Denoise.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Denoise type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The denoise.
-    /// </summary>
-    public enum Denoise
-    {
-        [ShortName("off")]
-        Off = 0,
-
-        [ShortName("hqdn3d")]
-        hqdn3d = 1,
-
-        [ShortName("nlmeans")]
-        NLMeans = 2,
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Denoise.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Denoise type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The denoise.
+    /// </summary>
+    public enum Denoise
+    {
+        [ShortName("off")]
+        Off = 0,
+
+        [ShortName("hqdn3d")]
+        hqdn3d = 1,
+
+        [ShortName("nlmeans")]
+        NLMeans = 2,
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Detelecine.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs
index f93c754a4..0aeebdd7c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Detelecine.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs
@@ -1,26 +1,26 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Detelecine.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Detelecine type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The detelecine.
-    /// </summary>
-    public enum Detelecine
-    {
-        [ShortName("off")]
-        Off = 0,
-        [ShortName("default")]
-        Default = 2,
-        [ShortName("custom")]
-        Custom = 1
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Detelecine.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Detelecine type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The detelecine.
+    /// </summary>
+    public enum Detelecine
+    {
+        [ShortName("off")]
+        Off = 0,
+        [ShortName("default")]
+        Default = 2,
+        [ShortName("custom")]
+        Custom = 1
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBAudioEncoder.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs
index 2d2e5b26d..4e4f241df 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBAudioEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs
@@ -1,131 +1,131 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hb audio encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Interop.HbLib;
-
-    /// <summary>
-    /// The hb audio encoder.
-    /// </summary>
-    public class HBAudioEncoder
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HBAudioEncoder"/> class.
-        /// </summary>
-        /// <param name="compatibleContainers">
-        /// The compatible containers.
-        /// </param>
-        /// <param name="compressionLimits">
-        /// The compression limits.
-        /// </param>
-        /// <param name="defaultCompression">
-        /// The default compression.
-        /// </param>
-        /// <param name="defaultQuality">
-        /// The default quality.
-        /// </param>
-        /// <param name="displayName">
-        /// The display name.
-        /// </param>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        /// <param name="qualityLimits">
-        /// The quality limits.
-        /// </param>
-        /// <param name="shortName">
-        /// The short name.
-        /// </param>
-        public HBAudioEncoder(int compatibleContainers, RangeLimits compressionLimits, float defaultCompression, float defaultQuality, string displayName, int id, RangeLimits qualityLimits, string shortName)
-        {
-            this.CompatibleContainers = compatibleContainers;
-            this.CompressionLimits = compressionLimits;
-            this.DefaultCompression = defaultCompression;
-            this.DefaultQuality = defaultQuality;
-            this.DisplayName = displayName;
-            this.Id = id;
-            this.QualityLimits = qualityLimits;
-            this.ShortName = shortName;
-        }
-
-        /// <summary>
-        /// Gets the compatible containers.
-        /// </summary>
-        public int CompatibleContainers { get; private set; }
-
-        /// <summary>
-        /// Gets the compression limits.
-        /// </summary>
-        public RangeLimits CompressionLimits { get; private set; }
-
-        /// <summary>
-        /// Gets the default compression.
-        /// </summary>
-        public float DefaultCompression { get; private set; }
-
-        /// <summary>
-        /// Gets the default quality.
-        /// </summary>
-        public float DefaultQuality { get; private set; }
-
-        /// <summary>
-        /// Gets the display name.
-        /// </summary>
-        public string DisplayName { get; private set; }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public int Id { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the encoder is passthrough.
-        /// </summary>
-        public bool IsPassthrough
-        {
-            get
-            {
-                return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the quality limits.
-        /// </summary>
-        public RangeLimits QualityLimits { get; set; }
-
-        /// <summary>
-        /// Gets or sets the short name.
-        /// </summary>
-        public string ShortName { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the encoder supports compression.
-        /// </summary>
-        public bool SupportsCompression
-        {
-            get
-            {
-                return this.CompressionLimits.High >= 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the encoder supports quality.
-        /// </summary>
-        public bool SupportsQuality
-        {
-            get
-            {
-                return this.QualityLimits.High >= 0;
-            }
-        }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hb audio encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Interop.HbLib;
+
+    /// <summary>
+    /// The hb audio encoder.
+    /// </summary>
+    public class HBAudioEncoder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HBAudioEncoder"/> class.
+        /// </summary>
+        /// <param name="compatibleContainers">
+        /// The compatible containers.
+        /// </param>
+        /// <param name="compressionLimits">
+        /// The compression limits.
+        /// </param>
+        /// <param name="defaultCompression">
+        /// The default compression.
+        /// </param>
+        /// <param name="defaultQuality">
+        /// The default quality.
+        /// </param>
+        /// <param name="displayName">
+        /// The display name.
+        /// </param>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <param name="qualityLimits">
+        /// The quality limits.
+        /// </param>
+        /// <param name="shortName">
+        /// The short name.
+        /// </param>
+        public HBAudioEncoder(int compatibleContainers, RangeLimits compressionLimits, float defaultCompression, float defaultQuality, string displayName, int id, RangeLimits qualityLimits, string shortName)
+        {
+            this.CompatibleContainers = compatibleContainers;
+            this.CompressionLimits = compressionLimits;
+            this.DefaultCompression = defaultCompression;
+            this.DefaultQuality = defaultQuality;
+            this.DisplayName = displayName;
+            this.Id = id;
+            this.QualityLimits = qualityLimits;
+            this.ShortName = shortName;
+        }
+
+        /// <summary>
+        /// Gets the compatible containers.
+        /// </summary>
+        public int CompatibleContainers { get; private set; }
+
+        /// <summary>
+        /// Gets the compression limits.
+        /// </summary>
+        public RangeLimits CompressionLimits { get; private set; }
+
+        /// <summary>
+        /// Gets the default compression.
+        /// </summary>
+        public float DefaultCompression { get; private set; }
+
+        /// <summary>
+        /// Gets the default quality.
+        /// </summary>
+        public float DefaultQuality { get; private set; }
+
+        /// <summary>
+        /// Gets the display name.
+        /// </summary>
+        public string DisplayName { get; private set; }
+
+        /// <summary>
+        /// Gets the id.
+        /// </summary>
+        public int Id { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the encoder is passthrough.
+        /// </summary>
+        public bool IsPassthrough
+        {
+            get
+            {
+                return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the quality limits.
+        /// </summary>
+        public RangeLimits QualityLimits { get; set; }
+
+        /// <summary>
+        /// Gets or sets the short name.
+        /// </summary>
+        public string ShortName { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the encoder supports compression.
+        /// </summary>
+        public bool SupportsCompression
+        {
+            get
+            {
+                return this.CompressionLimits.High >= 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the encoder supports quality.
+        /// </summary>
+        public bool SupportsQuality
+        {
+            get
+            {
+                return this.QualityLimits.High >= 0;
+            }
+        }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBContainer.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs
index 832d3513d..487e90362 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBContainer.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs
@@ -1,60 +1,60 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBContainer.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hb container.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// The hb container.
-    /// </summary>
-    public class HBContainer
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HBContainer"/> class.
-        /// </summary>
-        /// <param name="defaultExtension">
-        /// The default extension.
-        /// </param>
-        /// <param name="displayName">
-        /// The display name.
-        /// </param>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        /// <param name="shortName">
-        /// The short name.
-        /// </param>
-        public HBContainer(string defaultExtension, string displayName, int id, string shortName)
-        {
-            this.DefaultExtension = defaultExtension;
-            this.DisplayName = displayName;
-            this.Id = id;
-            this.ShortName = shortName;
-        }
-
-        /// <summary>
-        /// Gets the default extension.
-        /// </summary>
-        public string DefaultExtension { get; private set; }
-
-        /// <summary>
-        /// Gets the display name.
-        /// </summary>
-        public string DisplayName { get; private set; }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public int Id { get; private set; }
-
-        /// <summary>
-        /// Gets the short name.
-        /// </summary>
-        public string ShortName { get; private set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBContainer.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hb container.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// The hb container.
+    /// </summary>
+    public class HBContainer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HBContainer"/> class.
+        /// </summary>
+        /// <param name="defaultExtension">
+        /// The default extension.
+        /// </param>
+        /// <param name="displayName">
+        /// The display name.
+        /// </param>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <param name="shortName">
+        /// The short name.
+        /// </param>
+        public HBContainer(string defaultExtension, string displayName, int id, string shortName)
+        {
+            this.DefaultExtension = defaultExtension;
+            this.DisplayName = displayName;
+            this.Id = id;
+            this.ShortName = shortName;
+        }
+
+        /// <summary>
+        /// Gets the default extension.
+        /// </summary>
+        public string DefaultExtension { get; private set; }
+
+        /// <summary>
+        /// Gets the display name.
+        /// </summary>
+        public string DisplayName { get; private set; }
+
+        /// <summary>
+        /// Gets the id.
+        /// </summary>
+        public int Id { get; private set; }
+
+        /// <summary>
+        /// Gets the short name.
+        /// </summary>
+        public string ShortName { get; private set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBMixdown.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs
index 04927b9dd..a96724c31 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBMixdown.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs
@@ -1,51 +1,51 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hb mixdown.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// The hb mixdown.
-    /// </summary>
-    public class HBMixdown
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HBMixdown"/> class.
-        /// </summary>
-        /// <param name="displayName">
-        /// The display name.
-        /// </param>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        /// <param name="shortName">
-        /// The short name.
-        /// </param>
-        public HBMixdown(string displayName, int id, string shortName)
-        {
-            this.DisplayName = displayName;
-            this.Id = id;
-            this.ShortName = shortName;
-        }
-
-        /// <summary>
-        /// Gets the display name.
-        /// </summary>
-        public string DisplayName { get; private set; }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public int Id { get; private set; }
-
-        /// <summary>
-        /// Gets the short name.
-        /// </summary>
-        public string ShortName { get; private set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hb mixdown.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// The hb mixdown.
+    /// </summary>
+    public class HBMixdown
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HBMixdown"/> class.
+        /// </summary>
+        /// <param name="displayName">
+        /// The display name.
+        /// </param>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <param name="shortName">
+        /// The short name.
+        /// </param>
+        public HBMixdown(string displayName, int id, string shortName)
+        {
+            this.DisplayName = displayName;
+            this.Id = id;
+            this.ShortName = shortName;
+        }
+
+        /// <summary>
+        /// Gets the display name.
+        /// </summary>
+        public string DisplayName { get; private set; }
+
+        /// <summary>
+        /// Gets the id.
+        /// </summary>
+        public int Id { get; private set; }
+
+        /// <summary>
+        /// Gets the short name.
+        /// </summary>
+        public string ShortName { get; private set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBPresetTune.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs
index e3ed4c06a..2954128d7 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBPresetTune.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Model.Encoding
 {
     /// <summary>
     /// The hb preset tune.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBRate.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs
index d3287cddb..ecebb0526 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBRate.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBRate.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents a rate in HandBrake: audio sample rate or video framerate.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// Represents a rate in HandBrake: audio sample rate or video framerate.
-    /// </summary>
-    public class HBRate
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HBRate"/> class.
-        /// </summary>
-        /// <param name="name">
-        /// The name.
-        /// </param>
-        /// <param name="rate">
-        /// The rate.
-        /// </param>
-        public HBRate(string name, int rate)
-        {
-            this.Name = name;
-            this.Rate = rate;
-        }
-
-        /// <summary>
-        /// Gets the name to use for this rate.
-        /// </summary>
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets the raw rate.
-        /// </summary>
-        public int Rate { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBRate.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents a rate in HandBrake: audio sample rate or video framerate.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// Represents a rate in HandBrake: audio sample rate or video framerate.
+    /// </summary>
+    public class HBRate
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HBRate"/> class.
+        /// </summary>
+        /// <param name="name">
+        /// The name.
+        /// </param>
+        /// <param name="rate">
+        /// The rate.
+        /// </param>
+        public HBRate(string name, int rate)
+        {
+            this.Name = name;
+            this.Rate = rate;
+        }
+
+        /// <summary>
+        /// Gets the name to use for this rate.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Gets the raw rate.
+        /// </summary>
+        public int Rate { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBVideoEncoder.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs
index a1e60b2de..2c064b2be 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/HBVideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs
@@ -1,109 +1,109 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The hb video encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using System.Collections.Generic;
-
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
-
-    /// <summary>
-    /// The hb video encoder.
-    /// </summary>
-    public class HBVideoEncoder
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HBVideoEncoder"/> class.
-        /// </summary>
-        /// <param name="compatibleContainers">
-        /// The compatible containers.
-        /// </param>
-        /// <param name="displayName">
-        /// The display name.
-        /// </param>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        /// <param name="shortName">
-        /// The short name.
-        /// </param>
-        public HBVideoEncoder(int compatibleContainers, string displayName, int id, string shortName)
-        {
-            this.CompatibleContainers = compatibleContainers;
-            this.DisplayName = displayName;
-            this.Id = id;
-            this.ShortName = shortName;
-        }
-
-        /// <summary>
-        /// Gets the compatible containers.
-        /// </summary>
-        public int CompatibleContainers { get; private set; }
-
-        /// <summary>
-        /// Gets the display name.
-        /// </summary>
-        public string DisplayName { get; private set; }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public int Id { get; private set; }
-
-        /// <summary>
-        /// Gets the short name.
-        /// </summary>
-        public string ShortName { get; private set; }
-
-        /// <summary>
-        /// Gets the list of presets this encoder supports. (null if the encoder doesn't support presets)
-        /// </summary>
-        public List<string> Presets
-        {
-            get
-            {
-                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_presets(this.Id));
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of tunes this encoder supports. (null if the encoder doesn't support tunes)
-        /// </summary>
-        public List<string> Tunes
-        {
-            get
-            {
-                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_tunes(this.Id));
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of profiles this encoder supports. (null if the encoder doesn't support profiles)
-        /// </summary>
-        public List<string> Profiles
-        {
-            get
-            {
-                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_profiles(this.Id));
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of levels this encoder supports. (null if the encoder doesn't support levels)
-        /// </summary>
-        public List<string> Levels
-        {
-            get
-            {
-                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_levels(this.Id));
-            }
-        } 
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The hb video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using System.Collections.Generic;
+
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Helpers;
+
+    /// <summary>
+    /// The hb video encoder.
+    /// </summary>
+    public class HBVideoEncoder
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HBVideoEncoder"/> class.
+        /// </summary>
+        /// <param name="compatibleContainers">
+        /// The compatible containers.
+        /// </param>
+        /// <param name="displayName">
+        /// The display name.
+        /// </param>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <param name="shortName">
+        /// The short name.
+        /// </param>
+        public HBVideoEncoder(int compatibleContainers, string displayName, int id, string shortName)
+        {
+            this.CompatibleContainers = compatibleContainers;
+            this.DisplayName = displayName;
+            this.Id = id;
+            this.ShortName = shortName;
+        }
+
+        /// <summary>
+        /// Gets the compatible containers.
+        /// </summary>
+        public int CompatibleContainers { get; private set; }
+
+        /// <summary>
+        /// Gets the display name.
+        /// </summary>
+        public string DisplayName { get; private set; }
+
+        /// <summary>
+        /// Gets the id.
+        /// </summary>
+        public int Id { get; private set; }
+
+        /// <summary>
+        /// Gets the short name.
+        /// </summary>
+        public string ShortName { get; private set; }
+
+        /// <summary>
+        /// Gets the list of presets this encoder supports. (null if the encoder doesn't support presets)
+        /// </summary>
+        public List<string> Presets
+        {
+            get
+            {
+                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_presets(this.Id));
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of tunes this encoder supports. (null if the encoder doesn't support tunes)
+        /// </summary>
+        public List<string> Tunes
+        {
+            get
+            {
+                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_tunes(this.Id));
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of profiles this encoder supports. (null if the encoder doesn't support profiles)
+        /// </summary>
+        public List<string> Profiles
+        {
+            get
+            {
+                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_profiles(this.Id));
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of levels this encoder supports. (null if the encoder doesn't support levels)
+        /// </summary>
+        public List<string> Levels
+        {
+            get
+            {
+                return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_levels(this.Id));
+            }
+        } 
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/PictureRotation.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
index 76dc2846b..2c0d85b9d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/PictureRotation.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PictureRotation.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Possible picture rotations.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// Possible picture rotations.
-    /// </summary>
-    public enum PictureRotation
-    {
-        None = 0,
-        Clockwise90,
-        Clockwise180,
-        Clockwise270
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureRotation.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Possible picture rotations.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// Possible picture rotations.
+    /// </summary>
+    public enum PictureRotation
+    {
+        None = 0,
+        Clockwise90,
+        Clockwise180,
+        Clockwise270
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/ScaleMethod.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
index 5d49ec2ae..8f62f3f22 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/ScaleMethod.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
@@ -1,27 +1,27 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScaleMethod.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Scaling Method
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// Enumeration of rescaling algorithms.
-    /// </summary>
-    public enum ScaleMethod
-    {
-        /// <summary>
-        /// Standard software scaling. Highest quality.
-        /// </summary>
-        Lanczos = 0,
-
-        /// <summary>
-        /// OpenCL-assisted bicubic scaling.
-        /// </summary>
-        Bicubic = 1
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScaleMethod.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Scaling Method
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// Enumeration of rescaling algorithms.
+    /// </summary>
+    public enum ScaleMethod
+    {
+        /// <summary>
+        /// Standard software scaling. Highest quality.
+        /// </summary>
+        Lanczos = 0,
+
+        /// <summary>
+        /// OpenCL-assisted bicubic scaling.
+        /// </summary>
+        Bicubic = 1
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Sharpen.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs
index 7f5b9e75a..5924604fe 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Sharpen.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs
@@ -7,9 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Model.Encoding
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The Sharpen.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncodeRateType.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs
index beb5ca949..461b3931d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncodeRateType.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs
@@ -1,21 +1,21 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the VideoEncodeRateType type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    /// <summary>
-    /// The video encode rate type.
-    /// </summary>
-    public enum VideoEncodeRateType
-    {
-        TargetSize = 0,
-        AverageBitrate = 1,
-        ConstantQuality = 2
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the VideoEncodeRateType type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    /// <summary>
+    /// The video encode rate type.
+    /// </summary>
+    public enum VideoEncodeRateType
+    {
+        TargetSize = 0,
+        AverageBitrate = 1,
+        ConstantQuality = 2
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs
index e2b82db1d..68c09d0d1 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs
@@ -1,71 +1,71 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The video encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Encoding
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    /// The video encoder.
-    /// </summary>
-    public enum VideoEncoder
-    {
-        [DisplayName("H.264 (x264)")]
-        [ShortName("x264")]
-        X264 = 0,
-
-        [DisplayName("H.264 10-bit (x264)")]
-        [ShortName("x264_10bit")]
-        X264_10,
-
-        [DisplayName("H.264 (Intel QSV)")]
-        [ShortName("qsv_h264")]
-        QuickSync,
-
-        [DisplayName("MPEG-4")]
-        [ShortName("mpeg4")]
-        FFMpeg,
-
-        [DisplayName("MPEG-2")]
-        [ShortName("mpeg2")]
-        FFMpeg2,
-
-        [DisplayName("Theora")]
-        [ShortName("theora")]
-        Theora,
-
-        [DisplayName("H.265 (x265)")]
-        [ShortName("x265")]
-        X265,
-
-        [DisplayName("H.265 12-bit (x265)")]
-        [ShortName("x265_12bit")]
-        X265_12,
-
-        [DisplayName("H.265 10-bit (x265)")]
-        [ShortName("x265_10bit")]
-        X265_10,
-
-        [DisplayName("H.265 (Intel QSV)")]
-        [ShortName("qsv_h265")]
-        QuickSyncH265,
-
-        [DisplayName("H.265 10-bit (Intel QSV)")]
-        [ShortName("qsv_h265_10bit")]
-        QuickSyncH26510b,
-
-        [DisplayName("VP8")]
-        [ShortName("VP8")]
-        VP8,
-
-        [DisplayName("VP9")]
-        [ShortName("VP9")]
-        VP9
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Encoding
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    /// The video encoder.
+    /// </summary>
+    public enum VideoEncoder
+    {
+        [DisplayName("H.264 (x264)")]
+        [ShortName("x264")]
+        X264 = 0,
+
+        [DisplayName("H.264 10-bit (x264)")]
+        [ShortName("x264_10bit")]
+        X264_10,
+
+        [DisplayName("H.264 (Intel QSV)")]
+        [ShortName("qsv_h264")]
+        QuickSync,
+
+        [DisplayName("MPEG-4")]
+        [ShortName("mpeg4")]
+        FFMpeg,
+
+        [DisplayName("MPEG-2")]
+        [ShortName("mpeg2")]
+        FFMpeg2,
+
+        [DisplayName("Theora")]
+        [ShortName("theora")]
+        Theora,
+
+        [DisplayName("H.265 (x265)")]
+        [ShortName("x265")]
+        X265,
+
+        [DisplayName("H.265 12-bit (x265)")]
+        [ShortName("x265_12bit")]
+        X265_12,
+
+        [DisplayName("H.265 10-bit (x265)")]
+        [ShortName("x265_10bit")]
+        X265_10,
+
+        [DisplayName("H.265 (Intel QSV)")]
+        [ShortName("qsv_h265")]
+        QuickSyncH265,
+
+        [DisplayName("H.265 10-bit (Intel QSV)")]
+        [ShortName("qsv_h265_10bit")]
+        QuickSyncH26510b,
+
+        [DisplayName("VP8")]
+        [ShortName("VP8")]
+        VP8,
+
+        [DisplayName("VP9")]
+        [ShortName("VP9")]
+        VP9
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Language.cs b/win/CS/HandBrake.Interop/Interop/Model/Language.cs
index a110f2590..5564a434e 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Language.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Language.cs
@@ -1,67 +1,67 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Language.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Represents a language.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// Represents a language.
-    /// </summary>
-    public class Language
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Language"/> class.
-        /// </summary>
-        /// <param name="englishName">
-        /// The english name.
-        /// </param>
-        /// <param name="nativeName">
-        /// The native name.
-        /// </param>
-        /// <param name="code">
-        /// The code.
-        /// </param>
-        public Language(string englishName, string nativeName, string code)
-        {
-            this.EnglishName = englishName;
-            this.NativeName = nativeName;
-            this.Code = code;
-        }
-
-        /// <summary>
-        /// Gets the english name of the language.
-        /// </summary>
-        public string EnglishName { get; private set; }
-
-        /// <summary>
-        /// Gets the native name of the language.
-        /// </summary>
-        public string NativeName { get; private set; }
-
-        /// <summary>
-        /// Gets the language code.
-        /// </summary>
-        public string Code { get; private set; }
-
-        /// <summary>
-        /// Gets the display string for the language.
-        /// </summary>
-        public string Display
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(this.NativeName) && this.NativeName != this.EnglishName)
-                {
-                    return this.EnglishName + " (" + this.NativeName + ")";
-                }
-
-                return this.EnglishName;
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Language.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Represents a language.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// Represents a language.
+    /// </summary>
+    public class Language
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Language"/> class.
+        /// </summary>
+        /// <param name="englishName">
+        /// The english name.
+        /// </param>
+        /// <param name="nativeName">
+        /// The native name.
+        /// </param>
+        /// <param name="code">
+        /// The code.
+        /// </param>
+        public Language(string englishName, string nativeName, string code)
+        {
+            this.EnglishName = englishName;
+            this.NativeName = nativeName;
+            this.Code = code;
+        }
+
+        /// <summary>
+        /// Gets the english name of the language.
+        /// </summary>
+        public string EnglishName { get; private set; }
+
+        /// <summary>
+        /// Gets the native name of the language.
+        /// </summary>
+        public string NativeName { get; private set; }
+
+        /// <summary>
+        /// Gets the language code.
+        /// </summary>
+        public string Code { get; private set; }
+
+        /// <summary>
+        /// Gets the display string for the language.
+        /// </summary>
+        public string Display
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(this.NativeName) && this.NativeName != this.EnglishName)
+                {
+                    return this.EnglishName + " (" + this.NativeName + ")";
+                }
+
+                return this.EnglishName;
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs b/win/CS/HandBrake.Interop/Interop/Model/Preview/PreviewSettings.cs
index b3c330a7c..beebc12f5 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Preview/PreviewSettings.cs
@@ -1,81 +1,81 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PreviewSettings.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The preview settings.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model.Preview
-{
-    using Encoding;
-
-    /// <summary>
-    /// The preview settings.
-    /// </summary>
-    public class PreviewSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PreviewSettings"/> class.
-        /// </summary>
-        public PreviewSettings()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the cropping.
-        /// </summary>
-        public Cropping Cropping { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max width.
-        /// </summary>
-        public int MaxWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max height.
-        /// </summary>
-        public int MaxHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether keep display aspect.
-        /// </summary>
-        public bool KeepDisplayAspect { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title number.
-        /// </summary>
-        public int TitleNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets the anamorphic.
-        /// </summary>
-        public Anamorphic Anamorphic { get; set; }
-
-        /// <summary>
-        /// Gets or sets the modulus.
-        /// </summary>
-        public int? Modulus { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pixel aspect x.
-        /// </summary>
-        public int PixelAspectX { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pixel aspect y.
-        /// </summary>
-        public int PixelAspectY { get; set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PreviewSettings.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The preview settings.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model.Preview
+{
+    using Encoding;
+
+    /// <summary>
+    /// The preview settings.
+    /// </summary>
+    public class PreviewSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviewSettings"/> class.
+        /// </summary>
+        public PreviewSettings()
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the cropping.
+        /// </summary>
+        public Cropping Cropping { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max width.
+        /// </summary>
+        public int MaxWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max height.
+        /// </summary>
+        public int MaxHeight { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether keep display aspect.
+        /// </summary>
+        public bool KeepDisplayAspect { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title number.
+        /// </summary>
+        public int TitleNumber { get; set; }
+
+        /// <summary>
+        /// Gets or sets the anamorphic.
+        /// </summary>
+        public Anamorphic Anamorphic { get; set; }
+
+        /// <summary>
+        /// Gets or sets the modulus.
+        /// </summary>
+        public int? Modulus { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width.
+        /// </summary>
+        public int Width { get; set; }
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        public int Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pixel aspect x.
+        /// </summary>
+        public int PixelAspectX { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pixel aspect y.
+        /// </summary>
+        public int PixelAspectY { get; set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/RawPreviewData.cs b/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs
index 2da2dc52d..8768d0054 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/RawPreviewData.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.ApplicationServices.Interop.Model.Preview
+namespace HandBrake.Interop.Interop.Model.Preview
 {
     public class RawPreviewData
     {
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/RangeLimits.cs b/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs
index b25c610dd..3a05f8e38 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/RangeLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs
@@ -1,60 +1,60 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The range limits.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// The range limits.
-    /// </summary>
-    public class RangeLimits
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RangeLimits"/> class.
-        /// </summary>
-        /// <param name="ascending">
-        /// The ascending.
-        /// </param>
-        /// <param name="granularity">
-        /// The granularity.
-        /// </param>
-        /// <param name="high">
-        /// The high.
-        /// </param>
-        /// <param name="low">
-        /// The low.
-        /// </param>
-        public RangeLimits(bool @ascending, float granularity, float high, float low)
-        {
-            this.Ascending = @ascending;
-            this.Granularity = granularity;
-            this.High = high;
-            this.Low = low;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether ascending.
-        /// </summary>
-        public bool Ascending { get; private set; }
-
-        /// <summary>
-        /// Gets the granularity.
-        /// </summary>
-        public float Granularity { get; private set; }
-
-        /// <summary>
-        /// Gets the high.
-        /// </summary>
-        public float High { get; private set; }
-
-        /// <summary>
-        /// Gets the low.
-        /// </summary>
-        public float Low { get; private set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The range limits.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// The range limits.
+    /// </summary>
+    public class RangeLimits
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RangeLimits"/> class.
+        /// </summary>
+        /// <param name="ascending">
+        /// The ascending.
+        /// </param>
+        /// <param name="granularity">
+        /// The granularity.
+        /// </param>
+        /// <param name="high">
+        /// The high.
+        /// </param>
+        /// <param name="low">
+        /// The low.
+        /// </param>
+        public RangeLimits(bool @ascending, float granularity, float high, float low)
+        {
+            this.Ascending = @ascending;
+            this.Granularity = granularity;
+            this.High = high;
+            this.Low = low;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether ascending.
+        /// </summary>
+        public bool Ascending { get; private set; }
+
+        /// <summary>
+        /// Gets the granularity.
+        /// </summary>
+        public float Granularity { get; private set; }
+
+        /// <summary>
+        /// Gets the high.
+        /// </summary>
+        public float High { get; private set; }
+
+        /// <summary>
+        /// Gets the low.
+        /// </summary>
+        public float Low { get; private set; }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs b/win/CS/HandBrake.Interop/Interop/Model/Size.cs
index 4a4e09d34..6113b8bcf 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Size.cs
@@ -1,60 +1,60 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Size.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the Size type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// The size.
-    /// </summary>
-    public class Size
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Size"/> class.
-        /// </summary>
-        /// <param name="width">
-        /// The width.
-        /// </param>
-        /// <param name="height">
-        /// The height.
-        /// </param>
-        public Size(int width, int height)
-        {
-            this.Width = width;
-            this.Height = height;
-        }
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public int Height { get; private set; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether is empty.
-        /// </summary>
-        public bool IsEmpty 
-        {
-            get
-            {
-                if (this.Width <= 0 && this.Height <= 0)
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-        }
-    }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Size.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Size type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// The size.
+    /// </summary>
+    public class Size
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Size"/> class.
+        /// </summary>
+        /// <param name="width">
+        /// The width.
+        /// </param>
+        /// <param name="height">
+        /// The height.
+        /// </param>
+        public Size(int width, int height)
+        {
+            this.Width = width;
+            this.Height = height;
+        }
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public int Height { get; private set; }
+
+        /// <summary>
+        /// Gets the width.
+        /// </summary>
+        public int Width { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether is empty.
+        /// </summary>
+        public bool IsEmpty 
+        {
+            get
+            {
+                if (this.Width <= 0 && this.Height <= 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+    }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs b/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
index 4a0ffd2ec..23b43df79 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceVideoInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The source framerate info.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// The source framerate info.
-    /// </summary>
-    public class SourceVideoInfo
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SourceVideoInfo"/> class.
-        /// </summary>
-        /// <param name="resolution">
-        /// The resolution.
-        /// </param>
-        /// <param name="parVal">
-        /// The par val.
-        /// </param>
-        public SourceVideoInfo(Size resolution, Size parVal)
-        {
-            this.Resolution = resolution;
-            this.ParVal = parVal;
-        }
-
-        /// <summary>
-        /// Gets the resolution (width/height) of this Title
-        /// </summary>
-        public Size Resolution { get; private set; }
-
-        /// <summary>
-        /// Gets the pixel aspect ratio.
-        /// </summary>
-        public Size ParVal { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceVideoInfo.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The source framerate info.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// The source framerate info.
+    /// </summary>
+    public class SourceVideoInfo
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SourceVideoInfo"/> class.
+        /// </summary>
+        /// <param name="resolution">
+        /// The resolution.
+        /// </param>
+        /// <param name="parVal">
+        /// The par val.
+        /// </param>
+        public SourceVideoInfo(Size resolution, Size parVal)
+        {
+            this.Resolution = resolution;
+            this.ParVal = parVal;
+        }
+
+        /// <summary>
+        /// Gets the resolution (width/height) of this Title
+        /// </summary>
+        public Size Resolution { get; private set; }
+
+        /// <summary>
+        /// Gets the pixel aspect ratio.
+        /// </summary>
+        public Size ParVal { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/VideoQualityLimits.cs b/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs
index 19a0755af..64fbd6f4f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/VideoQualityLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs
@@ -1,60 +1,60 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoQualityLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the VideoQualityLimits type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Model
-{
-    /// <summary>
-    /// Represents limits on video quality for a particular encoder.
-    /// </summary>
-    public class VideoQualityLimits
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VideoQualityLimits"/> class.
-        /// </summary>
-        /// <param name="low">
-        /// The low.
-        /// </param>
-        /// <param name="high">
-        /// The high.
-        /// </param>
-        /// <param name="granularity">
-        /// The granularity.
-        /// </param>
-        /// <param name="ascending">
-        /// The ascending.
-        /// </param>
-        public VideoQualityLimits(float low, float high, float granularity, bool @ascending)
-        {
-            this.Low = low;
-            this.High = high;
-            this.Granularity = granularity;
-            this.Ascending = @ascending;
-        }
-
-        /// <summary>
-        /// Gets the inclusive lower limit for the quality.
-        /// </summary>
-        public float Low { get; private set; }
-
-        /// <summary>
-        /// Gets the inclusive upper limit for the quality.
-        /// </summary>
-        public float High { get; private set; }
-
-        /// <summary>
-        /// Gets the granularity for the quality.
-        /// </summary>
-        public float Granularity { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the quality increases as the number increases.
-        /// </summary>
-        public bool Ascending { get; private set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoQualityLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the VideoQualityLimits type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Model
+{
+    /// <summary>
+    /// Represents limits on video quality for a particular encoder.
+    /// </summary>
+    public class VideoQualityLimits
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VideoQualityLimits"/> class.
+        /// </summary>
+        /// <param name="low">
+        /// The low.
+        /// </param>
+        /// <param name="high">
+        /// The high.
+        /// </param>
+        /// <param name="granularity">
+        /// The granularity.
+        /// </param>
+        /// <param name="ascending">
+        /// The ascending.
+        /// </param>
+        public VideoQualityLimits(float low, float high, float granularity, bool @ascending)
+        {
+            this.Low = low;
+            this.High = high;
+            this.Granularity = granularity;
+            this.Ascending = @ascending;
+        }
+
+        /// <summary>
+        /// Gets the inclusive lower limit for the quality.
+        /// </summary>
+        public float Low { get; private set; }
+
+        /// <summary>
+        /// Gets the inclusive upper limit for the quality.
+        /// </summary>
+        public float High { get; private set; }
+
+        /// <summary>
+        /// Gets the granularity for the quality.
+        /// </summary>
+        public float Granularity { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the quality increases as the number increases.
+        /// </summary>
+        public bool Ascending { get; private set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs b/win/CS/HandBrake.Interop/Model/HBConfiguration.cs
index fd8c97ea3..a9c59c8b4 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
+++ b/win/CS/HandBrake.Interop/Model/HBConfiguration.cs
@@ -1,67 +1,67 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBConfiguration.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   HandBrakes Configuration options
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Model
-{
-    /// <summary>
-    /// HandBrakes configuration options
-    /// </summary>
-    public class HBConfiguration
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether is dvd nav disabled.
-        /// </summary>
-        public bool IsDvdNavDisabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether disable quick sync decoding.
-        /// </summary>
-        public bool EnableQuickSyncDecoding { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether use qsv decode for non qsv enc.
-        /// </summary>
-        public bool UseQSVDecodeForNonQSVEnc { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scaling mode.
-        /// </summary>
-        public VideoScaler ScalingMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preview scan count.
-        /// </summary>
-        public int PreviewScanCount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the verbosity.
-        /// </summary>
-        public int Verbosity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min scan duration.
-        /// </summary>
-        public int MinScanDuration { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether save log to copy directory.
-        /// </summary>
-        public bool SaveLogToCopyDirectory { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether save log with video.
-        /// </summary>
-        public bool SaveLogWithVideo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the save log copy directory.
-        /// </summary>
-        public string SaveLogCopyDirectory { get; set; }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBConfiguration.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   HandBrakes Configuration options
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+    /// <summary>
+    /// HandBrakes configuration options
+    /// </summary>
+    public class HBConfiguration
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether is dvd nav disabled.
+        /// </summary>
+        public bool IsDvdNavDisabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether disable quick sync decoding.
+        /// </summary>
+        public bool EnableQuickSyncDecoding { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether use qsv decode for non qsv enc.
+        /// </summary>
+        public bool UseQSVDecodeForNonQSVEnc { get; set; }
+
+        /// <summary>
+        /// Gets or sets the scaling mode.
+        /// </summary>
+        public VideoScaler ScalingMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preview scan count.
+        /// </summary>
+        public int PreviewScanCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets the verbosity.
+        /// </summary>
+        public int Verbosity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the min scan duration.
+        /// </summary>
+        public int MinScanDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether save log to copy directory.
+        /// </summary>
+        public bool SaveLogToCopyDirectory { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether save log with video.
+        /// </summary>
+        public bool SaveLogWithVideo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the save log copy directory.
+        /// </summary>
+        public string SaveLogCopyDirectory { get; set; }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs b/win/CS/HandBrake.Interop/Model/VideoScaler.cs
index 4f407881c..03a19fcf3 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs
+++ b/win/CS/HandBrake.Interop/Model/VideoScaler.cs
@@ -1,23 +1,23 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoScaler.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The different scaling modes available in HandBrake
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Model
-{
-    using HandBrake.ApplicationServices.Attributes;
-
-    /// <summary>
-    ///  The different scaling modes available in HandBrake
-    /// </summary>
-    public enum VideoScaler
-    {
-        [DisplayName("Lanczos (default)")]
-        [ShortName("swscale")]
-        Lanczos = 0,
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoScaler.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The different scaling modes available in HandBrake
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+    using HandBrake.Interop.Attributes;
+
+    /// <summary>
+    ///  The different scaling modes available in HandBrake
+    /// </summary>
+    public enum VideoScaler
+    {
+        [DisplayName("Lanczos (default)")]
+        [ShortName("swscale")]
+        Lanczos = 0,
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs
index c147f3bca..c15a66b8a 100644
--- a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs
@@ -1,47 +1,47 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake LibHB Wrapper")]
-[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2018 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: NeutralResourcesLanguage("")]
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Assembly Info
+// </summary>
+// <auto-generated/>
+// --------------------------------------------------------------------------------------------------------------------
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HandBrake.Interop")]
+[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake Team")]
+[assembly: AssemblyProduct("HandBrake")]
+[assembly: AssemblyCopyright("Copyright © 2003-2018 HandBrake Team")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: NeutralResourcesLanguage("")]
diff --git a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs b/win/CS/HandBrake.Interop/Properties/Resources.Designer.cs
index 32976b8b7..c288971f6 100644
--- a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrake.Interop/Properties/Resources.Designer.cs
@@ -1,63 +1,63 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandBrake.ApplicationServices.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandBrake.Interop.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Properties/Resources.resx b/win/CS/HandBrake.Interop/Properties/Resources.resx
index 29dcb1b3a..1af7de150 100644
--- a/win/CS/HandBrake.ApplicationServices/Properties/Resources.resx
+++ b/win/CS/HandBrake.Interop/Properties/Resources.resx
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs b/win/CS/HandBrake.Interop/Utilities/CharCodesUtilities.cs
index 8470927f6..ced240bb7 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/CharCodesUtilities.cs
+++ b/win/CS/HandBrake.Interop/Utilities/CharCodesUtilities.cs
@@ -1,63 +1,63 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CharCodesUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Char Codes
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Utilities
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Char Codes
-    /// </summary>
-    public class CharCodesUtilities
-    {
-        /// <summary>
-        /// Get a command subset of character codes.
-        /// </summary>
-        /// <returns>
-        /// A String List of Character codes.
-        /// </returns>
-        public static List<string> GetCharacterCodes()
-        {
-            return new List<string>
-                {
-                    "ANSI_X3.4-1968",
-                    "ANSI_X3.4-1986",
-                    "ANSI_X3.4",
-                    "ANSI_X3.110-1983",
-                    "ANSI_X3.110",
-                    "ASCII",
-                    "ECMA-114",
-                    "ECMA-118",
-                    "ECMA-128",
-                    "ECMA-CYRILLIC",
-                    "IEC_P27-1",
-                    "ISO-8859-1",
-                    "ISO-8859-2",
-                    "ISO-8859-3",
-                    "ISO-8859-4",
-                    "ISO-8859-5",
-                    "ISO-8859-6",
-                    "ISO-8859-7",
-                    "ISO-8859-8",
-                    "ISO-8859-9",
-                    "ISO-8859-9E",
-                    "ISO-8859-10",
-                    "ISO-8859-11",
-                    "ISO-8859-13",
-                    "ISO-8859-14",
-                    "ISO-8859-15",
-                    "ISO-8859-16",
-                    "UTF-7",
-                    "UTF-8",
-                    "UTF-16",
-                    "UTF-32"
-                };
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CharCodesUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Char Codes
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Utilities
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Char Codes
+    /// </summary>
+    public class CharCodesUtilities
+    {
+        /// <summary>
+        /// Get a command subset of character codes.
+        /// </summary>
+        /// <returns>
+        /// A String List of Character codes.
+        /// </returns>
+        public static List<string> GetCharacterCodes()
+        {
+            return new List<string>
+                {
+                    "ANSI_X3.4-1968",
+                    "ANSI_X3.4-1986",
+                    "ANSI_X3.4",
+                    "ANSI_X3.110-1983",
+                    "ANSI_X3.110",
+                    "ASCII",
+                    "ECMA-114",
+                    "ECMA-118",
+                    "ECMA-128",
+                    "ECMA-CYRILLIC",
+                    "IEC_P27-1",
+                    "ISO-8859-1",
+                    "ISO-8859-2",
+                    "ISO-8859-3",
+                    "ISO-8859-4",
+                    "ISO-8859-5",
+                    "ISO-8859-6",
+                    "ISO-8859-7",
+                    "ISO-8859-8",
+                    "ISO-8859-9",
+                    "ISO-8859-9E",
+                    "ISO-8859-10",
+                    "ISO-8859-11",
+                    "ISO-8859-13",
+                    "ISO-8859-14",
+                    "ISO-8859-15",
+                    "ISO-8859-16",
+                    "UTF-7",
+                    "UTF-8",
+                    "UTF-16",
+                    "UTF-32"
+                };
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs
index d8a3c0854..49c16c818 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
+++ b/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs
@@ -1,312 +1,312 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LanguageUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Language Utilities
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Utilities
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Language Utilities
-    /// </summary>
-    public class LanguageUtilities
-    {
-        /// <summary>
-        /// The language map.
-        /// </summary>
-        private static IDictionary<string, string> languageMap;
-
-        /// <summary>
-        /// Map languages and their iso639_2 value into a IDictionary
-        /// </summary>
-        /// <returns>A Dictionary containing the language and iso code</returns>
-        public static IDictionary<string, string> MapLanguages()
-        {
-            if (languageMap != null)
-            {
-                return languageMap;
-            }
-
-            languageMap = new Dictionary<string, string>
-                          {
-                              { "(Any)", "und" },
-                              { "Afar", "aar" },
-                              { "Abkhazian", "abk" },
-                              { "Afrikaans", "afr" },
-                              { "Akan", "aka" },
-                              { "Albanian", "sqi" },
-                              { "Amharic", "amh" },
-                              { "Arabic", "ara" },
-                              { "Aragonese", "arg" },
-                              { "Armenian", "hye" },
-                              { "Assamese", "asm" },
-                              { "Avaric", "ava" },
-                              { "Avestan", "ave" },
-                              { "Aymara", "aym" },
-                              { "Azerbaijani", "aze" },
-                              { "Bashkir", "bak" },
-                              { "Bambara", "bam" },
-                              { "Basque", "eus" },
-                              { "Belarusian", "bel" },
-                              { "Bengali", "ben" },
-                              { "Bihari", "bih" },
-                              { "Bislama", "bis" },
-                              { "Bosnian", "bos" },
-                              { "Breton", "bre" },
-                              { "Bulgarian", "bul" },
-                              { "Burmese", "mya" },
-                              { "Catalan", "cat" },
-                              { "Chamorro", "cha" },
-                              { "Chechen", "che" },
-                              { "Chinese", "zho" },
-                              { "Church Slavic", "chu" },
-                              { "Chuvash", "chv" },
-                              { "Cornish", "cor" },
-                              { "Corsican", "cos" },
-                              { "Cree", "cre" },
-                              { "Czech", "ces" },
-                              { "Dansk", "dan" },
-                              { "Divehi", "div" },
-                              { "Nederlands", "nld" },
-                              { "Dzongkha", "dzo" },
-                              { "English", "eng" },
-                              { "Esperanto", "epo" },
-                              { "Estonian", "est" },
-                              { "Ewe", "ewe" },
-                              { "Faroese", "fao" },
-                              { "Fijian", "fij" },
-                              { "Suomi", "fin" },
-                              { "Francais", "fra" },
-                              { "Western Frisian", "fry" },
-                              { "Fulah", "ful" },
-                              { "Georgian", "kat" },
-                              { "Deutsch", "deu" },
-                              { "Gaelic (Scots)", "gla" },
-                              { "Irish", "gle" },
-                              { "Galician", "glg" },
-                              { "Manx", "glv" },
-                              { "Greek, Modern", "ell" },
-                              { "Guarani", "grn" },
-                              { "Gujarati", "guj" },
-                              { "Haitian", "hat" },
-                              { "Hausa", "hau" },
-                              { "Hebrew", "heb" },
-                              { "Herero", "her" },
-                              { "Hindi", "hin" },
-                              { "Hiri Motu", "hmo" },
-                              { "Magyar", "hun" },
-                              { "Igbo", "ibo" },
-                              { "Islenska", "isl" },
-                              { "Ido", "ido" },
-                              { "Sichuan Yi", "iii" },
-                              { "Inuktitut", "iku" },
-                              { "Interlingue", "ile" },
-                              { "Interlingua", "ina" },
-                              { "Indonesian", "ind" },
-                              { "Inupiaq", "ipk" },
-                              { "Italiano", "ita" },
-                              { "Javanese", "jav" },
-                              { "Japanese", "jpn" },
-                              { "Kalaallisut", "kal" },
-                              { "Kannada", "kan" },
-                              { "Kashmiri", "kas" },
-                              { "Kanuri", "kau" },
-                              { "Kazakh", "kaz" },
-                              { "Central Khmer", "khm" },
-                              { "Kikuyu", "kik" },
-                              { "Kinyarwanda", "kin" },
-                              { "Kirghiz", "kir" },
-                              { "Komi", "kom" },
-                              { "Kongo", "kon" },
-                              { "Korean", "kor" },
-                              { "Kuanyama", "kua" },
-                              { "Kurdish", "kur" },
-                              { "Lao", "lao" },
-                              { "Latin", "lat" },
-                              { "Latvian", "lav" },
-                              { "Limburgan", "lim" },
-                              { "Lingala", "lin" },
-                              { "Lithuanian", "lit" },
-                              { "Luxembourgish", "ltz" },
-                              { "Luba-Katanga", "lub" },
-                              { "Ganda", "lug" },
-                              { "Macedonian", "mkd" },
-                              { "Marshallese", "mah" },
-                              { "Malayalam", "mal" },
-                              { "Maori", "mri" },
-                              { "Marathi", "mar" },
-                              { "Malay", "msa" },
-                              { "Malagasy", "mlg" },
-                              { "Maltese", "mlt" },
-                              { "Moldavian", "mol" },
-                              { "Mongolian", "mon" },
-                              { "Nauru", "nau" },
-                              { "Navajo", "nav" },
-                              { "Ndebele, South", "nbl" },
-                              { "Ndebele, North", "nde" },
-                              { "Ndonga", "ndo" },
-                              { "Nepali", "nep" },
-                              { "Norwegian Nynorsk", "nno" },
-                              { "Norwegian Bokmål", "nob" },
-                              { "Norsk", "nor" },
-                              { "Chichewa; Nyanja", "nya" },
-                              { "Occitan", "oci" },
-                              { "Ojibwa", "oji" },
-                              { "Oriya", "ori" },
-                              { "Oromo", "orm" },
-                              { "Ossetian", "oss" },
-                              { "Panjabi", "pan" },
-                              { "Persian", "fas" },
-                              { "Pali", "pli" },
-                              { "Polish", "pol" },
-                              { "Portuguese", "por" },
-                              { "Pushto", "pus" },
-                              { "Quechua", "que" },
-                              { "Romansh", "roh" },
-                              { "Romanian", "ron" },
-                              { "Rundi", "run" },
-                              { "Russian", "rus" },
-                              { "Sango", "sag" },
-                              { "Sanskrit", "san" },
-                              { "Serbian", "srp" },
-                              { "Hrvatski", "hrv" },
-                              { "Sinhala", "sin" },
-                              { "Slovak", "slk" },
-                              { "Slovenian", "slv" },
-                              { "Northern Sami", "sme" },
-                              { "Samoan", "smo" },
-                              { "Shona", "sna" },
-                              { "Sindhi", "snd" },
-                              { "Somali", "som" },
-                              { "Sotho Southern", "sot" },
-                              { "Espanol", "spa" },
-                              { "Sardinian", "srd" },
-                              { "Swati", "ssw" },
-                              { "Sundanese", "sun" },
-                              { "Swahili", "swa" },
-                              { "Svenska", "swe" },
-                              { "Tahitian", "tah" },
-                              { "Tamil", "tam" },
-                              { "Tatar", "tat" },
-                              { "Telugu", "tel" },
-                              { "Tajik", "tgk" },
-                              { "Tagalog", "tgl" },
-                              { "Thai", "tha" },
-                              { "Tibetan", "bod" },
-                              { "Tigrinya", "tir" },
-                              { "Tonga", "ton" },
-                              { "Tswana", "tsn" },
-                              { "Tsonga", "tso" },
-                              { "Turkmen", "tuk" },
-                              { "Turkish", "tur" },
-                              { "Twi", "twi" },
-                              { "Uighur", "uig" },
-                              { "Ukrainian", "ukr" },
-                              { "Urdu", "urd" },
-                              { "Uzbek", "uzb" },
-                              { "Venda", "ven" },
-                              { "Vietnamese", "vie" },
-                              { "Volapük", "vol" },
-                              { "Welsh", "cym" },
-                              { "Walloon", "wln" },
-                              { "Wolof", "wol" },
-                              { "Xhosa", "xho" },
-                              { "Yiddish", "yid" },
-                              { "Yoruba", "yor" },
-                              { "Zhuang", "zha" },
-                              { "Zulu", "zul" }
-                          };
-
-            return languageMap;
-        }
-
-        /// <summary>
-        /// The get language codes.
-        /// </summary>
-        /// <param name="userLanguages">
-        /// The user languages.
-        /// </param>
-        /// <returns>
-        /// The <see cref="List"/>.
-        /// </returns>
-        public static List<string> GetLanguageCodes(IEnumerable<string> userLanguages)
-        {
-            // Translate to Iso Codes
-            List<string> iso6392Codes = new List<string>();
-            foreach (var item in userLanguages)
-            {
-                string isoCode;
-                if (MapLanguages().TryGetValue(item, out isoCode))
-                {
-                    iso6392Codes.Add(isoCode);
-                }
-            }
-
-            return iso6392Codes;
-        }
-
-        /// <summary>
-        /// The get language names.
-        /// </summary>
-        /// <param name="languageCodes">
-        /// The language codes.
-        /// </param>
-        /// <returns>
-        /// The <see cref="List"/>.
-        /// </returns>
-        public static List<string> GetLanguageNames(IList<string> languageCodes)
-        {
-            // Translate to Iso Codes
-            List<string> names = new List<string>();
-            foreach (var item in languageCodes)
-            {
-                KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item);  // Slightly inefficient but small set anyway so not a big issue.
-                names.Add(name.Key);
-            }
-
-            return names;
-        }
-
-        /// <summary>
-        /// The get iso codes.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="List"/>.
-        /// </returns>
-        public static List<string> GetIsoCodes()
-        {
-           return MapLanguages().Values.ToList();
-        }
-
-        /// <summary>
-        /// The get language code.
-        /// </summary>
-        /// <param name="language">
-        /// The language.
-        /// </param>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public static string GetLanguageCode(string language)
-        {
-            if (string.IsNullOrEmpty(language))
-            {
-                return null;
-            }
-
-            string isoCode;
-            if (MapLanguages().TryGetValue(language, out isoCode))
-            {
-                return isoCode;
-            }
-
-            return null;
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LanguageUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Language Utilities
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Utilities
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Language Utilities
+    /// </summary>
+    public class LanguageUtilities
+    {
+        /// <summary>
+        /// The language map.
+        /// </summary>
+        private static IDictionary<string, string> languageMap;
+
+        /// <summary>
+        /// Map languages and their iso639_2 value into a IDictionary
+        /// </summary>
+        /// <returns>A Dictionary containing the language and iso code</returns>
+        public static IDictionary<string, string> MapLanguages()
+        {
+            if (languageMap != null)
+            {
+                return languageMap;
+            }
+
+            languageMap = new Dictionary<string, string>
+                          {
+                              { "(Any)", "und" },
+                              { "Afar", "aar" },
+                              { "Abkhazian", "abk" },
+                              { "Afrikaans", "afr" },
+                              { "Akan", "aka" },
+                              { "Albanian", "sqi" },
+                              { "Amharic", "amh" },
+                              { "Arabic", "ara" },
+                              { "Aragonese", "arg" },
+                              { "Armenian", "hye" },
+                              { "Assamese", "asm" },
+                              { "Avaric", "ava" },
+                              { "Avestan", "ave" },
+                              { "Aymara", "aym" },
+                              { "Azerbaijani", "aze" },
+                              { "Bashkir", "bak" },
+                              { "Bambara", "bam" },
+                              { "Basque", "eus" },
+                              { "Belarusian", "bel" },
+                              { "Bengali", "ben" },
+                              { "Bihari", "bih" },
+                              { "Bislama", "bis" },
+                              { "Bosnian", "bos" },
+                              { "Breton", "bre" },
+                              { "Bulgarian", "bul" },
+                              { "Burmese", "mya" },
+                              { "Catalan", "cat" },
+                              { "Chamorro", "cha" },
+                              { "Chechen", "che" },
+                              { "Chinese", "zho" },
+                              { "Church Slavic", "chu" },
+                              { "Chuvash", "chv" },
+                              { "Cornish", "cor" },
+                              { "Corsican", "cos" },
+                              { "Cree", "cre" },
+                              { "Czech", "ces" },
+                              { "Dansk", "dan" },
+                              { "Divehi", "div" },
+                              { "Nederlands", "nld" },
+                              { "Dzongkha", "dzo" },
+                              { "English", "eng" },
+                              { "Esperanto", "epo" },
+                              { "Estonian", "est" },
+                              { "Ewe", "ewe" },
+                              { "Faroese", "fao" },
+                              { "Fijian", "fij" },
+                              { "Suomi", "fin" },
+                              { "Francais", "fra" },
+                              { "Western Frisian", "fry" },
+                              { "Fulah", "ful" },
+                              { "Georgian", "kat" },
+                              { "Deutsch", "deu" },
+                              { "Gaelic (Scots)", "gla" },
+                              { "Irish", "gle" },
+                              { "Galician", "glg" },
+                              { "Manx", "glv" },
+                              { "Greek, Modern", "ell" },
+                              { "Guarani", "grn" },
+                              { "Gujarati", "guj" },
+                              { "Haitian", "hat" },
+                              { "Hausa", "hau" },
+                              { "Hebrew", "heb" },
+                              { "Herero", "her" },
+                              { "Hindi", "hin" },
+                              { "Hiri Motu", "hmo" },
+                              { "Magyar", "hun" },
+                              { "Igbo", "ibo" },
+                              { "Islenska", "isl" },
+                              { "Ido", "ido" },
+                              { "Sichuan Yi", "iii" },
+                              { "Inuktitut", "iku" },
+                              { "Interlingue", "ile" },
+                              { "Interlingua", "ina" },
+                              { "Indonesian", "ind" },
+                              { "Inupiaq", "ipk" },
+                              { "Italiano", "ita" },
+                              { "Javanese", "jav" },
+                              { "Japanese", "jpn" },
+                              { "Kalaallisut", "kal" },
+                              { "Kannada", "kan" },
+                              { "Kashmiri", "kas" },
+                              { "Kanuri", "kau" },
+                              { "Kazakh", "kaz" },
+                              { "Central Khmer", "khm" },
+                              { "Kikuyu", "kik" },
+                              { "Kinyarwanda", "kin" },
+                              { "Kirghiz", "kir" },
+                              { "Komi", "kom" },
+                              { "Kongo", "kon" },
+                              { "Korean", "kor" },
+                              { "Kuanyama", "kua" },
+                              { "Kurdish", "kur" },
+                              { "Lao", "lao" },
+                              { "Latin", "lat" },
+                              { "Latvian", "lav" },
+                              { "Limburgan", "lim" },
+                              { "Lingala", "lin" },
+                              { "Lithuanian", "lit" },
+                              { "Luxembourgish", "ltz" },
+                              { "Luba-Katanga", "lub" },
+                              { "Ganda", "lug" },
+                              { "Macedonian", "mkd" },
+                              { "Marshallese", "mah" },
+                              { "Malayalam", "mal" },
+                              { "Maori", "mri" },
+                              { "Marathi", "mar" },
+                              { "Malay", "msa" },
+                              { "Malagasy", "mlg" },
+                              { "Maltese", "mlt" },
+                              { "Moldavian", "mol" },
+                              { "Mongolian", "mon" },
+                              { "Nauru", "nau" },
+                              { "Navajo", "nav" },
+                              { "Ndebele, South", "nbl" },
+                              { "Ndebele, North", "nde" },
+                              { "Ndonga", "ndo" },
+                              { "Nepali", "nep" },
+                              { "Norwegian Nynorsk", "nno" },
+                              { "Norwegian Bokmål", "nob" },
+                              { "Norsk", "nor" },
+                              { "Chichewa; Nyanja", "nya" },
+                              { "Occitan", "oci" },
+                              { "Ojibwa", "oji" },
+                              { "Oriya", "ori" },
+                              { "Oromo", "orm" },
+                              { "Ossetian", "oss" },
+                              { "Panjabi", "pan" },
+                              { "Persian", "fas" },
+                              { "Pali", "pli" },
+                              { "Polish", "pol" },
+                              { "Portuguese", "por" },
+                              { "Pushto", "pus" },
+                              { "Quechua", "que" },
+                              { "Romansh", "roh" },
+                              { "Romanian", "ron" },
+                              { "Rundi", "run" },
+                              { "Russian", "rus" },
+                              { "Sango", "sag" },
+                              { "Sanskrit", "san" },
+                              { "Serbian", "srp" },
+                              { "Hrvatski", "hrv" },
+                              { "Sinhala", "sin" },
+                              { "Slovak", "slk" },
+                              { "Slovenian", "slv" },
+                              { "Northern Sami", "sme" },
+                              { "Samoan", "smo" },
+                              { "Shona", "sna" },
+                              { "Sindhi", "snd" },
+                              { "Somali", "som" },
+                              { "Sotho Southern", "sot" },
+                              { "Espanol", "spa" },
+                              { "Sardinian", "srd" },
+                              { "Swati", "ssw" },
+                              { "Sundanese", "sun" },
+                              { "Swahili", "swa" },
+                              { "Svenska", "swe" },
+                              { "Tahitian", "tah" },
+                              { "Tamil", "tam" },
+                              { "Tatar", "tat" },
+                              { "Telugu", "tel" },
+                              { "Tajik", "tgk" },
+                              { "Tagalog", "tgl" },
+                              { "Thai", "tha" },
+                              { "Tibetan", "bod" },
+                              { "Tigrinya", "tir" },
+                              { "Tonga", "ton" },
+                              { "Tswana", "tsn" },
+                              { "Tsonga", "tso" },
+                              { "Turkmen", "tuk" },
+                              { "Turkish", "tur" },
+                              { "Twi", "twi" },
+                              { "Uighur", "uig" },
+                              { "Ukrainian", "ukr" },
+                              { "Urdu", "urd" },
+                              { "Uzbek", "uzb" },
+                              { "Venda", "ven" },
+                              { "Vietnamese", "vie" },
+                              { "Volapük", "vol" },
+                              { "Welsh", "cym" },
+                              { "Walloon", "wln" },
+                              { "Wolof", "wol" },
+                              { "Xhosa", "xho" },
+                              { "Yiddish", "yid" },
+                              { "Yoruba", "yor" },
+                              { "Zhuang", "zha" },
+                              { "Zulu", "zul" }
+                          };
+
+            return languageMap;
+        }
+
+        /// <summary>
+        /// The get language codes.
+        /// </summary>
+        /// <param name="userLanguages">
+        /// The user languages.
+        /// </param>
+        /// <returns>
+        /// The <see cref="List{T}"/>.
+        /// </returns>
+        public static List<string> GetLanguageCodes(IEnumerable<string> userLanguages)
+        {
+            // Translate to Iso Codes
+            List<string> iso6392Codes = new List<string>();
+            foreach (var item in userLanguages)
+            {
+                string isoCode;
+                if (MapLanguages().TryGetValue(item, out isoCode))
+                {
+                    iso6392Codes.Add(isoCode);
+                }
+            }
+
+            return iso6392Codes;
+        }
+
+        /// <summary>
+        /// The get language names.
+        /// </summary>
+        /// <param name="languageCodes">
+        /// The language codes.
+        /// </param>
+        /// <returns>
+        /// The <see cref="List{T}"/>.
+        /// </returns>
+        public static List<string> GetLanguageNames(IList<string> languageCodes)
+        {
+            // Translate to Iso Codes
+            List<string> names = new List<string>();
+            foreach (var item in languageCodes)
+            {
+                KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item);  // Slightly inefficient but small set anyway so not a big issue.
+                names.Add(name.Key);
+            }
+
+            return names;
+        }
+
+        /// <summary>
+        /// The get iso codes.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="List{T}"/>.
+        /// </returns>
+        public static List<string> GetIsoCodes()
+        {
+           return MapLanguages().Values.ToList();
+        }
+
+        /// <summary>
+        /// The get language code.
+        /// </summary>
+        /// <param name="language">
+        /// The language.
+        /// </param>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static string GetLanguageCode(string language)
+        {
+            if (string.IsNullOrEmpty(language))
+            {
+                return null;
+            }
+
+            string isoCode;
+            if (MapLanguages().TryGetValue(language, out isoCode))
+            {
+                return isoCode;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.Interop/Utilities/SystemInfo.cs
index 8966b5a8f..af0c24724 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrake.Interop/Utilities/SystemInfo.cs
@@ -1,94 +1,94 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SystemInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   The System Information.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Utilities
-{
-    using System;
-
-    using Interop.HbLib;
-
-    /// <summary>
-    /// The System Information.
-    /// </summary>
-    public class SystemInfo
-    {
-        /// <summary>
-        /// Gets a value indicating whether is qsv available.
-        /// </summary>
-        public static bool IsQsvAvailable
-        {
-            get
-            {
-                try
-                {
-                    return HBFunctions.hb_qsv_available() != 0;
-                }
-                catch (Exception)
-                {
-                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
-                    return false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether is qsv available.
-        /// </summary>
-        public static bool IsQsvAvailableH264
-        {
-            get
-            {
-                try
-                {
-                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H264) != 0;
-                }
-                catch (Exception)
-                {
-                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
-                    return false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether is qsv available.
-        /// </summary>
-        public static bool IsQsvAvailableH265
-        {
-            get
-            {
-                try
-                {
-                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265) != 0;
-                }
-                catch (Exception)
-                {
-                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
-                    return false;
-                }
-            }
-        }
-
-        public static bool IsQsvAvailableH26510bit
-        {
-            get
-            {
-                try
-                {
-                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265_10BIT) != 0;
-                }
-                catch (Exception)
-                {
-                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
-                    return false;
-                }
-            }
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SystemInfo.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The System Information.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Utilities
+{
+    using System;
+
+    using Interop.HbLib;
+
+    /// <summary>
+    /// The System Information.
+    /// </summary>
+    public class SystemInfo
+    {
+        /// <summary>
+        /// Gets a value indicating whether is qsv available.
+        /// </summary>
+        public static bool IsQsvAvailable
+        {
+            get
+            {
+                try
+                {
+                    return HBFunctions.hb_qsv_available() != 0;
+                }
+                catch (Exception)
+                {
+                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is qsv available.
+        /// </summary>
+        public static bool IsQsvAvailableH264
+        {
+            get
+            {
+                try
+                {
+                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H264) != 0;
+                }
+                catch (Exception)
+                {
+                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is qsv available.
+        /// </summary>
+        public static bool IsQsvAvailableH265
+        {
+            get
+            {
+                try
+                {
+                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265) != 0;
+                }
+                catch (Exception)
+                {
+                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+                    return false;
+                }
+            }
+        }
+
+        public static bool IsQsvAvailableH26510bit
+        {
+            get
+            {
+                try
+                {
+                    return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265_10BIT) != 0;
+                }
+                catch (Exception)
+                {
+                    // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+                    return false;
+                }
+            }
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs b/win/CS/HandBrake.Interop/Utilities/VersionHelper.cs
index cc5c903ef..2975a4793 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/VersionHelper.cs
+++ b/win/CS/HandBrake.Interop/Utilities/VersionHelper.cs
@@ -1,53 +1,53 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VersionHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Version Utility
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Utilities
-{
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Interfaces;
-
-    /// <summary>
-    /// Version Utility
-    /// </summary>
-    public class VersionHelper
-    {
-        /// <summary>
-        /// The get build.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public static string GetVersion()
-        {
-            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
-       
-            return IsNightly() ? string.Format("Nightly {0} ({1})", instance.Version, instance.Build) : string.Format("{0} ({1})", instance.Version, instance.Build);
-        }
-
-        public static string GetVersionShort()
-        {
-            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
-            return string.Format("{0} {1}", instance.Version, instance.Build);
-        }
-
-        /// <summary>
-        /// The is nightly.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public static bool IsNightly()
-        {
-            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
-
-            // 01 = Unofficial Builds.  00 = Official Tagged Releases.
-            return instance.Build.ToString().EndsWith("01");
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VersionHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Version Utility
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Utilities
+{
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Interfaces;
+
+    /// <summary>
+    /// Version Utility
+    /// </summary>
+    public class VersionHelper
+    {
+        /// <summary>
+        /// The get build.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="int"/>.
+        /// </returns>
+        public static string GetVersion()
+        {
+            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
+       
+            return IsNightly() ? string.Format("Nightly {0} ({1})", instance.Version, instance.Build) : string.Format("{0} ({1})", instance.Version, instance.Build);
+        }
+
+        public static string GetVersionShort()
+        {
+            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
+            return string.Format("{0} {1}", instance.Version, instance.Build);
+        }
+
+        /// <summary>
+        /// The is nightly.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static bool IsNightly()
+        {
+            IHandBrakeInstance instance = HandBrakeInstanceManager.MasterInstance;
+
+            // 01 = Unofficial Builds.  00 = Official Tagged Releases.
+            return instance.Build.ToString().EndsWith("01");
+        }
+    }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/app.config b/win/CS/HandBrake.Interop/app.config
index 74b635ee6..4a29a96b3 100644
--- a/win/CS/HandBrake.ApplicationServices/app.config
+++ b/win/CS/HandBrake.Interop/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
-  </startup>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+  </startup>
+</configuration>
diff --git a/win/CS/HandBrake.ApplicationServices/packages.config b/win/CS/HandBrake.Interop/packages.config
index c54e093ac..c54e093ac 100644
--- a/win/CS/HandBrake.ApplicationServices/packages.config
+++ b/win/CS/HandBrake.Interop/packages.config
diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 0e7f155b4..7d9ad28ca 100644
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"
 EndProject
diff --git a/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj b/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj
index 5631ac3f5..031334879 100644
--- a/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj
+++ b/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj
@@ -67,8 +67,8 @@
     <Content Include="win32\Caliburn.Micro.Platform.Core.dll" />
     <Content Include="win32\Caliburn.Micro.Platform.dll" />
     <Content Include="win32\GongSolutions.Wpf.DragDrop.dll" />
-    <Content Include="win32\HandBrake.ApplicationServices.dll" />
-    <Content Include="win32\HandBrake.ApplicationServices.dll.config" />
+    <Content Include="win32\HandBrake.Interop.dll" />
+    <Content Include="win32\HandBrake.Interop.dll.config" />
     <Content Include="win32\HandBrake.exe" />
     <Content Include="win32\HandBrake.exe.config" />
     <Content Include="win32\hb.dll" />
diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj
index 947eff2c0..ed044bafa 100644
--- a/win/CS/HandBrakeCS.csproj
+++ b/win/CS/HandBrakeCS.csproj
@@ -165,13 +165,9 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
+    <ProjectReference Include="HandBrake.Interop\HandBrake.Interop.csproj">
       <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
-      <Name>HandBrake.ApplicationServices</Name>
-    </ProjectReference>
-    <ProjectReference Include="HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj">
-      <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>
-      <Name>HandBrakeInterop</Name>
+      <Name>HandBrake.Interop</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
index 667e372b7..8263846f2 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 350a8e06d..ec70119e0 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
index 0ef315fba..8b7a0cd42 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
@@ -12,8 +12,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     /// <summary>
     /// The audio mixdown converter.
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
index df108d961..1a085cd73 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
@@ -13,8 +13,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.ComponentModel;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
index 512fa0774..400f17ce4 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Text;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
index 9808cbb58..e6e458ed9 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeConverter.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioTrackDefaultBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioTrackDefaultBehaviourConverter.cs
index 297488b65..6aa590bbf 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioTrackDefaultBehaviourConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioTrackDefaultBehaviourConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index c9afb8c14..ff6f71156 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -13,8 +13,8 @@ namespace HandBrakeWPF.Converters
     using System.Collections.Generic;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Model;
     using HandBrakeWPF.Services.Queue.Model;
     using HandBrakeWPF.Utilities;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 5e2b7024a..accd7bc3b 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Filters
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using DenoisePreset = HandBrakeWPF.Services.Encode.Model.Models.DenoisePreset;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
index 417b0d155..5e8c4f37b 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
@@ -14,9 +14,9 @@ namespace HandBrakeWPF.Converters.Filters
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
index 72d40e3ae..e3190d831 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
@@ -14,9 +14,9 @@ namespace HandBrakeWPF.Converters.Filters
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs
index b60e626f6..5c0fb47f0 100644
--- a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.Converters.Options
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
index 782d1698e..f9dacd7c7 100644
--- a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.Converters.Queue
     using System;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrakeWPF.Services.Encode.Model;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
index e488d71e8..604b86b21 100644
--- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Subtitles
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Subtitles;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
index dce48a4cf..d0486eff9 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.Converters.Video
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
     using VideoLevel = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoLevel;
diff --git a/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
index 442d525fe..f725bb72a 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
@@ -13,8 +13,8 @@ namespace HandBrakeWPF.Converters.Video
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index ca54837b6..285b1a373 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -15,14 +15,14 @@ namespace HandBrakeWPF.Converters.Video
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Utilities;
 
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
-    using SystemInfo = HandBrake.ApplicationServices.Utilities.SystemInfo;
+    using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
 
     /// <summary>
     /// Video Encoder Converter
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
index 4a6c036c4..7b4ec0fc0 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.Converters.Video
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs b/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs
index 03155d0b5..a3d9918d7 100644
--- a/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs
+++ b/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.EventArgs
 {
     using System;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Queue.Model;
 
diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
index d6ac2f7f5..568f7e390 100644
--- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
+++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Factories
 {
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Interfaces;
 
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 4757f7eec..0131e9297 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -669,12 +669,6 @@
     <Resource Include="Views\Images\AddToQueue.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
-      <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
-      <Name>HandBrake.ApplicationServices</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Views\Images\Advanced.png" />
   </ItemGroup>
   <ItemGroup>
@@ -718,6 +712,12 @@
   <ItemGroup>
     <Resource Include="Views\Images\Presets2.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj">
+      <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>
+      <Name>HandBrake.Interop</Name>
+    </ProjectReference>
+  </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/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 3465cfadf..fb4cd589b 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Helpers
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Extensions;
     using HandBrakeWPF.Services.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Helpers/LogManager.cs b/win/CS/HandBrakeWPF/Helpers/LogManager.cs
index ec1c11ffc..6a281fb64 100644
--- a/win/CS/HandBrakeWPF/Helpers/LogManager.cs
+++ b/win/CS/HandBrakeWPF/Helpers/LogManager.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Helpers
 {
     using System.IO;
 
-    using HandBrake.ApplicationServices.Interop;
+    using HandBrake.Interop.Interop;
 
     using HandBrakeWPF.Utilities;
 
@@ -52,7 +52,7 @@ namespace HandBrakeWPF.Helpers
         /// <param name="e">
         /// The e.
         /// </param>
-        private static void HandBrakeUtils_ErrorLogged(object sender, HandBrake.ApplicationServices.Interop.EventArgs.MessageLoggedEventArgs e)
+        private static void HandBrakeUtils_ErrorLogged(object sender, HandBrake.Interop.Interop.EventArgs.MessageLoggedEventArgs e)
         {
         }
 
@@ -65,7 +65,7 @@ namespace HandBrakeWPF.Helpers
         /// <param name="e">
         /// The e.
         /// </param>
-        private static void HandBrakeUtils_MessageLogged(object sender, HandBrake.ApplicationServices.Interop.EventArgs.MessageLoggedEventArgs e)
+        private static void HandBrakeUtils_MessageLogged(object sender, HandBrake.Interop.Interop.EventArgs.MessageLoggedEventArgs e)
         {
         }
     }
diff --git a/win/CS/HandBrakeWPF/Helpers/PictureSize.cs b/win/CS/HandBrakeWPF/Helpers/PictureSize.cs
index 896add53e..8361e35d5 100644
--- a/win/CS/HandBrakeWPF/Helpers/PictureSize.cs
+++ b/win/CS/HandBrakeWPF/Helpers/PictureSize.cs
@@ -9,9 +9,9 @@
 
 namespace HandBrakeWPF.Helpers
 {
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     /// <summary>
     /// The picture size Helpers
diff --git a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
index 4ce79bec2..657062fc0 100644
--- a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
@@ -18,7 +18,7 @@ namespace HandBrakeWPF.Helpers
     using System.Windows;
     using System.Xml.Serialization;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Services.Queue.Model;
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
index 0977334f6..7237c7c64 100644
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Audio
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The audio behaviours.
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
index 0e16f83f1..5342d2454 100644
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
@@ -16,9 +16,9 @@ namespace HandBrakeWPF.Model.Audio
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
     using Newtonsoft.Json;
     using Services.Encode.Model.Models;
     using Utilities;
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
index ffb03fc8a..b36a31ec5 100644
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Audio
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The audio behaviours.
diff --git a/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
index 8745e68f6..538a96439 100644
--- a/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Filters
 {
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     public class FilterPreset
     {
diff --git a/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
index 6f804a551..a14e55f8f 100644
--- a/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Filters
 {
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     public class FilterTune
     {
diff --git a/win/CS/HandBrakeWPF/Model/OptionsTab.cs b/win/CS/HandBrakeWPF/Model/OptionsTab.cs
index 4a2c6122a..c5bd35824 100644
--- a/win/CS/HandBrakeWPF/Model/OptionsTab.cs
+++ b/win/CS/HandBrakeWPF/Model/OptionsTab.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// A enum representing each tab on the options screen.
diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
index 8ef06399f..7db70c79c 100644
--- a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
+++ b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Picture
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// Picture Settings Mode when adding presets
diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
index 1a3416c88..efdffc2aa 100644
--- a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
+++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Subtitles
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The subtitle behaviours modes.
diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBurnInBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBurnInBehaviourModes.cs
index d335a6f10..37088a4cb 100644
--- a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBurnInBehaviourModes.cs
+++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBurnInBehaviourModes.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Subtitles
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The subtitle behaviours modes.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs b/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
index 922a4ceb4..c28b3cebd 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
@@ -14,8 +14,8 @@ namespace HandBrakeWPF.Services.Encode
     using System.Globalization;
     using System.IO;
 
-    using HandBrake.ApplicationServices.Interop.EventArgs;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop.EventArgs;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Interfaces;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 115973eac..1ee4665de 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -16,12 +16,12 @@ namespace HandBrakeWPF.Services.Encode.Factories
     using System.Runtime.InteropServices;
     using System.Runtime.InteropServices.ComTypes;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Json.Encode;
-    using HandBrake.ApplicationServices.Interop.Json.Shared;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Json.Encode;
+    using HandBrake.Interop.Interop.Json.Shared;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Utilities;
 
@@ -35,9 +35,9 @@ namespace HandBrakeWPF.Services.Encode.Factories
     using FramerateMode = HandBrakeWPF.Services.Encode.Model.Models.FramerateMode;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
     using PointToPointMode = HandBrakeWPF.Services.Encode.Model.Models.PointToPointMode;
-    using Subtitle = HandBrake.ApplicationServices.Interop.Json.Encode.Subtitles;
+    using Subtitle = HandBrake.Interop.Interop.Json.Encode.Subtitles;
     using SubtitleTrack = HandBrakeWPF.Services.Encode.Model.Models.SubtitleTrack;
-    using SystemInfo = HandBrake.ApplicationServices.Utilities.SystemInfo;
+    using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
     using Validate = HandBrakeWPF.Helpers.Validate;
 
     /// <summary>
@@ -184,7 +184,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
         /// The job.
         /// </param>
         /// <returns>
-        /// The <see cref="HandBrake.ApplicationServices.Interop.Json.Encode.Subtitles"/>.
+        /// The <see cref="HandBrake.Interop.Interop.Json.Encode.Subtitles"/>.
         /// </returns>
         private static Subtitle CreateSubtitle(EncodeTask job)
         {
@@ -198,7 +198,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                             Burn = false,
                             Forced = false
                         },
-                SubtitleList = new List<HandBrake.ApplicationServices.Interop.Json.Encode.SubtitleTrack>()
+                SubtitleList = new List<HandBrake.Interop.Interop.Json.Encode.SubtitleTrack>()
             };
 
             foreach (SubtitleTrack item in job.SubtitleTracks)
@@ -215,7 +215,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                     }
                     else
                     {
-                        HandBrake.ApplicationServices.Interop.Json.Encode.SubtitleTrack track = new HandBrake.ApplicationServices.Interop.Json.Encode.SubtitleTrack
+                        HandBrake.Interop.Interop.Json.Encode.SubtitleTrack track = new HandBrake.Interop.Interop.Json.Encode.SubtitleTrack
                         {
                             Burn = item.Burned,
                             Default = item.Default,
@@ -229,7 +229,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 }
                 else
                 {
-                    HandBrake.ApplicationServices.Interop.Json.Encode.SubtitleTrack track = new HandBrake.ApplicationServices.Interop.Json.Encode.SubtitleTrack
+                    HandBrake.Interop.Interop.Json.Encode.SubtitleTrack track = new HandBrake.Interop.Interop.Json.Encode.SubtitleTrack
                     {
                         Track = -1, // Indicates SRT
                         Default = item.Default,
@@ -341,7 +341,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
             HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AllowedPassthruOptions.AudioEncoderFallback));
             audio.FallbackEncoder = audioEncoder.Id;
 
-            audio.AudioList = new List<HandBrake.ApplicationServices.Interop.Json.Encode.AudioTrack>();
+            audio.AudioList = new List<HandBrake.Interop.Interop.Json.Encode.AudioTrack>();
             foreach (AudioTrack item in job.AudioTracks)
             {
                 HBAudioEncoder encoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(item.Encoder));
@@ -357,7 +357,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
 
                 HBRate sampleRate = HandBrakeEncoderHelpers.AudioSampleRates.FirstOrDefault(s => s.Name == item.SampleRate.ToString(CultureInfo.InvariantCulture));
 
-                HandBrake.ApplicationServices.Interop.Json.Encode.AudioTrack audioTrack = new HandBrake.ApplicationServices.Interop.Json.Encode.AudioTrack
+                HandBrake.Interop.Interop.Json.Encode.AudioTrack audioTrack = new HandBrake.Interop.Interop.Json.Encode.AudioTrack
                 {
                     Track = (item.Track.HasValue ? item.Track.Value : 0) - 1,
                     DRC = item.DRC,
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/QueueFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/QueueFactory.cs
index 1046dec4a..f47b15776 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/QueueFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/QueueFactory.cs
@@ -11,8 +11,8 @@ namespace HandBrakeWPF.Services.Encode.Factories
 {
     using System.Collections.Generic;
 
-    using HandBrake.ApplicationServices.Interop.Json.Queue;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop.Json.Queue;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Model;
 
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs b/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs
index f60e27f6c..489f46925 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Services.Encode.Interfaces
 {
     using System;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
     using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
index 02a361ba6..3d8e6c290 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
@@ -13,11 +13,11 @@ namespace HandBrakeWPF.Services.Encode
     using System.Diagnostics;
     using System.IO;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.EventArgs;
-    using HandBrake.ApplicationServices.Interop.Interfaces;
-    using HandBrake.ApplicationServices.Interop.Json.State;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.EventArgs;
+    using HandBrake.Interop.Interop.Interfaces;
+    using HandBrake.Interop.Interop.Json.State;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Exceptions;
     using HandBrakeWPF.Properties;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
index f65cf6891..e1f18fd22 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
@@ -14,8 +14,8 @@ namespace HandBrakeWPF.Services.Encode.Model
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model.Models;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
index 3f415e60e..6031ce1f3 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The audio encoder.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
index 4b28d9f3d..260a6d20c 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The audio encoder rate type.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index fe58ade77..96a531f34 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -17,9 +17,9 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
index 71a713722..29d8bc4f7 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The denoise preset.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
index 956ada4c5..db75c37bb 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The denoise tune.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/FramerateMode.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/FramerateMode.cs
index d8eaa20fb..9ac381a7b 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/FramerateMode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/FramerateMode.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// The Mode of Video Encoding. CFR, VFR, PFR
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
index fee3236ec..8c55e45b1 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
     
     /// <summary>
     /// The Output format.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
index 4e52d1b8d..2bb60f00d 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// Point to Point Mode
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
index e481907bb..9b195152b 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Services.Scan.Model;
 
diff --git a/win/CS/HandBrakeWPF/Services/Logging/LogService.cs b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
index 70bea3067..03f6c100e 100644
--- a/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
@@ -19,8 +19,8 @@ namespace HandBrakeWPF.Services.Logging
     using System.Linq;
     using System.Text;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.EventArgs;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.EventArgs;
 
     using ILog = Interfaces.ILog;
     using LogEventArgs = EventArgs.LogEventArgs;
diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
index e4ff54e26..dd4621ba0 100644
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Services
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Services.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 8c173c4d0..668b23694 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -15,13 +15,13 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Globalization;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Json.Presets;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Json.Presets;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Model.Filters;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
index 079d9424a..8c41b728b 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.Services.Presets.Interfaces
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Presets.Model;
 
diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 2182c082d..c53eb4f8a 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -19,10 +19,10 @@ namespace HandBrakeWPF.Services.Presets
     using System.Linq;
     using System.Windows;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Json.Presets;
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Json.Presets;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Model.Picture;
diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
index 38a93ee37..c398e6a32 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Queue.Model
 {
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// Queue Item Status
diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
index eed9069aa..be4c664fb 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Services.Queue.Model
 {
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Presets.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
index 9cf9b1320..5a701045f 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Services.Queue
     using System.Linq;
     using System.Xml.Serialization;
 
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Properties;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs b/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs
index 136d9a234..5458b9d2d 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.Services.Scan.Interfaces
     using System;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Scan.EventArgs;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index 14b13d2e4..7bcc5531b 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -14,14 +14,14 @@ namespace HandBrakeWPF.Services.Scan
     using System.Diagnostics;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Interfaces;
-    using HandBrake.ApplicationServices.Interop.Json.Scan;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Interop.Model.Preview;
-    using HandBrake.ApplicationServices.Model;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces;
+    using HandBrake.Interop.Interop.Json.Scan;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Preview;
+    using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Encode.Model.Models;
@@ -35,7 +35,7 @@ namespace HandBrakeWPF.Services.Scan
     using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;
     using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;
     using LogService = HandBrakeWPF.Services.Logging.LogService;
-    using ScanProgressEventArgs = HandBrake.ApplicationServices.Interop.EventArgs.ScanProgressEventArgs;
+    using ScanProgressEventArgs = HandBrake.Interop.Interop.EventArgs.ScanProgressEventArgs;
     using Subtitle = HandBrakeWPF.Services.Scan.Model.Subtitle;
     using Title = HandBrakeWPF.Services.Scan.Model.Title;
 
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
index c8fc3a1fa..ce48404a4 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.Services.Scan.Model
     using System;
     using System.Xml.Serialization;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
index e60520fa7..31b6a1fe7 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.Services.Scan.Model
     using System.IO;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Interop.Model;
+    using HandBrake.Interop.Interop.Model;
 
     using HandBrakeWPF.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/UpdateService.cs b/win/CS/HandBrakeWPF/Services/UpdateService.cs
index c0a1bcab6..d268a06e4 100644
--- a/win/CS/HandBrakeWPF/Services/UpdateService.cs
+++ b/win/CS/HandBrakeWPF/Services/UpdateService.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Services
     using System.Reflection;
     using System.Security.Cryptography;
     using System.Threading;
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Utilities;
     using HandBrakeWPF.Model;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/UserSettingService.cs b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
index 5b180cd22..b6c3f5724 100644
--- a/win/CS/HandBrakeWPF/Services/UserSettingService.cs
+++ b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Services
     using System.Reflection;
     using System.Xml.Serialization;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs b/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
index 0f5b64d53..88ff54e5c 100644
--- a/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
+++ b/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Utilities
     using System.Runtime.InteropServices;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.ApplicationServices.Interop.Model.Preview;
+    using HandBrake.Interop.Interop.Model.Preview;
 
     /// <summary>
     /// The bitmap utilities.
diff --git a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
index 718533aab..ef8583917 100644
--- a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
+++ b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Utilities
     using System.Linq;
     using System.Reflection;
 
-    using HandBrake.ApplicationServices.Attributes;
+    using HandBrake.Interop.Attributes;
 
     /// <summary>
     /// Enum Helpers
diff --git a/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs b/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs
index bed4a01be..6ce55c865 100644
--- a/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs
+++ b/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Utilities
     using System.Text;
     using System.Windows.Forms;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     /// <summary>
     /// A Set of Static Utilities
diff --git a/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs b/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs
index 8ea5c522e..4d106b839 100644
--- a/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs
+++ b/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.Utilities
     using System.IO;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     /// <summary>
     /// A general Helper class for HandBrake GUI
diff --git a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
index f344cf3d6..57c768fdd 100644
--- a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.Utilities
     using System.Management;
     using System.Windows.Forms;
 
-    using HandBrake.ApplicationServices.Interop.HbLib;
+    using HandBrake.Interop.Interop.HbLib;
 
     using Microsoft.Win32;
 
diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index 8096441b2..471384e56 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.ViewModels
 {
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.ViewModels.Interfaces;
 
diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 856c3e4bc..824b808ae 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Model.Subtitles;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
index 3d560ce5b..289dcb0de 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
@@ -14,9 +14,9 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index cf1ea6d3c..e63e75dae 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,9 +17,9 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Model.Audio;
diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index f6c46631b..86df91094 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -17,9 +17,9 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Model.Filters;
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs
index a9907bdba..eb96e1628 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.ViewModels.Interfaces
 {
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     /// <summary>
     /// The Advanced View Model Interface
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 4af305d47..70fc5250e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -22,7 +22,7 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
+    using HandBrake.Interop.Interop;
 
     using HandBrakeWPF.Commands;
     using HandBrakeWPF.Commands.Menu;
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index c8fb9580a..8d542a3b0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -19,8 +19,8 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model;
     using HandBrakeWPF.Properties;
@@ -33,7 +33,7 @@ namespace HandBrakeWPF.ViewModels
     using Ookii.Dialogs.Wpf;
 
     using Execute = Caliburn.Micro.Execute;
-    using SystemInfo = HandBrake.ApplicationServices.Utilities.SystemInfo;
+    using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
 
     /// <summary>
     /// The Options View Model
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 1e733384a..c45d2e092 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -13,9 +13,9 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Generic;
     using System.Globalization;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Helpers;
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 6c2bf0eca..f3e9593be 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -20,7 +20,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Properties;
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs
index 0334d2d1a..28a568263 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Subtitles;
     using HandBrakeWPF.Services.Presets.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index cd6d2aa1e..0af10cd0e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Model.Subtitles;
diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
index e2a294009..18260ec29 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
@@ -17,8 +17,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Text;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Factories;
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index bf7947f12..18f07e06d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -17,8 +17,8 @@ namespace HandBrakeWPF.ViewModels
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices.Interop;
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Properties;
diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
index 951db4657..f0600981f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
@@ -14,7 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;
     using System.Linq;
 
-    using HandBrake.ApplicationServices.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Helpers;
diff --git a/win/CS/build.xml b/win/CS/build.xml
index e493e0047..f45034778 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -24,7 +24,7 @@
 
   <!-- Build all the main cproj files.-->
   <ItemGroup>
-    <ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/>
+    <ProjectsToBuild Include="HandBrake.Interop\*proj" Exclude="$(MSBuildProjectFile)"/>
     <ProjectsToBuild Include="HandBrakeWPF\HandBrakeWPF.*proj" Exclude="$(MSBuildProjectFile)"/>
   </ItemGroup>
 
@@ -38,7 +38,7 @@
   <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
   <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
 
-  <!-- Build All Components (WPF, ApplicationServices, Interop) -->
+  <!-- Build All Components (WPF, Interop, Interop) -->
   <Target Name="BuildRelease">
     <MSBuild Projects ="@(ProjectsToBuild)"
              ContinueOnError ="false"