40 files changed, 13 insertions, 6 deletions
diff --git a/module/file_list.py b/module/file_list.py
index 9d7260889..bb04ae898 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -401,8 +401,12 @@ class PyLoadFile():
         self.active = False
         pluginName = self._get_my_plugin()
         if pluginName:
-            self.modul = __import__(pluginName)
-            pluginClass = getattr(self.modul, self.modul.__name__)
+            for dir in ["hoster", "decrypter", "container"]:
+                try:
+                    self.modul = __import__("%s.%s" % (dir, pluginName), globals(), locals(), [pluginName], -1)
+                except:
+                    pass
+            pluginClass = getattr(self.modul, pluginName)
         else:
             self.modul = module.Plugin
             pluginClass = module.Plugin.Plugin
diff --git a/module/plugins/__init__.py b/module/plugins/__init__.py
index 8d1c8b69c..e69de29bb 100644
--- a/module/plugins/__init__.py
+++ b/module/plugins/__init__.py
@@ -1 +0,0 @@
- 
diff --git a/module/plugins/CCF.py b/module/plugins/container/CCF.py
index 88b567904..88b567904 100644
--- a/module/plugins/CCF.py
+++ b/module/plugins/container/CCF.py
diff --git a/module/plugins/DLC.pyc b/module/plugins/container/DLC.pyc
index 235e46e1a..235e46e1a 100644
--- a/module/plugins/DLC.pyc
+++ b/module/plugins/container/DLC.pyc
diff --git a/module/plugins/LinkList.py b/module/plugins/container/LinkList.py
index 92508ce29..92508ce29 100644
--- a/module/plugins/LinkList.py
+++ b/module/plugins/container/LinkList.py
diff --git a/module/plugins/RSDF.py b/module/plugins/container/RSDF.py
index 0b6a63722..0b6a63722 100644
--- a/module/plugins/RSDF.py
+++ b/module/plugins/container/RSDF.py
diff --git a/module/plugins/container/__init__.py b/module/plugins/container/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/container/__init__.py
diff --git a/module/plugins/DDLMusicOrg.py b/module/plugins/decrypter/DDLMusicOrg.py
index c927d261c..c927d261c 100644
--- a/module/plugins/DDLMusicOrg.py
+++ b/module/plugins/decrypter/DDLMusicOrg.py
diff --git a/module/plugins/FourChanOrg.py b/module/plugins/decrypter/FourChanOrg.py
index e3b00c1f7..e3b00c1f7 100644
--- a/module/plugins/FourChanOrg.py
+++ b/module/plugins/decrypter/FourChanOrg.py
diff --git a/module/plugins/HoerbuchIn.py b/module/plugins/decrypter/HoerbuchIn.py
index ae7ae9774..ae7ae9774 100644
--- a/module/plugins/HoerbuchIn.py
+++ b/module/plugins/decrypter/HoerbuchIn.py
diff --git a/module/plugins/LixIn.py b/module/plugins/decrypter/LixIn.py
index d7ef6521d..d7ef6521d 100644
--- a/module/plugins/LixIn.py
+++ b/module/plugins/decrypter/LixIn.py
diff --git a/module/plugins/OneKhDe.py b/module/plugins/decrypter/OneKhDe.py
index 5f24b543a..5f24b543a 100644
--- a/module/plugins/OneKhDe.py
+++ b/module/plugins/decrypter/OneKhDe.py
diff --git a/module/plugins/RSLayerCom.py b/module/plugins/decrypter/RSLayerCom.py
index 20cadbe18..20cadbe18 100644
--- a/module/plugins/RSLayerCom.py
+++ b/module/plugins/decrypter/RSLayerCom.py
diff --git a/module/plugins/RelinkUs.py b/module/plugins/decrypter/RelinkUs.py
index 71b441116..71b441116 100644
--- a/module/plugins/RelinkUs.py
+++ b/module/plugins/decrypter/RelinkUs.py
diff --git a/module/plugins/StealthTo.py b/module/plugins/decrypter/StealthTo.py
index 855aae001..855aae001 100644
--- a/module/plugins/StealthTo.py
+++ b/module/plugins/decrypter/StealthTo.py
diff --git a/module/plugins/YoutubeChannel.py b/module/plugins/decrypter/YoutubeChannel.py
index 27a4ff8a7..27a4ff8a7 100644
--- a/module/plugins/YoutubeChannel.py
+++ b/module/plugins/decrypter/YoutubeChannel.py
diff --git a/module/plugins/decrypter/__init__.py b/module/plugins/decrypter/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/decrypter/__init__.py
diff --git a/module/plugins/BluehostTo.py b/module/plugins/hoster/BluehostTo.py
index eff8ebcd8..eff8ebcd8 100644
--- a/module/plugins/BluehostTo.py
+++ b/module/plugins/hoster/BluehostTo.py
diff --git a/module/plugins/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6c5748096..6c5748096 100644
--- a/module/plugins/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
diff --git a/module/plugins/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index 5b7db301d..5b7db301d 100644
--- a/module/plugins/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
diff --git a/module/plugins/FilesmonsterCom.py b/module/plugins/hoster/FilesmonsterCom.py
index 27c687363..27c687363 100644
--- a/module/plugins/FilesmonsterCom.py
+++ b/module/plugins/hoster/FilesmonsterCom.py
diff --git a/module/plugins/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py
index 0768b5476..0768b5476 100644
--- a/module/plugins/FreakshareNet.py
+++ b/module/plugins/hoster/FreakshareNet.py
diff --git a/module/plugins/GigasizeCom.py b/module/plugins/hoster/GigasizeCom.py
index e22fe8593..e22fe8593 100644
--- a/module/plugins/GigasizeCom.py
+++ b/module/plugins/hoster/GigasizeCom.py
diff --git a/module/plugins/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index a046cb6b1..a046cb6b1 100644
--- a/module/plugins/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
diff --git a/module/plugins/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 3eb21a591..3eb21a591 100644
--- a/module/plugins/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
diff --git a/module/plugins/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
index 5e2eb0b39..5e2eb0b39 100644
--- a/module/plugins/MyvideoDe.py
+++ b/module/plugins/hoster/MyvideoDe.py
diff --git a/module/plugins/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index bc755fb58..bc755fb58 100644
--- a/module/plugins/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
diff --git a/module/plugins/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 973e28470..973e28470 100644
--- a/module/plugins/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
diff --git a/module/plugins/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index b9a9accef..b9a9accef 100644
--- a/module/plugins/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
diff --git a/module/plugins/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
index c0cc9de72..c0cc9de72 100644
--- a/module/plugins/ShragleCom.py
+++ b/module/plugins/hoster/ShragleCom.py
diff --git a/module/plugins/StorageTo.py b/module/plugins/hoster/StorageTo.py
index dbff844ad..dbff844ad 100644
--- a/module/plugins/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
diff --git a/module/plugins/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index bb623b4e6..bb623b4e6 100644
--- a/module/plugins/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
diff --git a/module/plugins/XupIn.py b/module/plugins/hoster/XupIn.py
index d044f2389..d044f2389 100644
--- a/module/plugins/XupIn.py
+++ b/module/plugins/hoster/XupIn.py
diff --git a/module/plugins/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index e501954da..e501954da 100644
--- a/module/plugins/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
diff --git a/module/plugins/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 38a4934df..38a4934df 100644
--- a/module/plugins/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
diff --git a/module/plugins/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index bec7f8c65..bec7f8c65 100644
--- a/module/plugins/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
diff --git a/module/plugins/ZshareNet.py b/module/plugins/hoster/ZshareNet.py
index 08f28a35c..08f28a35c 100644
--- a/module/plugins/ZshareNet.py
+++ b/module/plugins/hoster/ZshareNet.py
diff --git a/module/plugins/hoster/__init__.py b/module/plugins/hoster/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/hoster/__init__.py
diff --git a/module/thread_list.py b/module/thread_list.py
index fc4160a6d..719849585 100644
--- a/module/thread_list.py
+++ b/module/thread_list.py
@@ -188,7 +188,7 @@ class Thread_List(object):
             return False
 
     def reconnect(self):
-        reconn = subprocess.Popen(self.parent.config['general']['reconnect_method'], stdout=subprocess.PIPE)
+        reconn = subprocess.Popen(self.parent.config['general']['reconnect_method'])#, stdout=subprocess.PIPE)
         reconn.wait()
         time.sleep(1)
         ip = ""
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 0ad952e7d..5890c6e9a 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -282,8 +282,12 @@ class Core(object):
         #~ except:
             #~ self.logger.info("Error on updating pyLoad")
 
-    def create_plugin_index(self):
-        for file_handler in glob(self.plugin_folder + sep + '*.py') + glob(self.plugin_folder + sep + 'DLC.pyc'):
+    def create_plugin_index(self):
+        plugins = glob(join(self.plugin_folder, "hoster", "*.py"))
+        plugins += glob(join(self.plugin_folder, "decrypter", "*.py"))
+        plugins += glob(join(self.plugin_folder, "container", "*.py"))
+        plugins += glob(join(self.plugin_folder, "container", "DLC.pyc"))
+        for file_handler in  plugins:
             plugin_pattern = ""
             plugin_file = sub("(\.pyc|\.py)", "", basename(file_handler))
             if plugin_file == "DLC":