WinGui: Correcting namespaces.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6687 b64f7644-9d1e-0410-96f1-a4d463321fa5

35 files changed, 37 insertions, 36 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
index 8748ddbc6..d5c62794d 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
@@ -15,13 +15,13 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model
 

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

     using HandBrake.Interop.Model.Encoding.x265;

 

-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;

+    using OutputFormat = HandBrake.ApplicationServices.Services.Encode.Model.Models.OutputFormat;

 

     /// <summary>

     /// An Encode Task

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
index 36c4febab..7c973328c 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
index 992d15a8a..91c9c3564 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System;

     using System.ComponentModel;

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
index 1a20379f4..7f20ac6da 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
index a411d19ae..1b83f0d40 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System.ComponentModel.DataAnnotations;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
index 2fd13cfca..745039a35 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System.ComponentModel.DataAnnotations;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
index 6392578a6..542fb6b4e 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     /// <summary>

     /// The Mode of Video Encoding. CFR, VFR, PFR

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
index 828746f17..d36071b73 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System.ComponentModel;

     using System.ComponentModel.DataAnnotations;

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
index df0bc437c..17d2316cb 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System.ComponentModel.DataAnnotations;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
index 7be5dd3b9..e37bf26c5 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
index a249060b5..1262220e0 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model.Encoding

+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models

 {

     using System.ComponentModel;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index 45851c76f..972924a50 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -31,7 +31,7 @@ namespace HandBrake.ApplicationServices.Services.Scan
     using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;

     using Size = System.Drawing.Size;

     using Subtitle = HandBrake.ApplicationServices.Services.Scan.Model.Subtitle;

-    using SubtitleType = HandBrake.ApplicationServices.Model.Encoding.SubtitleType;

+    using SubtitleType = HandBrake.ApplicationServices.Services.Encode.Model.Models.SubtitleType;

     using Title = HandBrake.ApplicationServices.Services.Scan.Model.Title;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
index 3da9e4a2e..187ac682a 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Services.Scan.Model
     using System;

     using System.Xml.Serialization;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index 9b9027f7a..9c78d7d7b 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Utilities
     using System;

     using System.Text.RegularExpressions;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

     using HandBrake.Interop.Model.Encoding.x265;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index c8db8750f..d7b018145 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -14,8 +14,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Linq;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index e9bd84974..fd9ad3b4c 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -16,8 +16,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.IO;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

     using HandBrake.Interop.Model.Encoding.x265;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index b781beb41..c8c79116f 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -16,8 +16,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Text.RegularExpressions;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
index bd7aeffca..6048a3026 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
@@ -14,7 +14,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows.Data;

     using System.Collections.Generic;

     using System.Linq;

-    using HandBrake.ApplicationServices.Model.Encoding;

+

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model.Encoding;

 

     /// <summary>

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 2857559b6..25515bfdb 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.Data;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
index c729fac82..ed9ab9b9f 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Threading.Tasks;

     using System.Windows.Data;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index f746e07c3..b488470e2 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters
     using System;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 52e280722..34569f7d5 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.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model.Encoding;

 

     /// <summary>

diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
index 3e5f5d113..d3e66d6bc 100644
--- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Subtitles
     using System.Text;

     using System.Windows.Data;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

 

     /// <summary>

     /// Subtitle Queue Display Converter

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 063f616cf..b30d525fb 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Converters.Video
     using System.Windows.Data;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 49f958e55..6ea4ca28d 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Helpers
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.Interop.Model.Encoding;

 

     using HandBrakeWPF.Extensions;

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index 7508d3061..5cd4db148 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -13,8 +13,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Xml;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index 96fe6fb13..7a6e336e8 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Linq;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 82d3b22be..2528679b6 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -21,7 +21,7 @@ namespace HandBrakeWPF.Services.Presets
     using System.Xml.Serialization;

 

     using HandBrake.ApplicationServices.Exceptions;

-    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

 

     using HandBrakeWPF.Services.Presets.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index e05df3be4..aa9c24d41 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,8 +17,8 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index 295091011..a965440df 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -18,8 +18,8 @@ namespace HandBrakeWPF.ViewModels
 

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Scan.Model;

 

     using HandBrakeWPF.Services.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index e71dbea24..0a983348e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -14,8 +14,8 @@ namespace HandBrakeWPF.ViewModels
 

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 362089ed4..7280bc091 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -22,10 +22,10 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.EventArgs;

     using HandBrake.ApplicationServices.Services.Scan.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index bf6322b10..693d7a459 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -18,10 +18,10 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Factories;

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 74d2c0d64..7d0b16cdb 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -15,8 +15,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Linq;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 6b38c5209..36276b2f2 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -19,8 +19,8 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop;