diff --git a/NzbDrone.Common/IEnumerableExtensions.cs b/NzbDrone.Common/IEnumerableExtensions.cs
index cefa4c26b..11626292a 100644
--- a/NzbDrone.Common/IEnumerableExtensions.cs
+++ b/NzbDrone.Common/IEnumerableExtensions.cs
@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace NzbDrone.Common
 {
-    public static class IEnumerableExtensions
+    public static class EnumerableExtensions
     {
         public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
         {
diff --git a/NzbDrone.Common/Serializer/Json.cs b/NzbDrone.Common/Serializer/Json.cs
index 6345dbcef..bf54fb250 100644
--- a/NzbDrone.Common/Serializer/Json.cs
+++ b/NzbDrone.Common/Serializer/Json.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Linq.Expressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
diff --git a/NzbDrone.Core.Test/HelperTests/SortHelperTest.cs b/NzbDrone.Core.Test/HelperTests/SortHelperTest.cs
deleted file mode 100644
index c1f31c0cd..000000000
--- a/NzbDrone.Core.Test/HelperTests/SortHelperTest.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Helpers;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.HelperTests
-{
-    [TestFixture]
-    public class SortHelperTest : CoreTest
-    {
-        [TestCase("The Office (US)", "Office (US)")]
-        [TestCase("A Man in Anger", "Man in Anger")]
-        [TestCase("An Idiot Abroad", "Idiot Abroad")]
-        [TestCase("American Gladiators", "American Gladiators")]
-        [TestCase("Ancient Apocalyps", "Ancient Apocalyps")]
-        [TestCase("There Will Be Brawl", "There Will Be Brawl")]
-        [TestCase("30 Rock", "30 Rock")]
-        [TestCase(null, "")]
-        public void SkipArticles(string title, string expected)
-        {
-            var result = title.IgnoreArticles();
-            result.Should().Be(expected);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
index 19f7db315..7ade31623 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
@@ -3,7 +3,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Model.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.NotificationTests.Xbmc
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 8344a179d..b81a12de0 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -199,7 +199,6 @@
     <Compile Include="TvTests\SeriesRepositoryTests\QualityProfileRepositoryFixture.cs" />
     <Compile Include="TvTests\SeriesServiceTests\UpdateSeriesFixture.cs" />
     <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
-    <Compile Include="HelperTests\SortHelperTest.cs" />
     <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
     <Compile Include="Qualities\QualitySizeServiceFixture.cs" />
     <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest_GetEpisodesByParseResult.cs" />
diff --git a/NzbDrone.Core.Test/Providers/XemProxyFixture.cs b/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
index 37c625b55..e8501e401 100644
--- a/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
+++ b/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
@@ -2,7 +2,8 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Providers;
+using NzbDrone.Core.DataAugmentation;
+using NzbDrone.Core.DataAugmentation.Xem;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.Categories;
 
diff --git a/NzbDrone.Core.Test/XbmcVersionTests.cs b/NzbDrone.Core.Test/XbmcVersionTests.cs
index b4a118b0f..211bef487 100644
--- a/NzbDrone.Core.Test/XbmcVersionTests.cs
+++ b/NzbDrone.Core.Test/XbmcVersionTests.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Model.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core/Model/Xem/XemResult.cs b/NzbDrone.Core/DataAugmentation/Xem/Model/XemResult.cs
similarity index 75%
rename from NzbDrone.Core/Model/Xem/XemResult.cs
rename to NzbDrone.Core/DataAugmentation/Xem/Model/XemResult.cs
index 397700a11..2b041709d 100644
--- a/NzbDrone.Core/Model/Xem/XemResult.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/Model/XemResult.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.DataAugmentation.Xem.Model
 {
     public class XemResult<T>
     {
diff --git a/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs b/NzbDrone.Core/DataAugmentation/Xem/Model/XemSceneTvdbMapping.cs
similarity index 72%
rename from NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs
rename to NzbDrone.Core/DataAugmentation/Xem/Model/XemSceneTvdbMapping.cs
index 317efa3e4..1cc65524a 100644
--- a/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/Model/XemSceneTvdbMapping.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.DataAugmentation.Xem.Model
 {
     public class XemSceneTvdbMapping
     {
diff --git a/NzbDrone.Core/Model/Xem/XemValues.cs b/NzbDrone.Core/DataAugmentation/Xem/Model/XemValues.cs
similarity index 75%
rename from NzbDrone.Core/Model/Xem/XemValues.cs
rename to NzbDrone.Core/DataAugmentation/Xem/Model/XemValues.cs
index 6dc3d5e4a..ab6764e18 100644
--- a/NzbDrone.Core/Model/Xem/XemValues.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/Model/XemValues.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.DataAugmentation.Xem.Model
 {
     public class XemValues
     {
diff --git a/NzbDrone.Core/Providers/UpdateXemMappingsCommand.cs b/NzbDrone.Core/DataAugmentation/Xem/UpdateXemMappingsCommand.cs
similarity index 71%
rename from NzbDrone.Core/Providers/UpdateXemMappingsCommand.cs
rename to NzbDrone.Core/DataAugmentation/Xem/UpdateXemMappingsCommand.cs
index 5f35eaf1d..832e0ed58 100644
--- a/NzbDrone.Core/Providers/UpdateXemMappingsCommand.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/UpdateXemMappingsCommand.cs
@@ -1,6 +1,6 @@
 using NzbDrone.Core.Messaging.Commands;
 
-namespace NzbDrone.Core.Providers
+namespace NzbDrone.Core.DataAugmentation.Xem
 {
     public class UpdateXemMappingsCommand : Command
     {
diff --git a/NzbDrone.Core/Providers/XemProxy.cs b/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
similarity index 91%
rename from NzbDrone.Core/Providers/XemProxy.cs
rename to NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
index 0d500cdee..0747ab678 100644
--- a/NzbDrone.Core/Providers/XemProxy.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Core.Model.Xem;
+using NzbDrone.Core.DataAugmentation.Xem.Model;
 using NzbDrone.Core.Rest;
 using RestSharp;
 
-namespace NzbDrone.Core.Providers
+namespace NzbDrone.Core.DataAugmentation.Xem
 {
     public interface IXemProxy
     {
-        List<Int32> GetXemSeriesIds();
+        List<int> GetXemSeriesIds();
         List<XemSceneTvdbMapping> GetSceneTvdbMappings(int id);
     }
 
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Providers
             return req;
         }
 
-        public List<Int32> GetXemSeriesIds()
+        public List<int> GetXemSeriesIds()
         {
             _logger.Trace("Fetching Series IDs from");
 
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Providers
 
             var request = BuildRequest("havemap");
 
-            var response = restClient.ExecuteAndValidate<XemResult<List<Int32>>>(request);
+            var response = restClient.ExecuteAndValidate<XemResult<List<int>>>(request);
             CheckForFailureResult(response);
 
             return response.Data.ToList();
diff --git a/NzbDrone.Core/Providers/XemService.cs b/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
similarity index 99%
rename from NzbDrone.Core/Providers/XemService.cs
rename to NzbDrone.Core/DataAugmentation/Xem/XemService.cs
index ac36a0bb7..dd1e277cc 100644
--- a/NzbDrone.Core/Providers/XemService.cs
+++ b/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
@@ -9,7 +9,7 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Tv.Events;
 
-namespace NzbDrone.Core.Providers
+namespace NzbDrone.Core.DataAugmentation.Xem
 {
     public class XemService : IExecute<UpdateXemMappingsCommand>, IHandle<SeriesUpdatedEvent>, IHandleAsync<ApplicationStartedEvent>
     {
diff --git a/NzbDrone.Core/Helpers/SortHelper.cs b/NzbDrone.Core/Helpers/SortHelper.cs
deleted file mode 100644
index bd2192a08..000000000
--- a/NzbDrone.Core/Helpers/SortHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NzbDrone.Core.Helpers
-{
-    public static class SortHelper
-    {
-        public static string IgnoreArticles(this string input)
-        {
-            if (String.IsNullOrEmpty(input))
-                return String.Empty;
-
-            var articles = new List<string> { "The ", "An ", "A " };
-
-            foreach (string article in articles)
-            {
-                if (input.ToLower().StartsWith(article, StringComparison.InvariantCultureIgnoreCase))
-                    return input.Substring(article.Length).Trim();
-            }
-
-            return input;
-        }
-    }
-}
diff --git a/NzbDrone.Core/Jobs/JobQueueItem.cs b/NzbDrone.Core/Jobs/JobQueueItem.cs
deleted file mode 100644
index 079c186c9..000000000
--- a/NzbDrone.Core/Jobs/JobQueueItem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace NzbDrone.Core.Jobs
-{
-    public class JobQueueItem : IEquatable<JobQueueItem>
-    {
-        public Type JobType { get; set; }
-        public dynamic Options { get; set; }
-
-        public JobSourceType Source { get; set; }
-
-        public bool Equals(JobQueueItem other)
-        {
-            return (JobType == other.JobType && Options == other.Options);
-        }
-
-        public override string ToString()
-        {
-            if (Options != null)
-            {
-                return string.Format("[{0}({1})]", JobType.Name, Options);
-            }
-
-            return string.Format("[{0}]", JobType.Name);
-        }
-
-        public enum JobSourceType
-        {
-            User,
-            Scheduler
-        }
-    }
-}
diff --git a/NzbDrone.Core/Jobs/TaskManager.cs b/NzbDrone.Core/Jobs/TaskManager.cs
index 7851cbbf8..e2bc22da2 100644
--- a/NzbDrone.Core/Jobs/TaskManager.cs
+++ b/NzbDrone.Core/Jobs/TaskManager.cs
@@ -4,7 +4,9 @@ using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Configuration.Events;
+using NzbDrone.Core.DataAugmentation;
 using NzbDrone.Core.DataAugmentation.Scene;
+using NzbDrone.Core.DataAugmentation.Xem;
 using NzbDrone.Core.Housekeeping;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Instrumentation.Commands;
@@ -12,7 +14,6 @@ using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.Messaging.Commands.Tracking;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Providers;
 using NzbDrone.Core.Tv.Commands;
 using NzbDrone.Core.Update.Commands;
 
diff --git a/NzbDrone.Core/Model/MediaInfoModel.cs b/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
similarity index 93%
rename from NzbDrone.Core/Model/MediaInfoModel.cs
rename to NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
index 9b2ada461..69e8f4760 100644
--- a/NzbDrone.Core/Model/MediaInfoModel.cs
+++ b/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model
+namespace NzbDrone.Core.MediaFiles.MediaInfo
 {
     public class MediaInfoModel
     {
diff --git a/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
index a2f1143e2..4879218d0 100644
--- a/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
+++ b/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
@@ -3,7 +3,6 @@ using System.IO;
 using MediaInfoLib;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Core.Model;
 
 namespace NzbDrone.Core.MediaFiles.MediaInfo
 {
diff --git a/NzbDrone.Core/Model/AtomicParsleyTitleType.cs b/NzbDrone.Core/Model/AtomicParsleyTitleType.cs
deleted file mode 100644
index d133b977a..000000000
--- a/NzbDrone.Core/Model/AtomicParsleyTitleType.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace NzbDrone.Core.Model
-{
-    public enum AtomicParsleyTitleType
-    {
-        None = 0,
-        EpisodeNumber = 1,
-        Both = 2
-    }
-}
\ No newline at end of file
diff --git a/NzbDrone.Core/Model/MisnamedEpisodeModel.cs b/NzbDrone.Core/Model/MisnamedEpisodeModel.cs
deleted file mode 100644
index 2c06b6d4f..000000000
--- a/NzbDrone.Core/Model/MisnamedEpisodeModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace NzbDrone.Core.Model
-{
-    public class MisnamedEpisodeModel
-    {
-        public int EpisodeFileId { get; set; }
-        public int SeriesId { get; set; }
-        public string SeriesTitle { get; set; }
-        public string CurrentName { get; set; }
-        public string ProperName { get; set; }
-    }
-}
diff --git a/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs b/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs
deleted file mode 100644
index 191a5e7f2..000000000
--- a/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace NzbDrone.Core.Model.Xbmc
-{
-    public class ActivePlayersEdenResult
-    {
-        public string Id { get; set; }
-        public string JsonRpc { get; set; }
-        public List<ActivePlayer> Result { get; set; }
-    }
-
-    public class ActivePlayer
-    {
-        public int PlayerId { get; set; }
-        public string Type { get; set; }
-
-        public ActivePlayer(int playerId, string type)
-        {
-            PlayerId = playerId;
-            Type = type;
-        }
-    }
-}
diff --git a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
index d03f88473..e0a2fa260 100644
--- a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Xml.Linq;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Core.Model.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Notifications.Xbmc
diff --git a/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
index a3ca85b71..28456249a 100644
--- a/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using NzbDrone.Core.Model.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Notifications.Xbmc
diff --git a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
index aa06901d1..f7fb1ed3b 100644
--- a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
@@ -5,7 +5,7 @@ using NLog;
 using Newtonsoft.Json.Linq;
 using NzbDrone.Common;
 using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Model.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Notifications.Xbmc
diff --git a/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayer.cs b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayer.cs
new file mode 100644
index 000000000..ad4dafb68
--- /dev/null
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayer.cs
@@ -0,0 +1,14 @@
+namespace NzbDrone.Core.Notifications.Xbmc.Model
+{
+    public class ActivePlayer
+    {
+        public int PlayerId { get; set; }
+        public string Type { get; set; }
+
+        public ActivePlayer(int playerId, string type)
+        {
+            PlayerId = playerId;
+            Type = type;
+        }
+    }
+}
diff --git a/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersDharmaResult.cs
similarity index 83%
rename from NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersDharmaResult.cs
index a88e190d3..49d942cc2 100644
--- a/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersDharmaResult.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class ActivePlayersDharmaResult
     {
diff --git a/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersEdenResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersEdenResult.cs
new file mode 100644
index 000000000..2f3cc61d8
--- /dev/null
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/ActivePlayersEdenResult.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace NzbDrone.Core.Notifications.Xbmc.Model
+{
+    public class ActivePlayersEdenResult
+    {
+        public string Id { get; set; }
+        public string JsonRpc { get; set; }
+        public List<ActivePlayer> Result { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Model/Xbmc/ErrorResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/ErrorResult.cs
similarity index 82%
rename from NzbDrone.Core/Model/Xbmc/ErrorResult.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/ErrorResult.cs
index 42f609e7c..8de9b7c58 100644
--- a/NzbDrone.Core/Model/Xbmc/ErrorResult.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/ErrorResult.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class ErrorResult
     {
diff --git a/NzbDrone.Core/Model/Xbmc/TvShow.cs b/NzbDrone.Core/Notifications/Xbmc/Model/TvShow.cs
similarity index 80%
rename from NzbDrone.Core/Model/Xbmc/TvShow.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/TvShow.cs
index 74d0cb3d6..318167d37 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShow.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/TvShow.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class TvShow
     {
diff --git a/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs b/NzbDrone.Core/Notifications/Xbmc/Model/TvShowResponse.cs
similarity index 77%
rename from NzbDrone.Core/Model/Xbmc/TvShowResponse.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/TvShowResponse.cs
index 4f6ae929a..079ede558 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/TvShowResponse.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class TvShowResponse
     {
diff --git a/NzbDrone.Core/Model/Xbmc/TvShowResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/TvShowResult.cs
similarity index 78%
rename from NzbDrone.Core/Model/Xbmc/TvShowResult.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/TvShowResult.cs
index e9af56d1e..4e1a8074f 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShowResult.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/TvShowResult.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class TvShowResult
     {
diff --git a/NzbDrone.Core/Model/Xbmc/VersionResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/VersionResult.cs
similarity index 82%
rename from NzbDrone.Core/Model/Xbmc/VersionResult.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/VersionResult.cs
index cc40e6004..01ad8c8e7 100644
--- a/NzbDrone.Core/Model/Xbmc/VersionResult.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/VersionResult.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class VersionResult
     {
diff --git a/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs b/NzbDrone.Core/Notifications/Xbmc/Model/XbmcJsonResult.cs
similarity index 76%
rename from NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/XbmcJsonResult.cs
index 27cf8f749..d69dc4902 100644
--- a/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/XbmcJsonResult.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class XbmcJsonResult<T>
     {
diff --git a/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs b/NzbDrone.Core/Notifications/Xbmc/Model/XbmcVersion.cs
similarity index 98%
rename from NzbDrone.Core/Model/Xbmc/XbmcVersion.cs
rename to NzbDrone.Core/Notifications/Xbmc/Model/XbmcVersion.cs
index 2fc1e8e7f..14c7c892d 100644
--- a/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/Model/XbmcVersion.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Notifications.Xbmc.Model
 {
     public class XbmcVersion : IComparable<XbmcVersion>
     {
diff --git a/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
index 9444b79f0..3ffbeba98 100644
--- a/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
@@ -7,8 +7,8 @@ using NzbDrone.Common;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.Notifications.Xbmc.Model;
 using NzbDrone.Core.Tv;
-using NzbDrone.Core.Model.Xbmc;
 
 namespace NzbDrone.Core.Notifications.Xbmc
 {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 591ccb069..c9fe66259 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -131,6 +131,12 @@
     <Compile Include="DataAugmentation\Scene\SceneMappingProxy.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMappingRepository.cs" />
     <Compile Include="DataAugmentation\Scene\UpdateSceneMappingCommand.cs" />
+    <Compile Include="DataAugmentation\Xem\Model\XemResult.cs" />
+    <Compile Include="DataAugmentation\Xem\Model\XemSceneTvdbMapping.cs" />
+    <Compile Include="DataAugmentation\Xem\Model\XemValues.cs" />
+    <Compile Include="DataAugmentation\Xem\UpdateXemMappingsCommand.cs" />
+    <Compile Include="DataAugmentation\Xem\XemProxy.cs" />
+    <Compile Include="DataAugmentation\Xem\XemService.cs" />
     <Compile Include="Datastore\ConnectionStringFactory.cs" />
     <Compile Include="Datastore\Converters\BooleanIntConverter.cs" />
     <Compile Include="Datastore\Converters\QualityIntConverter.cs" />
@@ -273,6 +279,16 @@
     <Compile Include="Messaging\Events\CommandCreatedEvent.cs" />
     <Compile Include="Messaging\Events\CommandExecutedEvent.cs" />
     <Compile Include="Messaging\IProcessMessage.cs" />
+    <Compile Include="Notifications\Xbmc\Model\ActivePlayer.cs" />
+    <Compile Include="Notifications\Xbmc\Model\ActivePlayersDharmaResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\ActivePlayersEdenResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\ErrorResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\TvShow.cs" />
+    <Compile Include="Notifications\Xbmc\Model\TvShowResponse.cs" />
+    <Compile Include="Notifications\Xbmc\Model\TvShowResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\VersionResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\XbmcJsonResult.cs" />
+    <Compile Include="Notifications\Xbmc\Model\XbmcVersion.cs" />
     <Compile Include="ProgressMessaging\CommandUpdatedEvent.cs" />
     <Compile Include="ProgressMessaging\ProgressMessageTarget.cs" />
     <Compile Include="Instrumentation\SetLoggingLevel.cs" />
@@ -309,7 +325,6 @@
     <Compile Include="Notifications\NotificationService.cs" />
     <Compile Include="Notifications\NotificationRepository.cs" />
     <Compile Include="Fluent.cs" />
-    <Compile Include="Helpers\SortHelper.cs" />
     <Compile Include="History\HistoryRepository.cs" />
     <Compile Include="IndexerSearch\Definitions\DailyEpisodeSearchCriteria.cs" />
     <Compile Include="IndexerSearch\Definitions\SearchCriteriaBase.cs" />
@@ -334,7 +349,6 @@
     <Compile Include="Indexers\Wombles\WomblesParser.cs" />
     <Compile Include="Instrumentation\LogRepository.cs" />
     <Compile Include="Jobs\ScheduledTask.cs" />
-    <Compile Include="Jobs\JobQueueItem.cs" />
     <Compile Include="Jobs\JobRepository.cs" />
     <Compile Include="Jobs\Scheduler.cs" />
     <Compile Include="Lifecycle\ApplicationStartedEvent.cs" />
@@ -378,8 +392,7 @@
     <Compile Include="Organizer\FileNameBuilder.cs" />
     <Compile Include="Instrumentation\LogService.cs" />
     <Compile Include="Instrumentation\DatabaseTarget.cs" />
-    <Compile Include="Model\AtomicParsleyTitleType.cs" />
-    <Compile Include="Model\MediaInfoModel.cs" />
+    <Compile Include="MediaFiles\MediaInfo\MediaInfoModel.cs" />
     <Compile Include="Download\Clients\Nzbget\EnqueueResponse.cs" />
     <Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
     <Compile Include="Download\Clients\Nzbget\JsonError.cs" />
@@ -388,7 +401,6 @@
     <Compile Include="Download\Clients\Nzbget\NzbGetQueueItem.cs" />
     <Compile Include="Download\Clients\Nzbget\PriorityType.cs" />
     <Compile Include="Download\Clients\Nzbget\VersionModel.cs" />
-    <Compile Include="Model\MisnamedEpisodeModel.cs" />
     <Compile Include="Organizer\NamingConfig.cs" />
     <Compile Include="Parser\Language.cs" />
     <Compile Include="Parser\Model\LocalEpisode.cs" />
@@ -399,7 +411,6 @@
     <Compile Include="Parser\Parser.cs" />
     <Compile Include="Parser\ParsingService.cs" />
     <Compile Include="Parser\QualityParser.cs" />
-    <Compile Include="Providers\UpdateXemMappingsCommand.cs" />
     <Compile Include="Qualities\QualityProfileInUseException.cs" />
     <Compile Include="Qualities\QualitySizeRepository.cs" />
     <Compile Include="Qualities\QualityProfileRepository.cs" />
@@ -427,15 +438,6 @@
     <Compile Include="Download\Clients\Sabnzbd\SabModel.cs" />
     <Compile Include="Download\Clients\Sabnzbd\SabQueueItem.cs" />
     <Compile Include="Download\Clients\Sabnzbd\SabVersionModel.cs" />
-    <Compile Include="Model\Xbmc\ActivePlayersDharmaResult.cs" />
-    <Compile Include="Model\Xbmc\ActivePlayersEdenResult.cs" />
-    <Compile Include="Model\Xbmc\TvShowResult.cs" />
-    <Compile Include="Model\Xbmc\ErrorResult.cs" />
-    <Compile Include="Model\Xbmc\XbmcJsonResult.cs" />
-    <Compile Include="Model\Xbmc\XbmcVersion.cs" />
-    <Compile Include="Model\Xem\XemResult.cs" />
-    <Compile Include="Model\Xem\XemSceneTvdbMapping.cs" />
-    <Compile Include="Model\Xem\XemValues.cs" />
     <Compile Include="MediaCover\MediaCoverService.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetClient.cs" />
     <Compile Include="Download\Clients\PneumaticClient.cs" />
@@ -443,11 +445,6 @@
     <Compile Include="SeriesStats\SeriesStatistics.cs" />
     <Compile Include="SeriesStats\SeriesStatisticsRepository.cs" />
     <Compile Include="Tv\SeriesTypes.cs" />
-    <Compile Include="Model\Xbmc\TvShowResponse.cs" />
-    <Compile Include="Model\Xbmc\TvShow.cs" />
-    <Compile Include="Model\Xbmc\VersionResult.cs" />
-    <Compile Include="Providers\XemProxy.cs" />
-    <Compile Include="Providers\XemService.cs" />
     <Compile Include="Qualities\Quality.cs" />
     <Compile Include="Tv\Season.cs" />
     <Compile Include="Configuration\ConfigService.cs">