80 files changed, 115 insertions, 219 deletions
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
index 597b1c207..acf30fad0 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
@@ -15,8 +15,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
     using HandBrake.Interop.Utilities;
 
     public static class HandBrakeEncoderHelpers
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
index 92c792df0..9cc765770 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
@@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
     using HandBrake.Interop.Interop.Json.Filters;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Json;
 
     /// <summary>
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
index fd117162d..440983f14 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
@@ -24,11 +24,12 @@ namespace HandBrake.Interop.Interop
     using HandBrake.Interop.Interop.Helpers;
     using HandBrake.Interop.Interop.Interfaces;
     using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
     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 HandBrake.Interop.Json;
 
     public class HandBrakeInstance : IHandBrakeInstance, IDisposable
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
index 32970ecba..93e9037d5 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
@@ -13,7 +13,7 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model;
 
     /// <summary>
     /// Contains utilities for converting language codes.
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
index 96e9720ba..07d13d2ab 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
@@ -11,7 +11,7 @@ namespace HandBrake.Interop.Interop
 {
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Interfaces.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     public class HandBrakePictureHelpers
     {
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
index ab928f723..2443a24b4 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
@@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;
     using HandBrake.Interop.Interop.Json.Presets;
-    using HandBrake.Interop.Interop.Model;
     using HandBrake.Interop.Json;
 
     /// <summary>
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
index 698bce11a..b42285938 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
@@ -16,8 +16,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     /// <summary>
     /// Converters for various encoding values.
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
index ea162ce5b..283dfe01f 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
@@ -13,8 +13,9 @@ namespace HandBrake.Interop.Interop.Interfaces
 
     using HandBrake.Interop.Interop.EventArgs;
     using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
     using HandBrake.Interop.Interop.Json.Scan;
-    using HandBrake.Interop.Interop.Model.Preview;
 
     /// <summary>
     /// The Interface for HandBrakeInstance
diff --git a/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/BitrateLimits.cs
index 89e0aa960..dc2043aff 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/BitrateLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents bitrate limits as a range.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs
index ae1d4b700..bb9d0fd72 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     using HandBrake.Interop.Interop.HbLib;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBMixdown.cs
index 3130829f6..6ca487ec5 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBMixdown.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// The hb mixdown.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBRate.cs
index 8116cfe30..192c14aca 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBRate.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents a rate in HandBrake: audio sample rate or video framerate.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBVideoEncoder.cs
index da0c4ca73..79aae277c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBVideoEncoder.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     using System.Collections.Generic;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/RangeLimits.cs
index e8102eb42..e1c97c24c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/RangeLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// The range limits.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/VideoQualityLimits.cs
index 6387763da..2dcc64af4 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/VideoQualityLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents limits on video quality for a particular encoder.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters/HBPresetTune.cs
index 3fd59bcbf..6a964b019 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters/HBPresetTune.cs
@@ -3,11 +3,11 @@
 //   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 object represetning the key and name of a Filter Preset or Tune option.
+//   An object representing the key and name of a Filter Preset or Tune option.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Filters
 {
     public class HBPresetTune
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBContainer.cs
index 3580cd726..3a71117d6 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBContainer.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model
 {
     /// <summary>
     /// The hb container.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Language.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Language.cs
index 5ca0ca0e6..0da6d4352 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Language.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Language.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model
 {
     /// <summary>
     /// Represents a language.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Anamorphic.cs
index e6b68fc1e..dbb14beb4 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Anamorphic.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/AnamorphicResult.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/AnamorphicResult.cs
index d949eb354..efb736f78 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/AnamorphicResult.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/AnamorphicResult.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     public class AnamorphicResult
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Cropping.cs
index bae0473c8..b3314a24c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Cropping.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     /// <summary>
     /// The Cropping Model
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsJob.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsJob.cs
index e090522cb..519070545 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsJob.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsJob.cs
@@ -4,11 +4,8 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     public class PictureSettingsJob
     {
         public Cropping Crop { get; set; }
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsTitle.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsTitle.cs
index e90ae709a..e0345fba9 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsTitle.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsTitle.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     public class PictureSettingsTitle
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/PresetVersion.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets/PresetVersion.cs
index 4fe0225b3..8319b38d2 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/PresetVersion.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets/PresetVersion.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Presets
 {
     public class PresetVersion
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PreviewSettings.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/PreviewSettings.cs
index 5304610ff..a8b1a69bc 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PreviewSettings.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/PreviewSettings.cs
@@ -7,10 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
 {
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     /// <summary>
     /// The preview settings.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/RawPreviewData.cs
index f833b7479..c552c2b1a 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/RawPreviewData.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Preview
+namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
 {
     public class RawPreviewData
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
deleted file mode 100644
index ce7c5c5c2..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Container.cs" company="HandBrake Project (https://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,
-        [DisplayName("WebM")]
-        WebM
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
deleted file mode 100644
index 566344fed..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PictureRotation.cs" company="HandBrake Project (https://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.Interop/Interop/Model/Encoding/ScaleMethod.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
deleted file mode 100644
index 029ee7295..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScaleMethod.cs" company="HandBrake Project (https://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,
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs b/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
deleted file mode 100644
index 5b5972015..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceVideoInfo.cs" company="HandBrake Project (https://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/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index bb1959379..e64008f90 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -17,7 +17,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows.Data;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
     using HandBrakeWPF.Services.Scan.Model;
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
index 8b7a0cd42..c6c177041 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Globalization;
     using System.Windows.Data;
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     /// <summary>
     /// The audio mixdown converter.
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
index 1a085cd73..f65cd46d6 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
@@ -14,7 +14,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Globalization;
     using System.Windows.Data;
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index aeaf153f2..e7e2dc3fb 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -13,13 +13,15 @@ namespace HandBrakeWPF.Converters
     using System.Collections.Generic;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.Interop.Interop.Model.Encoding;
+
     using HandBrake.Interop.Model;
 
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Model.Options;
     using HandBrakeWPF.Services.Queue.Model;
     using HandBrakeWPF.Utilities;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
     /// <summary>
     /// Enum Combo Converter
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index accd7bc3b..0372401cf 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.Interop.Interop.Model.Encoding;
+    using HandBrakeWPF.Model.Filters;
 
     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 c794c5348..3b4d557cf 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
index e3190d831..9b63f625a 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs b/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
index 0707457f2..2cfd38b53 100644
--- a/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
@@ -10,8 +10,8 @@ namespace HandBrakeWPF.Converters.Queue
     using System.Collections.Generic;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
index f9dacd7c7..392bdd6a7 100644
--- a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
@@ -12,7 +12,9 @@ namespace HandBrakeWPF.Converters.Queue
     using System;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.Interop.Interop.Model.Encoding;
+
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
     using HandBrakeWPF.Services.Encode.Model;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
index 3fcc3e384..ed303f479 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
@@ -14,9 +14,8 @@ namespace HandBrakeWPF.Converters.Video
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     using EncodeTask = Services.Encode.Model.EncodeTask;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
     using VideoLevel = Services.Encode.Model.Models.Video.VideoLevel;
     using VideoPreset = Services.Encode.Model.Models.Video.VideoPreset;
     using VideoProfile = Services.Encode.Model.Models.Video.VideoProfile;
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 21db31b8a..69ebf9f8a 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -16,7 +16,6 @@ namespace HandBrakeWPF.Converters.Video
     using System.Windows.Data;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Utilities;
@@ -24,6 +23,7 @@ namespace HandBrakeWPF.Converters.Video
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
     /// <summary>
     /// Video Encoder Converter
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
index 1040b160f..c3bb59168 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
@@ -13,11 +13,11 @@ namespace HandBrakeWPF.Converters.Video
     using System.Globalization;
     using System.Windows.Data;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     using HandBrakeWPF.Utilities;
 
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 
     /// <summary>
     /// The x 264 queue tooltip converter.
diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 6483e0fa5..de04afc1d 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -17,8 +17,6 @@ namespace HandBrakeWPF.Helpers
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     using HandBrakeWPF.Converters;
     using HandBrakeWPF.Extensions;
     using HandBrakeWPF.Model.Options;
@@ -28,6 +26,7 @@ namespace HandBrakeWPF.Helpers
 
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 
     /// <summary>
     /// The Destination AutoName Helper
diff --git a/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs b/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
index de53cf35c..bee2526c7 100644
--- a/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
+++ b/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Helpers
 {
     using System.Configuration;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
     public class VideoEncoderHelpers
     {
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
index b6dd0fdd2..473dd49c6 100644
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
@@ -18,8 +18,8 @@ namespace HandBrakeWPF.Model.Audio
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
     using Services.Encode.Model.Models;
     using Utilities;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs b/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs
index 595375a50..c6226f2a1 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs b/win/CS/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs
index 4b6c60ceb..2dfb2f395 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs b/win/CS/HandBrakeWPF/Model/Filters/Denoise.cs
index 62592f0dc..b35389ce0 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/Denoise.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs b/win/CS/HandBrakeWPF/Model/Filters/Detelecine.cs
index 1f63d4ee1..3a7843e80 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/Detelecine.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
index a0ac286bb..9777da0a0 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.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     public class FilterPreset
     {
diff --git a/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
index a67edc183..09cf3e63a 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.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     public class FilterTune
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PaddingFilter.cs b/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs
index 305773dae..03b0e660a 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PaddingFilter.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     public class PaddingFilter
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs b/win/CS/HandBrakeWPF/Model/Filters/Sharpen.cs
index 1f2b93ce4..7acdeccb8 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/Sharpen.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Filters
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Size.cs b/win/CS/HandBrakeWPF/Model/Picture/Size.cs
index e8f4d28bc..85b780534 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Size.cs
+++ b/win/CS/HandBrakeWPF/Model/Picture/Size.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrakeWPF.Model.Picture
 {
     /// <summary>
     /// The size.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs b/win/CS/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs
index 2ccec4bca..a24fd35ec 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs
+++ b/win/CS/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Video
 {
     /// <summary>
     /// The video encode rate type.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs
index 07da99a20..799d3403d 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs
+++ b/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrakeWPF.Model.Video
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
index cac804d38..6310ecb8b 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
@@ -16,12 +16,13 @@ namespace HandBrakeWPF.Services.Encode.Factories
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
     using HandBrake.Interop.Interop.Json.Encode;
     using HandBrake.Interop.Interop.Json.Shared;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Utilities;
 
@@ -37,6 +38,8 @@ namespace HandBrakeWPF.Services.Encode.Factories
     using SubtitleTrack = Model.Models.SubtitleTrack;
     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
     using Validate = Helpers.Validate;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 
     /// <summary>
     /// This factory takes the internal EncodeJob object and turns it into a set of JSON models
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
index 3f1835888..00e7d9ab7 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
@@ -12,8 +12,8 @@ namespace HandBrakeWPF.Services.Encode.Model
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
 
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model.Models;
@@ -27,6 +27,8 @@ namespace HandBrakeWPF.Services.Encode.Model
     using OutputFormat = Models.OutputFormat;
     using PointToPointMode = Models.PointToPointMode;
     using SubtitleTrack = Models.SubtitleTrack;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
     using VideoLevel = Models.Video.VideoLevel;
     using VideoPreset = Models.Video.VideoPreset;
     using VideoProfile = Models.Video.VideoProfile;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 44ce9c333..caf1a1fed 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -19,8 +19,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index d54330c81..74f9c4dc4 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -16,9 +16,10 @@ namespace HandBrakeWPF.Services.Presets.Factories
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;
     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;
 
@@ -36,6 +37,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using EncodeTask = Encode.Model.EncodeTask;
     using FramerateMode = Encode.Model.Models.FramerateMode;
     using OutputFormat = Encode.Model.Models.OutputFormat;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
     using VideoLevel = Encode.Model.Models.Video.VideoLevel;
     using VideoPreset = Encode.Model.Models.Video.VideoPreset;
     using VideoProfile = Encode.Model.Models.Video.VideoProfile;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 67eca9d6a..08437b764 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -20,9 +20,8 @@ namespace HandBrakeWPF.Services.Presets
     using System.Windows.Xps.Serialization;
 
     using HandBrake.Interop.Interop;
+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;
     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;
 
@@ -40,6 +39,7 @@ namespace HandBrakeWPF.Services.Presets
 
     using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
     public class PresetService : IPresetService
     {
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
index 6e7ff8037..eacec676c 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
@@ -13,11 +13,12 @@ namespace HandBrakeWPF.Services.Queue
     using System.Collections.Generic;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Interfaces;
 
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
     public class QueueResourceService
     {
         private readonly IUserSettingService userSettingService;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs b/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
index 5a131cc90..450a8fde1 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
@@ -12,13 +12,14 @@ namespace HandBrakeWPF.Services.Scan.Factories
     using System;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
     using HandBrake.Interop.Interop.Json.Scan;
-    using HandBrake.Interop.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Services.Scan.Model;
 
+    using Size = HandBrakeWPF.Model.Picture.Size;
+
     public class TitleFactory
     {
         public Title CreateTitle(SourceTitle title, int mainFeature)
diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index ca8a124bc..83e469bb0 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -17,12 +17,12 @@ namespace HandBrakeWPF.Services.Scan
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.Interfaces;
     using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
     using HandBrake.Interop.Interop.Json.Scan;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
-    using HandBrake.Interop.Interop.Model.Preview;
 
     using HandBrakeWPF.Instance;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Services.Logging.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
index cf79c6726..603bcc2e1 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
@@ -14,7 +14,9 @@ namespace HandBrakeWPF.Services.Scan.Model
     using System.IO;
     using System.Linq;
 
-    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+    using Size = HandBrakeWPF.Model.Picture.Size;
 
     /// <summary>
     /// An object that represents a single Title of a DVD
diff --git a/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs b/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
index 74a9d2fd7..63a478f4b 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.Interop.Interop.Model.Preview;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
 
     /// <summary>
     /// The bitmap utilities.
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
index 3895b6648..bce990a9d 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
index 5d251bc99..065c021eb 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
index 221a41e15..bad5ed944 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
index 8fd5ebb77..7fd779300 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
@@ -17,8 +17,9 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Presets.Model;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
index 7c7562b16..e232780c7 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
@@ -13,8 +13,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Services.Presets.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
index 8bf775dbc..4c23caaaa 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
@@ -13,8 +13,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Presets.Model;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
index 26d35d8ed..3dc966b0f 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
@@ -18,7 +18,6 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
index 188bb2675..b0ac8de66 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
@@ -16,7 +16,6 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
index 2fa8cccf4..c702de9f9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
@@ -17,7 +17,6 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows.Navigation;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index ced323b13..286fc9179 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
     using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.EventArgs;
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index ce69012f6..8ad8ab6cf 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -15,12 +15,9 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Interfaces.Model;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.EventArgs;
-    using HandBrakeWPF.Helpers;
     using HandBrakeWPF.Model.Picture;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Presets.Model;
@@ -29,7 +26,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModelItems.Filters;
     using HandBrakeWPF.ViewModels.Interfaces;
 
-    using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
+    using EncodeTask = Services.Encode.Model.EncodeTask;
+    using Size = Model.Picture.Size;
 
     public class PictureSettingsViewModel : ViewModelBase, IPictureSettingsViewModel
     {
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 65d0496c6..340090bd5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Properties;
diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
index d07d4187d..d9eb2f88f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
@@ -19,11 +19,13 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows.Media.Imaging;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Model.Options;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Encode.Model;
@@ -36,6 +38,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModelItems.Filters;
     using HandBrakeWPF.ViewModels.Interfaces;
 
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
     public class SummaryViewModel : ViewModelBase, ISummaryViewModel
     {
         private readonly IScan scanService;
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index d79398348..be5c20485 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Properties;
@@ -34,6 +34,8 @@ namespace HandBrakeWPF.ViewModels
     using FramerateMode = HandBrakeWPF.Services.Encode.Model.Models.FramerateMode;
     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
     using SettingChangedEventArgs = HandBrakeWPF.EventArgs.SettingChangedEventArgs;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
     using VideoLevel = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoLevel;
     using VideoPreset = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoPreset;
     using VideoProfile = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoProfile;