Revert plugin directory structure

8 files changed, 16 insertions, 16 deletions

diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py
index 728abf6ed..610cfac64 100644
--- a/pyload/plugins/hook/BypassCaptcha.py
+++ b/pyload/plugins/hook/BypassCaptcha.py
@@ -4,7 +4,7 @@ from pycurl import FORM_FILE, LOW_SPEED_TIME
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
 class BypassCaptchaException(Exception):
@@ -25,7 +25,7 @@ class BypassCaptchaException(Exception):
         return "<BypassCaptchaException %s>" % self.err
 
 
-class BypassCaptcha(Hook):
+class BypassCaptcha(Addon):
     __name__    = "BypassCaptcha"
     __type__    = "hook"
     __version__ = "0.05"
diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index 9f0f80c2d..f3f086adf 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -10,10 +10,10 @@ from time import sleep
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL
 
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
-class Captcha9kw(Hook):
+class Captcha9kw(Addon):
     __name__    = "Captcha9kw"
     __type__    = "hook"
     __version__ = "0.26"
diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index 355081630..333c0be85 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -14,7 +14,7 @@ from time import sleep
 from urllib import urlencode
 
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
 class CaptchaBrotherhoodException(Exception):
@@ -35,7 +35,7 @@ class CaptchaBrotherhoodException(Exception):
         return "<CaptchaBrotherhoodException %s>" % self.err
 
 
-class CaptchaBrotherhood(Hook):
+class CaptchaBrotherhood(Addon):
     __name__    = "CaptchaBrotherhood"
     __type__    = "hook"
     __version__ = "0.06"
diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index c076bdcee..f2ccb383b 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -11,7 +11,7 @@ from time import sleep
 from pyload.utils import json_loads
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getRequest
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
 class DeathByCaptchaException(Exception):
@@ -48,7 +48,7 @@ class DeathByCaptchaException(Exception):
         return "<DeathByCaptchaException %s>" % self.err
 
 
-class DeathByCaptcha(Hook):
+class DeathByCaptcha(Addon):
     __name__    = "DeathByCaptcha"
     __type__    = "hook"
     __version__ = "0.04"
diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py
index c9da38fe9..a9b9bdf2c 100644
--- a/pyload/plugins/hook/ExpertDecoders.py
+++ b/pyload/plugins/hook/ExpertDecoders.py
@@ -8,10 +8,10 @@ from uuid import uuid4
 
 from pyload.network.HTTPRequest import BadHeader
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
-class ExpertDecoders(Hook):
+class ExpertDecoders(Addon):
     __name__    = "ExpertDecoders"
     __type__    = "hook"
     __version__ = "0.02"
diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py
index 5e35a61e4..2432dce7d 100644
--- a/pyload/plugins/hook/ImageTyperz.py
+++ b/pyload/plugins/hook/ImageTyperz.py
@@ -8,7 +8,7 @@ from base64 import b64encode
 from pycurl import FORM_FILE, LOW_SPEED_TIME
 
 from pyload.network.RequestFactory import getURL, getRequest
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
 class ImageTyperzException(Exception):
@@ -29,7 +29,7 @@ class ImageTyperzException(Exception):
         return "<ImageTyperzException %s>" % self.err
 
 
-class ImageTyperz(Hook):
+class ImageTyperz(Addon):
     __name__    = "ImageTyperz"
     __type__    = "hook"
     __version__ = "0.05"
diff --git a/pyload/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py
index e99d79b7f..0e8ec7554 100644
--- a/pyload/plugins/hook/LinkdecrypterCom.py
+++ b/pyload/plugins/hook/LinkdecrypterCom.py
@@ -3,11 +3,11 @@
 import re
 
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 from pyload.utils import remove_chars
 
 
-class LinkdecrypterCom(Hook):
+class LinkdecrypterCom(Addon):
     __name__    = "LinkdecrypterCom"
     __type__    = "hook"
     __version__ = "0.21"
diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index 17baed8b2..cc4fc760d 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -2,10 +2,10 @@
 
 import re
 
-from pyload.plugins.internal.Addon import Hook
+from pyload.plugins.Addon import Addon
 
 
-class XFileSharingPro(Hook):
+class XFileSharingPro(Addon):
     __name__    = "XFileSharingPro"
     __type__    = "hook"
     __version__ = "0.26"