diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index cf2746d2b..eca254848 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -169,28 +169,28 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
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