76 files changed, 190 insertions, 191 deletions
diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareCom.py
index c70a849b6..2960243fc 100644
--- a/module/plugins/crypter/BitshareComFolder.py
+++ b/module/plugins/crypter/BitshareCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class BitshareComFolder(SimpleCrypter):
-    __name__    = "BitshareComFolder"
+class BitshareCom(SimpleCrypter):
+    __name__    = "BitshareCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py
index 926633ff7..eaccb471f 100644
--- a/module/plugins/crypter/C1NeonCom.py
+++ b/module/plugins/crypter/C1NeonCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class C1NeonCom(DeadCrypter):
diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py
index 2fc36c355..2f47236e8 100644
--- a/module/plugins/crypter/ChipDe.py
+++ b/module/plugins/crypter/ChipDe.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class ChipDe(Crypter):
diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoCom.py
index 57bb339ff..9fad661d2 100644
--- a/module/plugins/crypter/CrockoComFolder.py
+++ b/module/plugins/crypter/CrockoCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class CrockoComFolder(SimpleCrypter):
-    __name__    = "CrockoComFolder"
+class CrockoCom(SimpleCrypter):
+    __name__    = "CrockoCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py
index 2cf4e9f62..cb3347f55 100644
--- a/module/plugins/crypter/CryptItCom.py
+++ b/module/plugins/crypter/CryptItCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class CryptItCom(DeadCrypter):
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareCom.py
index 5623a4093..e527d683f 100644
--- a/module/plugins/crypter/CzshareComFolder.py
+++ b/module/plugins/crypter/CzshareCom.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
-class CzshareComFolder(Crypter):
-    __name__    = "CzshareComFolder"
+class CzshareCom(Crypter):
+    __name__    = "CzshareCom"
     __type__    = "crypter"
     __version__ = "0.20"
 
diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index 55181e9ad..2b6738799 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -4,7 +4,7 @@ import re
 
 from time import sleep
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class DDLMusicOrg(Crypter):
diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py
index 82b80ab2f..c66c7c829 100644
--- a/module/plugins/crypter/DailymotionBatch.py
+++ b/module/plugins/crypter/DailymotionBatch.py
@@ -4,9 +4,9 @@ import re
 
 from urlparse import urljoin
 
-from module.common.json_layer import json_loads
-from module.plugins.Crypter import Crypter
-from module.utils import save_join
+from pyload.utils import json_loads
+from pyload.plugin.Crypter import Crypter
+from pyload.utils import safe_join
 
 
 class DailymotionBatch(Crypter):
@@ -101,6 +101,6 @@ class DailymotionBatch(Crypter):
 
         for p_id, p_name, p_owner in playlists:
             p_videos = self.getVideos(p_id)
-            p_folder = save_join(self.config['general']['download_folder'], p_owner, p_name)
+            p_folder = safe_join(self.config['general']['download_folder'], p_owner, p_name)
             self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name))
             self.packages.append((p_name, p_videos, p_folder))  #: folder is NOT recognized by pyload 0.4.9!
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHu.py
index a5602d6c6..e8b3acbb7 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHu.py
@@ -2,11 +2,11 @@
 
 import re
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class DataHuFolder(SimpleCrypter):
-    __name__    = "DataHuFolder"
+class DataHu(SimpleCrypter):
+    __name__    = "DataHu"
     __type__    = "crypter"
     __version__ = "0.06"
 
@@ -16,7 +16,7 @@ class DataHuFolder(SimpleCrypter):
 
     __description__ = """Data.hu folder decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("crash", None),
+    __authors__     = [("crash", ""),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
@@ -25,7 +25,7 @@ class DataHuFolder(SimpleCrypter):
 
 
     def prepare(self):
-        super(DataHuFolder, self).prepare()
+        super(DataHu, self).prepare()
 
         if u'K\xe9rlek add meg a jelsz\xf3t' in self.html:  # Password protected
             password = self.getPassword()
diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageCom.py
index e02e77fda..1d87e975b 100644
--- a/module/plugins/crypter/DdlstorageComFolder.py
+++ b/module/plugins/crypter/DdlstorageCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class DdlstorageComFolder(DeadCrypter):
-    __name__    = "DdlstorageComFolder"
+class DdlstorageCom(DeadCrypter):
+    __name__    = "DdlstorageCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
@@ -17,4 +17,4 @@ class DdlstorageComFolder(DeadCrypter):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-getInfo = create_getInfo(DdlstorageComFolder)
+getInfo = create_getInfo(DdlstorageCom)
diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesCom.py
index 147f093c3..ba578a4ed 100644
--- a/module/plugins/crypter/DepositfilesComFolder.py
+++ b/module/plugins/crypter/DepositfilesCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class DepositfilesComFolder(SimpleCrypter):
-    __name__    = "DepositfilesComFolder"
+class DepositfilesCom(SimpleCrypter):
+    __name__    = "DepositfilesCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 0729c8cb6..d52bb1094 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleDereferer import SimpleDereferer
+from module.plugins.Crypter import Crypter
 
 
 class Dereferer(SimpleDereferer):
diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py
index 8779cae5e..2fbc90ba8 100644
--- a/module/plugins/crypter/DevhostStFolder.py
+++ b/module/plugins/crypter/DevhostStFolder.py
@@ -7,7 +7,7 @@ import re
 
 from urlparse import urljoin
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
 class DevhostStFolder(SimpleCrypter):
diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py
index 4a188aa83..1cfe7639a 100644
--- a/module/plugins/crypter/DlProtectCom.py
+++ b/module/plugins/crypter/DlProtectCom.py
@@ -5,7 +5,7 @@ import re
 from base64 import urlsafe_b64encode
 from time import time
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
 class DlProtectCom(SimpleCrypter):
diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py
index d656cde4c..7a4b85b2d 100644
--- a/module/plugins/crypter/DontKnowMe.py
+++ b/module/plugins/crypter/DontKnowMe.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleDereferer import SimpleDereferer
+from module.plugins.Crypter import Crypter
 
 
 class DontKnowMe(SimpleDereferer):
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index 07cc5cdc4..55681fd5e 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -4,7 +4,7 @@ import re
 
 from BeautifulSoup import BeautifulSoup
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class DuckCryptInfo(Crypter):
diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrg.py
index 066fbe3d7..70745b550 100644
--- a/module/plugins/crypter/DuploadOrgFolder.py
+++ b/module/plugins/crypter/DuploadOrg.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class DuploadOrgFolder(DeadCrypter):
-    __name__    = "DuploadOrgFolder"
+class DuploadOrg(DeadCrypter):
+    __name__    = "DuploadOrg"
     __type__    = "crypter"
     __version__ = "0.02"
 
@@ -16,4 +16,4 @@ class DuploadOrgFolder(DeadCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-getInfo = create_getInfo(DuploadOrgFolder)
+getInfo = create_getInfo(DuploadOrg)
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezCom.py
index 6c643e83f..d9685e2f1 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
+from module.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class EasybytezComFolder(XFSCrypter):
-    __name__    = "EasybytezComFolder"
+class EasybytezCom(XFSCrypter):
+    __name__    = "EasybytezCom"
     __type__    = "crypter"
     __version__ = "0.10"
 
diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 456e48a32..c94e7e106 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
-from module.network.HTTPRequest import BadHeader
+from pyload.plugin.Crypter import Crypter
+from pyload.network.HTTPRequest import BadHeader
 
 
 class EmbeduploadCom(Crypter):
@@ -12,9 +12,9 @@ class EmbeduploadCom(Crypter):
 
     __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+'
     __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
-                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
-                  ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"),
-                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
+                ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
+                ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"),
+                ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
 
     __description__ = """EmbedUpload.com decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfo.py
index a3c7ee74c..4e8ab1259 100644
--- a/module/plugins/crypter/FilebeerInfoFolder.py
+++ b/module/plugins/crypter/FilebeerInfo.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class FilebeerInfoFolder(DeadCrypter):
-    __name__    = "FilebeerInfoFolder"
+class FilebeerInfo(DeadCrypter):
+    __name__    = "FilebeerInfo"
     __type__    = "crypter"
     __version__ = "0.02"
 
@@ -16,4 +16,4 @@ class FilebeerInfoFolder(DeadCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-getInfo = create_getInfo(FilebeerInfoFolder)
+getInfo = create_getInfo(FilebeerInfo)
diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIo.py
index 83cce352d..d0ca619de 100644
--- a/module/plugins/crypter/FilecloudIoFolder.py
+++ b/module/plugins/crypter/FilecloudIo.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilecloudIoFolder(SimpleCrypter):
-    __name__    = "FilecloudIoFolder"
+class FilecloudIo(SimpleCrypter):
+    __name__    = "FilecloudIo"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index d15d2ae4b..938ceafa9 100644
--- a/module/plugins/crypter/FilecryptCc.py
+++ b/module/plugins/crypter/FilecryptCc.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-# http://filecrypt.cc/Container/64E039F859.html
+#
+# Test links:
+#   http://filecrypt.cc/Container/64E039F859.html
 
 import binascii
 import re
@@ -7,7 +9,7 @@ import re
 from Crypto.Cipher import AES
 from urlparse import urljoin
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 from module.plugins.internal.CaptchaService import ReCaptcha
 
 
@@ -20,7 +22,7 @@ class FilecryptCc(Crypter):
 
     __description__ = """Filecrypt.cc decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "")]
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     # URL_REPLACEMENTS  = [(r'.html$', ""), (r'$', ".html")]  #@TODO: Extend SimpleCrypter
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryCom.py
index 261c7e01a..c6bdb81eb 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilefactoryComFolder(SimpleCrypter):
-    __name__    = "FilefactoryComFolder"
+class FilefactoryCom(SimpleCrypter):
+    __name__    = "FilefactoryCom"
     __type__    = "crypter"
     __version__ = "0.32"
 
diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNet.py
index d33e26ee8..054c8d3a7 100644
--- a/module/plugins/crypter/FilerNetFolder.py
+++ b/module/plugins/crypter/FilerNet.py
@@ -1,10 +1,10 @@
 import re
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class FilerNetFolder(SimpleCrypter):
-    __name__    = "FilerNetFolder"
+class FilerNet(SimpleCrypter):
+    __name__    = "FilerNet"
     __type__    = "crypter"
     __version__ = "0.42"
 
diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveCom.py
index e6b35fd36..ab0665fbd 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveCom.py
@@ -2,11 +2,11 @@
 
 import re
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
-class FileserveComFolder(Crypter):
-    __name__    = "FileserveComFolder"
+class FileserveCom(Crypter):
+    __name__    = "FileserveCom"
     __type__    = "crypter"
     __version__ = "0.11"
 
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicCom.py
index d58516986..b1722c1bb 100644
--- a/module/plugins/crypter/FilesonicComFolder.py
+++ b/module/plugins/crypter/FilesonicCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class FilesonicComFolder(DeadCrypter):
-    __name__    = "FilesonicComFolder"
+class FilesonicCom(DeadCrypter):
+    __name__    = "FilesonicCom"
     __type__    = "crypter"
     __version__ = "0.12"
 
@@ -15,4 +15,4 @@ class FilesonicComFolder(DeadCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-getInfo = create_getInfo(FilesonicComFolder)
+getInfo = create_getInfo(FilesonicCom)
diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py
index 16ebdda37..befe6f9a7 100644
--- a/module/plugins/crypter/FilestubeCom.py
+++ b/module/plugins/crypter/FilestubeCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilestubeCom(SimpleCrypter):
diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py
index 76530c589..6c3c071ec 100644
--- a/module/plugins/crypter/FiletramCom.py
+++ b/module/plugins/crypter/FiletramCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
 class FiletramCom(SimpleCrypter):
diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveCom.py
index 7d3a357fd..bf315ad16 100644
--- a/module/plugins/crypter/FiredriveComFolder.py
+++ b/module/plugins/crypter/FiredriveCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class FiredriveComFolder(DeadCrypter):
-    __name__    = "FiredriveComFolder"
+class FiredriveCom(DeadCrypter):
+    __name__    = "FiredriveCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
@@ -16,4 +16,4 @@ class FiredriveComFolder(DeadCrypter):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-getInfo = create_getInfo(FiredriveComFolder)
+getInfo = create_getInfo(FiredriveCom)
diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
index c3fe3db4b..62fb9d3fe 100644
--- a/module/plugins/crypter/FourChanOrg.py
+++ b/module/plugins/crypter/FourChanOrg.py
@@ -4,7 +4,7 @@
 
 import re
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class FourChanOrg(Crypter):
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareCom.py
index 7c1b7de2b..c5fd2ee29 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareCom.py
@@ -2,11 +2,11 @@
 
 import re
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
-class FreakhareComFolder(SimpleCrypter):
-    __name__    = "FreakhareComFolder"
+class FreakhareCom(SimpleCrypter):
+    __name__    = "FreakhareCom"
     __type__    = "crypter"
     __version__ = "0.03"
 
diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py
index c33c9ff64..4634455b6 100644
--- a/module/plugins/crypter/FreetexthostCom.py
+++ b/module/plugins/crypter/FreetexthostCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FreetexthostCom(SimpleCrypter):
diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVn.py
index 474364e40..e85085cf1 100644
--- a/module/plugins/crypter/FshareVnFolder.py
+++ b/module/plugins/crypter/FshareVn.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
-class FshareVnFolder(SimpleCrypter):
-    __name__    = "FshareVnFolder"
+class FshareVn(SimpleCrypter):
+    __name__    = "FshareVn"
     __type__    = "crypter"
     __version__ = "0.01"
 
diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py
index a7e16c0ab..ffd945737 100644
--- a/module/plugins/crypter/Go4UpCom.py
+++ b/module/plugins/crypter/Go4UpCom.py
@@ -4,7 +4,7 @@ import re
 
 from urlparse import urljoin
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+from pyload.plugin.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class Go4UpCom(SimpleCrypter):
diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py
index d548a3375..13ffce505 100644
--- a/module/plugins/crypter/GooGl.py
+++ b/module/plugins/crypter/GooGl.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Crypter import Crypter
-from module.common.json_layer import json_loads
+from pyload.plugin.Crypter import Crypter
+from pyload.utils import json_loads
 
 
 class GooGl(Crypter):
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
index a347e4232..a12d7c02a 100644
--- a/module/plugins/crypter/HoerbuchIn.py
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -4,7 +4,7 @@ import re
 
 from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class HoerbuchIn(Crypter):
diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileCom.py
index 4f40587ad..72eec8f93 100644
--- a/module/plugins/crypter/HotfileComFolder.py
+++ b/module/plugins/crypter/HotfileCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class HotfileComFolder(DeadCrypter):
-    __name__    = "HotfileComFolder"
+class HotfileCom(DeadCrypter):
+    __name__    = "HotfileCom"
     __type__    = "crypter"
     __version__ = "0.30"
 
@@ -16,4 +16,4 @@ class HotfileComFolder(DeadCrypter):
     __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
-getInfo = create_getInfo(HotfileComFolder)
+getInfo = create_getInfo(HotfileCom)
diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py
index f3415706d..d3e50630c 100644
--- a/module/plugins/crypter/ILoadTo.py
+++ b/module/plugins/crypter/ILoadTo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class ILoadTo(DeadCrypter):
@@ -13,7 +13,7 @@ class ILoadTo(DeadCrypter):
 
     __description__ = """Iload.to decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("hzpz", None)]
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(ILoadTo)
diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNet.py
index 56ecbc7f8..24bc196b3 100644
--- a/module/plugins/crypter/LetitbitNetFolder.py
+++ b/module/plugins/crypter/LetitbitNet.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
-class LetitbitNetFolder(Crypter):
-    __name__    = "LetitbitNetFolder"
+class LetitbitNet(Crypter):
+    __name__    = "LetitbitNet"
     __type__    = "crypter"
     __version__ = "0.10"
 
diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py
index 018ed90ba..a3eb4f179 100644
--- a/module/plugins/crypter/LinkCryptWs.py
+++ b/module/plugins/crypter/LinkCryptWs.py
@@ -7,8 +7,8 @@ import pycurl
 
 from Crypto.Cipher import AES
 
-from module.plugins.Crypter import Crypter
-from module.utils import html_unescape
+from pyload.plugin.Crypter import Crypter
+from pyload.utils import html_unescape
 
 
 class LinkCryptWs(Crypter):
@@ -21,8 +21,8 @@ class LinkCryptWs(Crypter):
     __description__ = """LinkCrypt.ws decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),
-                       ("glukgluk", None),
-                       ("Gummibaer", None)]
+                       ("glukgluk", ""),
+                       ("Gummibaer", "")]
 
 
     CRYPTED_KEY = "crypted"
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index 7f24784c7..facec37d5 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class LinkdecrypterCom(Crypter):
@@ -16,7 +16,7 @@ class LinkdecrypterCom(Crypter):
     __description__ = """Linkdecrypter.com decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("flowlee", None)]
+                       ("flowlee", "")]
 
 
     TEXTAREA_PATTERN = r'<textarea name="links" wrap="off" readonly="1" class="caja_des">(.+)</textarea>'
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index d899d58c7..4b978723f 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class LixIn(Crypter):
diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py
index 3cac0fbf2..e18349877 100644
--- a/module/plugins/crypter/LofCc.py
+++ b/module/plugins/crypter/LofCc.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class LofCc(DeadCrypter):
diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py
index 82c2d9719..7f1561756 100644
--- a/module/plugins/crypter/MBLinkInfo.py
+++ b/module/plugins/crypter/MBLinkInfo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MBLinkInfo(DeadCrypter):
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireCom.py
index d1dc89518..a7360a6db 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireCom.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
-from module.plugins.hoster.MediafireCom import checkHTMLHeader
-from module.common.json_layer import json_loads
+from pyload.plugin.Crypter import Crypter
+from pyload.plugin.hoster.MediafireCom import checkHTMLHeader
+from pyload.utils import json_loads
 
 
-class MediafireComFolder(Crypter):
-    __name__    = "MediafireComFolder"
+class MediafireCom(Crypter):
+    __name__    = "MediafireCom"
     __type__    = "crypter"
     __version__ = "0.14"
 
diff --git a/module/plugins/crypter/MegaRapidCzFolder.py b/module/plugins/crypter/MegaRapidCz.py
index e7dff6c8a..86235444b 100644
--- a/module/plugins/crypter/MegaRapidCzFolder.py
+++ b/module/plugins/crypter/MegaRapidCz.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
-class MegaRapidCzFolder(SimpleCrypter):
-    __name__    = "MegaRapidCzFolder"
+class MegaRapidCz(SimpleCrypter):
+    __name__    = "MegaRapidCz"
     __type__    = "crypter"
     __version__ = "0.02"
 
diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadCom.py
index 08f96700d..6981cebc8 100644
--- a/module/plugins/crypter/MegauploadComFolder.py
+++ b/module/plugins/crypter/MegauploadCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class MegauploadComFolder(DeadCrypter):
-    __name__    = "MegauploadComFolder"
+class MegauploadCom(DeadCrypter):
+    __name__    = "MegauploadCom"
     __type__    = "crypter"
     __version__ = "0.02"
 
@@ -15,4 +15,4 @@ class MegauploadComFolder(DeadCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-getInfo = create_getInfo(MegauploadComFolder)
+getInfo = create_getInfo(MegauploadCom)
diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py
index 76bf702ac..92bc128c7 100644
--- a/module/plugins/crypter/Movie2KTo.py
+++ b/module/plugins/crypter/Movie2KTo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class Movie2KTo(DeadCrypter):
diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index 5209ebf09..7955fca6c 100644
--- a/module/plugins/crypter/MultiUpOrg.py
+++ b/module/plugins/crypter/MultiUpOrg.py
@@ -15,7 +15,7 @@ class MultiUpOrg(SimpleCrypter):
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """MultiUp.org crypter plugin"""
+    __description__ = """MultiUp.org decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 55f424f36..856a94a25 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class MultiloadCz(Crypter):
@@ -11,9 +11,9 @@ class MultiloadCz(Crypter):
 
     __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+'
     __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
-                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
-                  ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),
-                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
+                ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
+                ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),
+                ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
 
     __description__ = """Multiload.cz decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py
index 347b7e5af..98708bd95 100644
--- a/module/plugins/crypter/MultiuploadCom.py
+++ b/module/plugins/crypter/MultiuploadCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MultiuploadCom(DeadCrypter):
@@ -9,9 +9,8 @@ class MultiuploadCom(DeadCrypter):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
-    __config__  = []
 
-    __description__ = """ MultiUpload.com decrypter plugin """
+    __description__ = """MultiUpload.com decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 20e7c72e2..29b45b11a 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -5,8 +5,8 @@ import re
 
 from Crypto.Cipher import AES
 
-from module.plugins.Crypter import Crypter
-from module.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugin.Crypter import Crypter
+from pyload.plugin.internal.captcha import ReCaptcha
 
 
 class NCryptIn(Crypter):
diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py
index 3e75d97b5..323214df8 100644
--- a/module/plugins/crypter/OneKhDe.py
+++ b/module/plugins/crypter/OneKhDe.py
@@ -2,9 +2,9 @@
 
 import re
 
-from module.unescape import unescape
+from pyload.utils import html_unescape
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class OneKhDe(Crypter):
@@ -37,6 +37,5 @@ class OneKhDe(Crypter):
         self.html = self.load(url)
         link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html)
         for id in link_ids:
-            new_link = unescape(
-                re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.load("http://1kh.de/l/" + id)).group(1))
+            new_link = html_unescape(re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.load("http://1kh.de/l/" + id)).group(1))
             self.urls.append(new_link)
diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronCom.py
index 9e06bdf32..42483c497 100644
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class OronComFolder(DeadCrypter):
-    __name__    = "OronComFolder"
+class OronCom(DeadCrypter):
+    __name__    = "OronCom"
     __type__    = "crypter"
     __version__ = "0.11"
 
@@ -16,4 +16,4 @@ class OronComFolder(DeadCrypter):
     __authors__     = [("DHMH", "webmaster@pcProfil.de")]
 
 
-getInfo = create_getInfo(OronComFolder)
+getInfo = create_getInfo(OronCom)
diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCz.py
index 70666b55a..8cd4b9c02 100644
--- a/module/plugins/crypter/QuickshareCzFolder.py
+++ b/module/plugins/crypter/QuickshareCz.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
-class QuickshareCzFolder(Crypter):
-    __name__    = "QuickshareCzFolder"
+class QuickshareCz(Crypter):
+    __name__    = "QuickshareCz"
     __type__    = "crypter"
     __version__ = "0.10"
 
diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py
index cc3b23bbc..ebd3c509c 100644
--- a/module/plugins/crypter/RSLayerCom.py
+++ b/module/plugins/crypter/RSLayerCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class RSLayerCom(DeadCrypter):
@@ -13,7 +13,7 @@ class RSLayerCom(DeadCrypter):
 
     __description__ = """RS-Layer.com decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("hzpz", None)]
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(RSLayerCom)
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index c50481af0..b361f87d8 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -7,8 +7,8 @@ import re
 import os
 
 from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.utils import save_join
+from pyload.plugin.Crypter import Crypter
+from module.utils import safe_join
 
 
 class RelinkUs(Crypter):
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index 8e46e1e41..2d5d273ed 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -2,13 +2,11 @@
 
 import re
 
-from pycurl import FOLLOWLOCATION
-
 from BeautifulSoup import BeautifulSoup
 
-from module.common.json_layer import json_loads
-from module.plugins.Crypter import Crypter
-from module.plugins.internal.CaptchaService import SolveMedia
+from pyload.utils import json_loads
+from pyload.plugin.Crypter import Crypter
+from pyload.plugin.internal.captcha import SolveMedia
 
 
 class SafelinkingNet(Crypter):
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
index cbfa919ac..9aee9e52e 100644
--- a/module/plugins/crypter/SecuredIn.py
+++ b/module/plugins/crypter/SecuredIn.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SecuredIn(DeadCrypter):
diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py
index 3c952fd6b..10101cd7a 100644
--- a/module/plugins/crypter/SexuriaCom.py
+++ b/module/plugins/crypter/SexuriaCom.py
@@ -2,7 +2,7 @@
 
 import re
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class SexuriaCom(Crypter):
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 00a037b2e..1328e86aa 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -4,7 +4,7 @@ import binascii
 import re
 
 from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class ShareLinksBiz(Crypter):
diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixCom.py
index e16bdf814..be23ada49 100644
--- a/module/plugins/crypter/SharingmatrixComFolder.py
+++ b/module/plugins/crypter/SharingmatrixCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class SharingmatrixComFolder(DeadCrypter):
-    __name__    = "SharingmatrixComFolder"
+class SharingmatrixCom(DeadCrypter):
+    __name__    = "SharingmatrixCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
@@ -15,4 +15,4 @@ class SharingmatrixComFolder(DeadCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-getInfo = create_getInfo(SharingmatrixComFolder)
+getInfo = create_getInfo(SharingmatrixCom)
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrg.py
index ddde7dec2..190ec66eb 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrg.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class SpeedLoadOrgFolder(DeadCrypter):
-    __name__    = "SpeedLoadOrgFolder"
+class SpeedLoadOrg(DeadCrypter):
+    __name__    = "SpeedLoadOrg"
     __type__    = "crypter"
     __version__ = "0.30"
 
@@ -16,4 +16,4 @@ class SpeedLoadOrgFolder(DeadCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-getInfo = create_getInfo(SpeedLoadOrgFolder)
+getInfo = create_getInfo(SpeedLoadOrg)
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
index 5173421f1..8513fb3f8 100644
--- a/module/plugins/crypter/StealthTo.py
+++ b/module/plugins/crypter/StealthTo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class StealthTo(DeadCrypter):
diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py
index 10780dd45..ca14e6df5 100644
--- a/module/plugins/crypter/TrailerzoneInfo.py
+++ b/module/plugins/crypter/TrailerzoneInfo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class TrailerzoneInfo(DeadCrypter):
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNet.py
index c6734c997..67f7c74d4 100644
--- a/module/plugins/crypter/TurbobitNetFolder.py
+++ b/module/plugins/crypter/TurbobitNet.py
@@ -3,11 +3,11 @@
 import re
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
-from module.common.json_layer import json_loads
+from pyload.utils import json_loads
 
 
-class TurbobitNetFolder(SimpleCrypter):
-    __name__    = "TurbobitNetFolder"
+class TurbobitNet(SimpleCrypter):
+    __name__    = "TurbobitNet"
     __type__    = "crypter"
     __version__ = "0.05"
 
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNet.py
index cb8efc9a8..94b6bbb5d 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNet.py
@@ -7,8 +7,8 @@ from urlparse import urljoin
 from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
 
-class TusfilesNetFolder(XFSCrypter):
-    __name__    = "TusfilesNetFolder"
+class TusfilesNet(XFSCrypter):
+    __name__    = "TusfilesNet"
     __type__    = "crypter"
     __version__ = "0.08"
 
diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozTo.py
index a1f3ed5ea..81fbee172 100644
--- a/module/plugins/crypter/UlozToFolder.py
+++ b/module/plugins/crypter/UlozTo.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
-class UlozToFolder(Crypter):
-    __name__    = "UlozToFolder"
+class UlozTo(Crypter):
+    __name__    = "UlozTo"
     __type__    = "crypter"
     __version__ = "0.20"
 
diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableCh.py
index 22f9ca2ed..8e4ff71c0 100644
--- a/module/plugins/crypter/UploadableChFolder.py
+++ b/module/plugins/crypter/UploadableCh.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
-class UploadableChFolder(SimpleCrypter):
-    __name__    = "UploadableChFolder"
+class UploadableCh(SimpleCrypter):
+    __name__    = "UploadableCh"
     __type__    = "crypter"
     __version__ = "0.03"
 
@@ -12,7 +12,7 @@ class UploadableChFolder(SimpleCrypter):
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description__ = """ Uploadable.ch folder decrypter plugin """
+    __description__ = """Uploadable.ch folder decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("guidobelix", "guidobelix@hotmail.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedTo.py
index 0a71add70..f6bc861de 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedTo.py
@@ -7,8 +7,8 @@ from urlparse import urljoin
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
-class UploadedToFolder(SimpleCrypter):
-    __name__    = "UploadedToFolder"
+class UploadedTo(SimpleCrypter):
+    __name__    = "UploadedTo"
     __type__    = "crypter"
     __version__ = "0.42"
 
diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py
index c3c5b8222..7b4270e65 100644
--- a/module/plugins/crypter/WiiReloadedOrg.py
+++ b/module/plugins/crypter/WiiReloadedOrg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class WiiReloadedOrg(DeadCrypter):
@@ -13,7 +13,7 @@ class WiiReloadedOrg(DeadCrypter):
 
     __description__ = """Wii-Reloaded.org decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("hzpz", None)]
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(WiiReloadedOrg)
diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadCom.py
index 873c71fad..0a098a40c 100644
--- a/module/plugins/crypter/WuploadComFolder.py
+++ b/module/plugins/crypter/WuploadCom.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo
+from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
-class WuploadComFolder(DeadCrypter):
-    __name__    = "WuploadComFolder"
+class WuploadCom(DeadCrypter):
+    __name__    = "WuploadCom"
     __type__    = "crypter"
     __version__ = "0.01"
 
@@ -15,4 +15,4 @@ class WuploadComFolder(DeadCrypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-getInfo = create_getInfo(WuploadComFolder)
+getInfo = create_getInfo(WuploadCom)
diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingPro.py
index 1d001772d..a965f0c48 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingPro.py
@@ -5,8 +5,8 @@ import re
 from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
 
-class XFileSharingProFolder(XFSCrypter):
-    __name__    = "XFileSharingProFolder"
+class XFileSharingPro(XFSCrypter):
+    __name__    = "XFileSharingPro"
     __type__    = "crypter"
     __version__ = "0.04"
 
@@ -26,7 +26,7 @@ class XFileSharingProFolder(XFSCrypter):
 
 
     def init(self):
-        super(XFileSharingProFolder, self).init()
+        super(XFileSharingPro, self).init()
 
         self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']
 
diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py
index f2ecbee5a..9d4d27b61 100644
--- a/module/plugins/crypter/XupPl.py
+++ b/module/plugins/crypter/XupPl.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Crypter import Crypter
+from pyload.plugin.Crypter import Crypter
 
 
 class XupPl(Crypter):
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
index 40b4eedd2..5e4269fd2 100644
--- a/module/plugins/crypter/YoutubeBatch.py
+++ b/module/plugins/crypter/YoutubeBatch.py
@@ -4,9 +4,9 @@ import re
 
 from urlparse import urljoin
 
-from module.common.json_layer import json_loads
-from module.plugins.Crypter import Crypter
-from module.utils import save_join
+from pyload.utils import json_loads
+from pyload.plugin.Crypter import Crypter
+from pyload.utils import safe_join
 
 
 class YoutubeBatch(Crypter):
@@ -16,10 +16,10 @@ class YoutubeBatch(Crypter):
 
     __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
     __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
-                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
-                  ("likes", "bool", "Grab user (channel) liked videos", False),
-                  ("favorites", "bool", "Grab user (channel) favorite videos", False),
-                  ("uploads", "bool", "Grab channel unplaylisted videos", True)]
+                ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
+                ("likes", "bool", "Grab user (channel) liked videos", False),
+                ("favorites", "bool", "Grab user (channel) favorite videos", False),
+                ("uploads", "bool", "Grab channel unplaylisted videos", True)]
 
     __description__ = """Youtube.com channel & playlist decrypter plugin"""
     __license__     = "GPLv3"
@@ -132,7 +132,7 @@ class YoutubeBatch(Crypter):
         for p in playlists:
             p_name = p['title']
             p_videos = self.getVideosId(p['id'])
-            p_folder = save_join(self.config['general']['download_folder'], p['channelTitle'], p_name)
+            p_folder = safe_join(self.config['general']['download_folder'], p['channelTitle'], p_name)
             self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name))
 
             if not p_videos:
diff --git a/module/plugins/crypter/__init__.py b/module/plugins/crypter/__init__.py
index e69de29bb..40a96afc6 100644
--- a/module/plugins/crypter/__init__.py
+++ b/module/plugins/crypter/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-