diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index cf2746d2b8..eca254848d 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -169,28 +169,28 @@
     <Compile Include="Subtitles\SubtitleManager.cs" />
     <Compile Include="TV\DummySeasonProvider.cs" />
     <Compile Include="TV\EpisodeMetadataService.cs" />
-    <Compile Include="TV\FanArtTvUpdatesPostScanTask.cs" />
-    <Compile Include="TV\FanArtSeasonProvider.cs" />
-    <Compile Include="TV\FanartSeriesProvider.cs" />
+    <Compile Include="TV\FanArt\FanArtTvUpdatesPostScanTask.cs" />
+    <Compile Include="TV\FanArt\FanArtSeasonProvider.cs" />
+    <Compile Include="TV\FanArt\FanartSeriesProvider.cs" />
     <Compile Include="TV\MissingEpisodeProvider.cs" />
-    <Compile Include="TV\MovieDbProviderBase.cs" />
-    <Compile Include="TV\MovieDbEpisodeImageProvider.cs" />
-    <Compile Include="TV\MovieDbSeasonProvider.cs" />
-    <Compile Include="TV\MovieDbSeriesImageProvider.cs" />
-    <Compile Include="TV\MovieDbSeriesProvider.cs" />
-    <Compile Include="TV\MovieDbEpisodeProvider.cs" />
-    <Compile Include="TV\OmdbEpisodeProvider.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbProviderBase.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbEpisodeImageProvider.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbSeasonProvider.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbSeriesImageProvider.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbSeriesProvider.cs" />
+    <Compile Include="TV\TheMovieDb\MovieDbEpisodeProvider.cs" />
+    <Compile Include="TV\Omdb\OmdbEpisodeProvider.cs" />
     <Compile Include="TV\SeriesMetadataService.cs" />
-    <Compile Include="TV\TvdbEpisodeImageProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbEpisodeImageProvider.cs" />
     <Compile Include="People\TvdbPersonImageProvider.cs" />
-    <Compile Include="TV\TvdbSeasonIdentityProvider.cs" />
-    <Compile Include="TV\TvdbSeasonImageProvider.cs" />
-    <Compile Include="TV\TvdbSeriesImageProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbSeasonIdentityProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbSeasonImageProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbSeriesImageProvider.cs" />
     <Compile Include="TV\SeasonMetadataService.cs" />
-    <Compile Include="TV\TvdbEpisodeProvider.cs" />
-    <Compile Include="TV\TvdbSeriesProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbEpisodeProvider.cs" />
+    <Compile Include="TV\TheTVDB\TvdbSeriesProvider.cs" />
     <Compile Include="TV\SeriesPostScanTask.cs" />
-    <Compile Include="TV\TvdbPrescanTask.cs" />
+    <Compile Include="TV\TheTVDB\TvdbPrescanTask.cs" />
     <Compile Include="TV\TvExternalIds.cs" />
     <Compile Include="Users\UserMetadataService.cs" />
     <Compile Include="Videos\VideoMetadataService.cs" />
diff --git a/MediaBrowser.Providers/TV/FanArtSeasonProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/FanArtSeasonProvider.cs
rename to MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
diff --git a/MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs b/MediaBrowser.Providers/TV/FanArt/FanArtTvUpdatesPostScanTask.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/FanArtTvUpdatesPostScanTask.cs
rename to MediaBrowser.Providers/TV/FanArt/FanArtTvUpdatesPostScanTask.cs
diff --git a/MediaBrowser.Providers/TV/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/FanartSeriesProvider.cs
rename to MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
diff --git a/MediaBrowser.Providers/TV/OmdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/OmdbEpisodeProvider.cs
rename to MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbEpisodeImageProvider.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbEpisodeProvider.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbProviderBase.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbProviderBase.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbSeasonProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbSeasonProvider.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbSeriesImageProvider.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
diff --git a/MediaBrowser.Providers/TV/MovieDbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/MovieDbSeriesProvider.cs
rename to MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbEpisodeProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbPrescanTask.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbPrescanTask.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
diff --git a/MediaBrowser.Providers/TV/TvdbSeasonIdentityProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonIdentityProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbSeasonIdentityProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonIdentityProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
diff --git a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
similarity index 100%
rename from MediaBrowser.Providers/TV/TvdbSeriesProvider.cs
rename to MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs