diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
index 6182a417a..f90a2d1ce 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Download.Clients.Sabnzbd
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
index 4aa330a93..fa94cbc2f 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
diff --git a/NzbDrone.Core/ExternalNotification/ExternalNotificationBase.cs b/NzbDrone.Core/ExternalNotification/ExternalNotificationBase.cs
index 7b2f852dd..76a6ef268 100644
--- a/NzbDrone.Core/ExternalNotification/ExternalNotificationBase.cs
+++ b/NzbDrone.Core/ExternalNotification/ExternalNotificationBase.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Linq;
 using NLog;
 using NzbDrone.Common.Eventing;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.ExternalNotification
diff --git a/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
index 248811f0f..7c00413b7 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.Eventing;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Tv;
 
diff --git a/NzbDrone.Core/Download/EpisodeDownloadedEvent.cs b/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
similarity index 76%
rename from NzbDrone.Core/Download/EpisodeDownloadedEvent.cs
rename to NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
index f7ded7c8c..26df92043 100644
--- a/NzbDrone.Core/Download/EpisodeDownloadedEvent.cs
+++ b/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
@@ -1,8 +1,7 @@
-using System.Linq;
-using NzbDrone.Common.Eventing;
+using NzbDrone.Common.Eventing;
 using NzbDrone.Core.Model;
 
-namespace NzbDrone.Core.Download
+namespace NzbDrone.Core.MediaFiles.Events
 {
     public class EpisodeDownloadedEvent : IEvent
     {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 0861683a8..0137e638f 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -234,7 +234,7 @@
     <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdQueueTimeConverter.cs" />
     <Compile Include="Download\Clients\Sabnzbd\SabAutoConfigureService.cs" />
     <Compile Include="Download\DownloadClientProvider.cs" />
-    <Compile Include="Download\EpisodeDownloadedEvent.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeDownloadedEvent.cs" />
     <Compile Include="Download\EpisodeGrabbedEvent.cs" />
     <Compile Include="Download\SeriesRenamedEvent.cs" />
     <Compile Include="ExternalNotification\ExternalNotificationRepository.cs" />
@@ -576,7 +576,9 @@
     </Content>
     <Content Include="NzbDrone.ico" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Download\Clients\Sabnzbd\Api\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>