diff --git a/couchpotato/core/providers/__init__.py b/couchpotato/core/media/_base/providers/__init__.py
similarity index 100%
rename from couchpotato/core/providers/__init__.py
rename to couchpotato/core/media/_base/providers/__init__.py
diff --git a/couchpotato/core/providers/automation/__init__.py b/couchpotato/core/media/_base/providers/automation/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/__init__.py
rename to couchpotato/core/media/_base/providers/automation/__init__.py
diff --git a/couchpotato/core/providers/automation/base.py b/couchpotato/core/media/_base/providers/automation/base.py
similarity index 100%
rename from couchpotato/core/providers/automation/base.py
rename to couchpotato/core/media/_base/providers/automation/base.py
diff --git a/couchpotato/core/providers/automation/bluray/__init__.py b/couchpotato/core/media/_base/providers/automation/bluray/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/bluray/__init__.py
rename to couchpotato/core/media/_base/providers/automation/bluray/__init__.py
diff --git a/couchpotato/core/providers/automation/bluray/main.py b/couchpotato/core/media/_base/providers/automation/bluray/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/bluray/main.py
rename to couchpotato/core/media/_base/providers/automation/bluray/main.py
diff --git a/couchpotato/core/providers/automation/flixster/__init__.py b/couchpotato/core/media/_base/providers/automation/flixster/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/flixster/__init__.py
rename to couchpotato/core/media/_base/providers/automation/flixster/__init__.py
diff --git a/couchpotato/core/providers/automation/flixster/main.py b/couchpotato/core/media/_base/providers/automation/flixster/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/flixster/main.py
rename to couchpotato/core/media/_base/providers/automation/flixster/main.py
diff --git a/couchpotato/core/providers/automation/goodfilms/__init__.py b/couchpotato/core/media/_base/providers/automation/goodfilms/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/goodfilms/__init__.py
rename to couchpotato/core/media/_base/providers/automation/goodfilms/__init__.py
diff --git a/couchpotato/core/providers/automation/goodfilms/main.py b/couchpotato/core/media/_base/providers/automation/goodfilms/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/goodfilms/main.py
rename to couchpotato/core/media/_base/providers/automation/goodfilms/main.py
diff --git a/couchpotato/core/providers/automation/imdb/__init__.py b/couchpotato/core/media/_base/providers/automation/imdb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/imdb/__init__.py
rename to couchpotato/core/media/_base/providers/automation/imdb/__init__.py
diff --git a/couchpotato/core/providers/automation/imdb/main.py b/couchpotato/core/media/_base/providers/automation/imdb/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/imdb/main.py
rename to couchpotato/core/media/_base/providers/automation/imdb/main.py
diff --git a/couchpotato/core/providers/automation/itunes/__init__.py b/couchpotato/core/media/_base/providers/automation/itunes/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/itunes/__init__.py
rename to couchpotato/core/media/_base/providers/automation/itunes/__init__.py
diff --git a/couchpotato/core/providers/automation/itunes/main.py b/couchpotato/core/media/_base/providers/automation/itunes/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/itunes/main.py
rename to couchpotato/core/media/_base/providers/automation/itunes/main.py
diff --git a/couchpotato/core/providers/automation/kinepolis/__init__.py b/couchpotato/core/media/_base/providers/automation/kinepolis/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/kinepolis/__init__.py
rename to couchpotato/core/media/_base/providers/automation/kinepolis/__init__.py
diff --git a/couchpotato/core/providers/automation/kinepolis/main.py b/couchpotato/core/media/_base/providers/automation/kinepolis/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/kinepolis/main.py
rename to couchpotato/core/media/_base/providers/automation/kinepolis/main.py
diff --git a/couchpotato/core/providers/automation/letterboxd/__init__.py b/couchpotato/core/media/_base/providers/automation/letterboxd/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/letterboxd/__init__.py
rename to couchpotato/core/media/_base/providers/automation/letterboxd/__init__.py
diff --git a/couchpotato/core/providers/automation/letterboxd/main.py b/couchpotato/core/media/_base/providers/automation/letterboxd/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/letterboxd/main.py
rename to couchpotato/core/media/_base/providers/automation/letterboxd/main.py
diff --git a/couchpotato/core/providers/automation/moviemeter/__init__.py b/couchpotato/core/media/_base/providers/automation/moviemeter/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/moviemeter/__init__.py
rename to couchpotato/core/media/_base/providers/automation/moviemeter/__init__.py
diff --git a/couchpotato/core/providers/automation/moviemeter/main.py b/couchpotato/core/media/_base/providers/automation/moviemeter/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/moviemeter/main.py
rename to couchpotato/core/media/_base/providers/automation/moviemeter/main.py
diff --git a/couchpotato/core/providers/automation/movies_io/__init__.py b/couchpotato/core/media/_base/providers/automation/movies_io/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/movies_io/__init__.py
rename to couchpotato/core/media/_base/providers/automation/movies_io/__init__.py
diff --git a/couchpotato/core/providers/automation/movies_io/main.py b/couchpotato/core/media/_base/providers/automation/movies_io/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/movies_io/main.py
rename to couchpotato/core/media/_base/providers/automation/movies_io/main.py
diff --git a/couchpotato/core/providers/automation/rottentomatoes/__init__.py b/couchpotato/core/media/_base/providers/automation/rottentomatoes/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/rottentomatoes/__init__.py
rename to couchpotato/core/media/_base/providers/automation/rottentomatoes/__init__.py
diff --git a/couchpotato/core/providers/automation/rottentomatoes/main.py b/couchpotato/core/media/_base/providers/automation/rottentomatoes/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/rottentomatoes/main.py
rename to couchpotato/core/media/_base/providers/automation/rottentomatoes/main.py
diff --git a/couchpotato/core/providers/automation/trakt/__init__.py b/couchpotato/core/media/_base/providers/automation/trakt/__init__.py
similarity index 100%
rename from couchpotato/core/providers/automation/trakt/__init__.py
rename to couchpotato/core/media/_base/providers/automation/trakt/__init__.py
diff --git a/couchpotato/core/providers/automation/trakt/main.py b/couchpotato/core/media/_base/providers/automation/trakt/main.py
similarity index 100%
rename from couchpotato/core/providers/automation/trakt/main.py
rename to couchpotato/core/media/_base/providers/automation/trakt/main.py
diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/media/_base/providers/base.py
similarity index 100%
rename from couchpotato/core/providers/base.py
rename to couchpotato/core/media/_base/providers/base.py
diff --git a/couchpotato/core/providers/info/__init__.py b/couchpotato/core/media/_base/providers/info/__init__.py
similarity index 100%
rename from couchpotato/core/providers/info/__init__.py
rename to couchpotato/core/media/_base/providers/info/__init__.py
diff --git a/couchpotato/core/providers/info/_modifier/__init__.py b/couchpotato/core/media/_base/providers/info/_modifier/__init__.py
similarity index 100%
rename from couchpotato/core/providers/info/_modifier/__init__.py
rename to couchpotato/core/media/_base/providers/info/_modifier/__init__.py
diff --git a/couchpotato/core/providers/info/_modifier/main.py b/couchpotato/core/media/_base/providers/info/_modifier/main.py
similarity index 100%
rename from couchpotato/core/providers/info/_modifier/main.py
rename to couchpotato/core/media/_base/providers/info/_modifier/main.py
diff --git a/couchpotato/core/providers/info/base.py b/couchpotato/core/media/_base/providers/info/base.py
similarity index 100%
rename from couchpotato/core/providers/info/base.py
rename to couchpotato/core/media/_base/providers/info/base.py
diff --git a/couchpotato/core/providers/info/couchpotatoapi/__init__.py b/couchpotato/core/media/_base/providers/info/couchpotatoapi/__init__.py
similarity index 100%
rename from couchpotato/core/providers/info/couchpotatoapi/__init__.py
rename to couchpotato/core/media/_base/providers/info/couchpotatoapi/__init__.py
diff --git a/couchpotato/core/providers/info/couchpotatoapi/main.py b/couchpotato/core/media/_base/providers/info/couchpotatoapi/main.py
similarity index 100%
rename from couchpotato/core/providers/info/couchpotatoapi/main.py
rename to couchpotato/core/media/_base/providers/info/couchpotatoapi/main.py
diff --git a/couchpotato/core/providers/info/omdbapi/__init__.py b/couchpotato/core/media/_base/providers/info/omdbapi/__init__.py
similarity index 100%
rename from couchpotato/core/providers/info/omdbapi/__init__.py
rename to couchpotato/core/media/_base/providers/info/omdbapi/__init__.py
diff --git a/couchpotato/core/providers/info/omdbapi/main.py b/couchpotato/core/media/_base/providers/info/omdbapi/main.py
old mode 100755
new mode 100644
similarity index 100%
rename from couchpotato/core/providers/info/omdbapi/main.py
rename to couchpotato/core/media/_base/providers/info/omdbapi/main.py
diff --git a/couchpotato/core/providers/info/themoviedb/__init__.py b/couchpotato/core/media/_base/providers/info/themoviedb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/info/themoviedb/__init__.py
rename to couchpotato/core/media/_base/providers/info/themoviedb/__init__.py
diff --git a/couchpotato/core/providers/info/themoviedb/main.py b/couchpotato/core/media/_base/providers/info/themoviedb/main.py
similarity index 100%
rename from couchpotato/core/providers/info/themoviedb/main.py
rename to couchpotato/core/media/_base/providers/info/themoviedb/main.py
diff --git a/couchpotato/core/providers/metadata/__init__.py b/couchpotato/core/media/_base/providers/metadata/__init__.py
similarity index 100%
rename from couchpotato/core/providers/metadata/__init__.py
rename to couchpotato/core/media/_base/providers/metadata/__init__.py
diff --git a/couchpotato/core/providers/metadata/base.py b/couchpotato/core/media/_base/providers/metadata/base.py
similarity index 100%
rename from couchpotato/core/providers/metadata/base.py
rename to couchpotato/core/media/_base/providers/metadata/base.py
diff --git a/couchpotato/core/providers/metadata/wmc/__init__.py b/couchpotato/core/media/_base/providers/metadata/wmc/__init__.py
similarity index 100%
rename from couchpotato/core/providers/metadata/wmc/__init__.py
rename to couchpotato/core/media/_base/providers/metadata/wmc/__init__.py
diff --git a/couchpotato/core/providers/metadata/wmc/main.py b/couchpotato/core/media/_base/providers/metadata/wmc/main.py
similarity index 100%
rename from couchpotato/core/providers/metadata/wmc/main.py
rename to couchpotato/core/media/_base/providers/metadata/wmc/main.py
diff --git a/couchpotato/core/providers/metadata/xbmc/__init__.py b/couchpotato/core/media/_base/providers/metadata/xbmc/__init__.py
similarity index 100%
rename from couchpotato/core/providers/metadata/xbmc/__init__.py
rename to couchpotato/core/media/_base/providers/metadata/xbmc/__init__.py
diff --git a/couchpotato/core/providers/metadata/xbmc/main.py b/couchpotato/core/media/_base/providers/metadata/xbmc/main.py
similarity index 100%
rename from couchpotato/core/providers/metadata/xbmc/main.py
rename to couchpotato/core/media/_base/providers/metadata/xbmc/main.py
diff --git a/couchpotato/core/providers/nzb/__init__.py b/couchpotato/core/media/_base/providers/nzb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/__init__.py
diff --git a/couchpotato/core/providers/nzb/base.py b/couchpotato/core/media/_base/providers/nzb/base.py
similarity index 100%
rename from couchpotato/core/providers/nzb/base.py
rename to couchpotato/core/media/_base/providers/nzb/base.py
diff --git a/couchpotato/core/providers/nzb/binsearch/__init__.py b/couchpotato/core/media/_base/providers/nzb/binsearch/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/binsearch/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/binsearch/__init__.py
diff --git a/couchpotato/core/providers/nzb/binsearch/main.py b/couchpotato/core/media/_base/providers/nzb/binsearch/main.py
similarity index 100%
rename from couchpotato/core/providers/nzb/binsearch/main.py
rename to couchpotato/core/media/_base/providers/nzb/binsearch/main.py
diff --git a/couchpotato/core/providers/nzb/newznab/__init__.py b/couchpotato/core/media/_base/providers/nzb/newznab/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/newznab/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/newznab/__init__.py
diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/media/_base/providers/nzb/newznab/main.py
similarity index 100%
rename from couchpotato/core/providers/nzb/newznab/main.py
rename to couchpotato/core/media/_base/providers/nzb/newznab/main.py
diff --git a/couchpotato/core/providers/nzb/nzbclub/__init__.py b/couchpotato/core/media/_base/providers/nzb/nzbclub/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/nzbclub/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/nzbclub/__init__.py
diff --git a/couchpotato/core/providers/nzb/nzbclub/main.py b/couchpotato/core/media/_base/providers/nzb/nzbclub/main.py
similarity index 100%
rename from couchpotato/core/providers/nzb/nzbclub/main.py
rename to couchpotato/core/media/_base/providers/nzb/nzbclub/main.py
diff --git a/couchpotato/core/providers/nzb/nzbindex/__init__.py b/couchpotato/core/media/_base/providers/nzb/nzbindex/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/nzbindex/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/nzbindex/__init__.py
diff --git a/couchpotato/core/providers/nzb/nzbindex/main.py b/couchpotato/core/media/_base/providers/nzb/nzbindex/main.py
similarity index 100%
rename from couchpotato/core/providers/nzb/nzbindex/main.py
rename to couchpotato/core/media/_base/providers/nzb/nzbindex/main.py
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/__init__.py
similarity index 100%
rename from couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
rename to couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/__init__.py
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/main.py b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/main.py
similarity index 100%
rename from couchpotato/core/providers/nzb/omgwtfnzbs/main.py
rename to couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/main.py
diff --git a/couchpotato/core/providers/torrent/__init__.py b/couchpotato/core/media/_base/providers/torrent/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/__init__.py
diff --git a/couchpotato/core/providers/torrent/awesomehd/__init__.py b/couchpotato/core/media/_base/providers/torrent/awesomehd/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/awesomehd/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/awesomehd/__init__.py
diff --git a/couchpotato/core/providers/torrent/awesomehd/main.py b/couchpotato/core/media/_base/providers/torrent/awesomehd/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/awesomehd/main.py
rename to couchpotato/core/media/_base/providers/torrent/awesomehd/main.py
diff --git a/couchpotato/core/providers/torrent/base.py b/couchpotato/core/media/_base/providers/torrent/base.py
similarity index 100%
rename from couchpotato/core/providers/torrent/base.py
rename to couchpotato/core/media/_base/providers/torrent/base.py
diff --git a/couchpotato/core/providers/torrent/bithdtv/__init__.py b/couchpotato/core/media/_base/providers/torrent/bithdtv/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/bithdtv/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/bithdtv/__init__.py
diff --git a/couchpotato/core/providers/torrent/bithdtv/main.py b/couchpotato/core/media/_base/providers/torrent/bithdtv/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/bithdtv/main.py
rename to couchpotato/core/media/_base/providers/torrent/bithdtv/main.py
diff --git a/couchpotato/core/providers/torrent/bitsoup/__init__.py b/couchpotato/core/media/_base/providers/torrent/bitsoup/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/bitsoup/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/bitsoup/__init__.py
diff --git a/couchpotato/core/providers/torrent/bitsoup/main.py b/couchpotato/core/media/_base/providers/torrent/bitsoup/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/bitsoup/main.py
rename to couchpotato/core/media/_base/providers/torrent/bitsoup/main.py
diff --git a/couchpotato/core/providers/torrent/hdbits/__init__.py b/couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py
similarity index 96%
rename from couchpotato/core/providers/torrent/hdbits/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py
index 1e9aa3ce..b54adb0b 100644
--- a/couchpotato/core/providers/torrent/hdbits/__init__.py
+++ b/couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py
@@ -1,54 +1,54 @@
-from .main import HDBits
-
-
-def start():
- return HDBits()
-
-config = [{
- 'name': 'hdbits',
- 'groups': [
- {
- 'tab': 'searcher',
- 'list': 'torrent_providers',
- 'name': 'HDBits',
- 'description': 'See HDBits',
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'passkey',
- 'default': '',
- },
- {
- 'name': 'seed_ratio',
- 'label': 'Seed ratio',
- 'type': 'float',
- 'default': 1,
- 'description': 'Will not be (re)moved until this seed ratio is met.',
- },
- {
- 'name': 'seed_time',
- 'label': 'Seed time',
- 'type': 'int',
- 'default': 40,
- 'description': 'Will not be (re)moved until this seed time (in hours) is met.',
- },
- {
- 'name': 'extra_score',
- 'advanced': True,
- 'label': 'Extra Score',
- 'type': 'int',
- 'default': 0,
- 'description': 'Starting score for each release found via this provider.',
- },
- ],
- },
- ],
-}]
+from .main import HDBits
+
+
+def start():
+ return HDBits()
+
+config = [{
+ 'name': 'hdbits',
+ 'groups': [
+ {
+ 'tab': 'searcher',
+ 'list': 'torrent_providers',
+ 'name': 'HDBits',
+ 'description': 'See HDBits',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'type': 'enabler',
+ 'default': False,
+ },
+ {
+ 'name': 'username',
+ 'default': '',
+ },
+ {
+ 'name': 'passkey',
+ 'default': '',
+ },
+ {
+ 'name': 'seed_ratio',
+ 'label': 'Seed ratio',
+ 'type': 'float',
+ 'default': 1,
+ 'description': 'Will not be (re)moved until this seed ratio is met.',
+ },
+ {
+ 'name': 'seed_time',
+ 'label': 'Seed time',
+ 'type': 'int',
+ 'default': 40,
+ 'description': 'Will not be (re)moved until this seed time (in hours) is met.',
+ },
+ {
+ 'name': 'extra_score',
+ 'advanced': True,
+ 'label': 'Extra Score',
+ 'type': 'int',
+ 'default': 0,
+ 'description': 'Starting score for each release found via this provider.',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/providers/torrent/hdbits/main.py b/couchpotato/core/media/_base/providers/torrent/hdbits/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/hdbits/main.py
rename to couchpotato/core/media/_base/providers/torrent/hdbits/main.py
diff --git a/couchpotato/core/providers/torrent/ilovetorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/ilovetorrents/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/ilovetorrents/__init__.py
diff --git a/couchpotato/core/providers/torrent/ilovetorrents/main.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/ilovetorrents/main.py
rename to couchpotato/core/media/_base/providers/torrent/ilovetorrents/main.py
diff --git a/couchpotato/core/providers/torrent/iptorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/iptorrents/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/iptorrents/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/iptorrents/__init__.py
diff --git a/couchpotato/core/providers/torrent/iptorrents/main.py b/couchpotato/core/media/_base/providers/torrent/iptorrents/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/iptorrents/main.py
rename to couchpotato/core/media/_base/providers/torrent/iptorrents/main.py
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/kickasstorrents/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/kickasstorrents/__init__.py
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/main.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/kickasstorrents/main.py
rename to couchpotato/core/media/_base/providers/torrent/kickasstorrents/main.py
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/media/_base/providers/torrent/passthepopcorn/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/passthepopcorn/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/passthepopcorn/__init__.py
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/media/_base/providers/torrent/passthepopcorn/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/passthepopcorn/main.py
rename to couchpotato/core/media/_base/providers/torrent/passthepopcorn/main.py
diff --git a/couchpotato/core/providers/torrent/publichd/__init__.py b/couchpotato/core/media/_base/providers/torrent/publichd/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/publichd/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/publichd/__init__.py
diff --git a/couchpotato/core/providers/torrent/publichd/main.py b/couchpotato/core/media/_base/providers/torrent/publichd/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/publichd/main.py
rename to couchpotato/core/media/_base/providers/torrent/publichd/main.py
diff --git a/couchpotato/core/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/sceneaccess/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/sceneaccess/__init__.py
diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/sceneaccess/main.py
rename to couchpotato/core/media/_base/providers/torrent/sceneaccess/main.py
diff --git a/couchpotato/core/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/thepiratebay/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/thepiratebay/__init__.py
diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/thepiratebay/main.py
rename to couchpotato/core/media/_base/providers/torrent/thepiratebay/main.py
diff --git a/couchpotato/core/providers/torrent/torrentbytes/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentbytes/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentbytes/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/torrentbytes/__init__.py
diff --git a/couchpotato/core/providers/torrent/torrentbytes/main.py b/couchpotato/core/media/_base/providers/torrent/torrentbytes/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentbytes/main.py
rename to couchpotato/core/media/_base/providers/torrent/torrentbytes/main.py
diff --git a/couchpotato/core/providers/torrent/torrentday/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentday/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentday/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/torrentday/__init__.py
diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/media/_base/providers/torrent/torrentday/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentday/main.py
rename to couchpotato/core/media/_base/providers/torrent/torrentday/main.py
diff --git a/couchpotato/core/providers/torrent/torrentleech/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentleech/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentleech/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/torrentleech/__init__.py
diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/media/_base/providers/torrent/torrentleech/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentleech/main.py
rename to couchpotato/core/media/_base/providers/torrent/torrentleech/main.py
diff --git a/couchpotato/core/providers/torrent/torrentpotato/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentpotato/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/torrentpotato/__init__.py
diff --git a/couchpotato/core/providers/torrent/torrentpotato/main.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentpotato/main.py
rename to couchpotato/core/media/_base/providers/torrent/torrentpotato/main.py
diff --git a/couchpotato/core/providers/torrent/torrentshack/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentshack/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentshack/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/torrentshack/__init__.py
diff --git a/couchpotato/core/providers/torrent/torrentshack/main.py b/couchpotato/core/media/_base/providers/torrent/torrentshack/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/torrentshack/main.py
rename to couchpotato/core/media/_base/providers/torrent/torrentshack/main.py
diff --git a/couchpotato/core/providers/torrent/yify/__init__.py b/couchpotato/core/media/_base/providers/torrent/yify/__init__.py
similarity index 100%
rename from couchpotato/core/providers/torrent/yify/__init__.py
rename to couchpotato/core/media/_base/providers/torrent/yify/__init__.py
diff --git a/couchpotato/core/providers/torrent/yify/main.py b/couchpotato/core/media/_base/providers/torrent/yify/main.py
similarity index 100%
rename from couchpotato/core/providers/torrent/yify/main.py
rename to couchpotato/core/media/_base/providers/torrent/yify/main.py
diff --git a/couchpotato/core/providers/trailer/__init__.py b/couchpotato/core/media/_base/providers/trailer/__init__.py
similarity index 100%
rename from couchpotato/core/providers/trailer/__init__.py
rename to couchpotato/core/media/_base/providers/trailer/__init__.py
diff --git a/couchpotato/core/providers/trailer/base.py b/couchpotato/core/media/_base/providers/trailer/base.py
similarity index 100%
rename from couchpotato/core/providers/trailer/base.py
rename to couchpotato/core/media/_base/providers/trailer/base.py
diff --git a/couchpotato/core/providers/trailer/hdtrailers/__init__.py b/couchpotato/core/media/_base/providers/trailer/hdtrailers/__init__.py
similarity index 100%
rename from couchpotato/core/providers/trailer/hdtrailers/__init__.py
rename to couchpotato/core/media/_base/providers/trailer/hdtrailers/__init__.py
diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/media/_base/providers/trailer/hdtrailers/main.py
similarity index 100%
rename from couchpotato/core/providers/trailer/hdtrailers/main.py
rename to couchpotato/core/media/_base/providers/trailer/hdtrailers/main.py
diff --git a/couchpotato/core/providers/userscript/__init__.py b/couchpotato/core/media/_base/providers/userscript/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/__init__.py
diff --git a/couchpotato/core/providers/userscript/allocine/__init__.py b/couchpotato/core/media/_base/providers/userscript/allocine/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/allocine/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/allocine/__init__.py
diff --git a/couchpotato/core/providers/userscript/allocine/main.py b/couchpotato/core/media/_base/providers/userscript/allocine/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/allocine/main.py
rename to couchpotato/core/media/_base/providers/userscript/allocine/main.py
diff --git a/couchpotato/core/providers/userscript/appletrailers/__init__.py b/couchpotato/core/media/_base/providers/userscript/appletrailers/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/appletrailers/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/appletrailers/__init__.py
diff --git a/couchpotato/core/providers/userscript/appletrailers/main.py b/couchpotato/core/media/_base/providers/userscript/appletrailers/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/appletrailers/main.py
rename to couchpotato/core/media/_base/providers/userscript/appletrailers/main.py
diff --git a/couchpotato/core/providers/userscript/base.py b/couchpotato/core/media/_base/providers/userscript/base.py
similarity index 100%
rename from couchpotato/core/providers/userscript/base.py
rename to couchpotato/core/media/_base/providers/userscript/base.py
diff --git a/couchpotato/core/providers/userscript/criticker/__init__.py b/couchpotato/core/media/_base/providers/userscript/criticker/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/criticker/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/criticker/__init__.py
diff --git a/couchpotato/core/providers/userscript/criticker/main.py b/couchpotato/core/media/_base/providers/userscript/criticker/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/criticker/main.py
rename to couchpotato/core/media/_base/providers/userscript/criticker/main.py
diff --git a/couchpotato/core/providers/userscript/filmweb/__init__.py b/couchpotato/core/media/_base/providers/userscript/filmweb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/filmweb/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/filmweb/__init__.py
diff --git a/couchpotato/core/providers/userscript/filmweb/main.py b/couchpotato/core/media/_base/providers/userscript/filmweb/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/filmweb/main.py
rename to couchpotato/core/media/_base/providers/userscript/filmweb/main.py
diff --git a/couchpotato/core/providers/userscript/flickchart/__init__.py b/couchpotato/core/media/_base/providers/userscript/flickchart/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/flickchart/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/flickchart/__init__.py
diff --git a/couchpotato/core/providers/userscript/flickchart/main.py b/couchpotato/core/media/_base/providers/userscript/flickchart/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/flickchart/main.py
rename to couchpotato/core/media/_base/providers/userscript/flickchart/main.py
diff --git a/couchpotato/core/providers/userscript/imdb/__init__.py b/couchpotato/core/media/_base/providers/userscript/imdb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/imdb/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/imdb/__init__.py
diff --git a/couchpotato/core/providers/userscript/imdb/main.py b/couchpotato/core/media/_base/providers/userscript/imdb/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/imdb/main.py
rename to couchpotato/core/media/_base/providers/userscript/imdb/main.py
diff --git a/couchpotato/core/providers/userscript/letterboxd/__init__.py b/couchpotato/core/media/_base/providers/userscript/letterboxd/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/letterboxd/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/letterboxd/__init__.py
diff --git a/couchpotato/core/providers/userscript/letterboxd/main.py b/couchpotato/core/media/_base/providers/userscript/letterboxd/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/letterboxd/main.py
rename to couchpotato/core/media/_base/providers/userscript/letterboxd/main.py
diff --git a/couchpotato/core/providers/userscript/moviemeter/__init__.py b/couchpotato/core/media/_base/providers/userscript/moviemeter/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/moviemeter/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/moviemeter/__init__.py
diff --git a/couchpotato/core/providers/userscript/moviemeter/main.py b/couchpotato/core/media/_base/providers/userscript/moviemeter/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/moviemeter/main.py
rename to couchpotato/core/media/_base/providers/userscript/moviemeter/main.py
diff --git a/couchpotato/core/providers/userscript/moviesio/__init__.py b/couchpotato/core/media/_base/providers/userscript/moviesio/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/moviesio/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/moviesio/__init__.py
diff --git a/couchpotato/core/providers/userscript/moviesio/main.py b/couchpotato/core/media/_base/providers/userscript/moviesio/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/moviesio/main.py
rename to couchpotato/core/media/_base/providers/userscript/moviesio/main.py
diff --git a/couchpotato/core/providers/userscript/reddit/__init__.py b/couchpotato/core/media/_base/providers/userscript/reddit/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/reddit/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/reddit/__init__.py
diff --git a/couchpotato/core/providers/userscript/reddit/main.py b/couchpotato/core/media/_base/providers/userscript/reddit/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/reddit/main.py
rename to couchpotato/core/media/_base/providers/userscript/reddit/main.py
diff --git a/couchpotato/core/providers/userscript/rottentomatoes/__init__.py b/couchpotato/core/media/_base/providers/userscript/rottentomatoes/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/rottentomatoes/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/rottentomatoes/__init__.py
diff --git a/couchpotato/core/providers/userscript/rottentomatoes/main.py b/couchpotato/core/media/_base/providers/userscript/rottentomatoes/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/rottentomatoes/main.py
rename to couchpotato/core/media/_base/providers/userscript/rottentomatoes/main.py
diff --git a/couchpotato/core/providers/userscript/sharethe/__init__.py b/couchpotato/core/media/_base/providers/userscript/sharethe/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/sharethe/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/sharethe/__init__.py
diff --git a/couchpotato/core/providers/userscript/sharethe/main.py b/couchpotato/core/media/_base/providers/userscript/sharethe/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/sharethe/main.py
rename to couchpotato/core/media/_base/providers/userscript/sharethe/main.py
diff --git a/couchpotato/core/providers/userscript/tmdb/__init__.py b/couchpotato/core/media/_base/providers/userscript/tmdb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/tmdb/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/tmdb/__init__.py
diff --git a/couchpotato/core/providers/userscript/tmdb/main.py b/couchpotato/core/media/_base/providers/userscript/tmdb/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/tmdb/main.py
rename to couchpotato/core/media/_base/providers/userscript/tmdb/main.py
diff --git a/couchpotato/core/providers/userscript/trakt/__init__.py b/couchpotato/core/media/_base/providers/userscript/trakt/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/trakt/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/trakt/__init__.py
diff --git a/couchpotato/core/providers/userscript/trakt/main.py b/couchpotato/core/media/_base/providers/userscript/trakt/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/trakt/main.py
rename to couchpotato/core/media/_base/providers/userscript/trakt/main.py
diff --git a/couchpotato/core/providers/userscript/whiwa/__init__.py b/couchpotato/core/media/_base/providers/userscript/whiwa/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/whiwa/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/whiwa/__init__.py
diff --git a/couchpotato/core/providers/userscript/whiwa/main.py b/couchpotato/core/media/_base/providers/userscript/whiwa/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/whiwa/main.py
rename to couchpotato/core/media/_base/providers/userscript/whiwa/main.py
diff --git a/couchpotato/core/providers/userscript/youteather/__init__.py b/couchpotato/core/media/_base/providers/userscript/youteather/__init__.py
similarity index 100%
rename from couchpotato/core/providers/userscript/youteather/__init__.py
rename to couchpotato/core/media/_base/providers/userscript/youteather/__init__.py
diff --git a/couchpotato/core/providers/userscript/youteather/main.py b/couchpotato/core/media/_base/providers/userscript/youteather/main.py
similarity index 100%
rename from couchpotato/core/providers/userscript/youteather/main.py
rename to couchpotato/core/media/_base/providers/userscript/youteather/main.py