13 files changed, 15 insertions, 15 deletions
diff --git a/pyload/plugins/addon/Checksum.py b/pyload/plugins/addon/Checksum.py
index 00c3d9cfd..4c5bb39ef 100644
--- a/pyload/plugins/addon/Checksum.py
+++ b/pyload/plugins/addon/Checksum.py
@@ -9,7 +9,7 @@ import zlib
 from os import remove
 from os.path import getsize, isfile, splitext
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 from pyload.utils import safe_join, fs_encode
 
 
diff --git a/pyload/plugins/addon/ClickAndLoad.py b/pyload/plugins/addon/ClickAndLoad.py
index c45a1ef2d..63f82ad9b 100644
--- a/pyload/plugins/addon/ClickAndLoad.py
+++ b/pyload/plugins/addon/ClickAndLoad.py
@@ -3,7 +3,7 @@
 import socket
 import thread
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 def proxy(self, *settings):
diff --git a/pyload/plugins/addon/DeleteFinished.py b/pyload/plugins/addon/DeleteFinished.py
index 719de143a..c21b0a589 100644
--- a/pyload/plugins/addon/DeleteFinished.py
+++ b/pyload/plugins/addon/DeleteFinished.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from pyload.database import style
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 class DeleteFinished(Addon):
diff --git a/pyload/plugins/addon/DownloadScheduler.py b/pyload/plugins/addon/DownloadScheduler.py
index ef15a859f..9ca4609a6 100644
--- a/pyload/plugins/addon/DownloadScheduler.py
+++ b/pyload/plugins/addon/DownloadScheduler.py
@@ -4,7 +4,7 @@ import re
 
 from time import localtime
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 class DownloadScheduler(Addon):
diff --git a/pyload/plugins/addon/ExternalScripts.py b/pyload/plugins/addon/ExternalScripts.py
index 122de00c5..5aff0f11f 100644
--- a/pyload/plugins/addon/ExternalScripts.py
+++ b/pyload/plugins/addon/ExternalScripts.py
@@ -6,7 +6,7 @@ from itertools import chain
 from os import listdir, access, X_OK, makedirs
 from os.path import join, exists, basename, abspath
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 from pyload.utils import safe_join
 
 
diff --git a/pyload/plugins/addon/ExtractArchive.py b/pyload/plugins/addon/ExtractArchive.py
index a53d2f951..6946190ed 100644
--- a/pyload/plugins/addon/ExtractArchive.py
+++ b/pyload/plugins/addon/ExtractArchive.py
@@ -49,7 +49,7 @@ if os.name != "nt":
     from os import chown
     from pwd import getpwnam
 
-from pyload.plugins.base.Addon import Addon, threaded, Expose
+from pyload.plugins.internal.Addon import Addon, threaded, Expose
 from pyload.plugins.internal.AbstractExtractor import ArchiveError, CRCError, WrongPassword
 from pyload.utils import safe_join, fs_encode
 
diff --git a/pyload/plugins/addon/HotFolder.py b/pyload/plugins/addon/HotFolder.py
index 0bce193ce..491b9e2da 100644
--- a/pyload/plugins/addon/HotFolder.py
+++ b/pyload/plugins/addon/HotFolder.py
@@ -6,8 +6,8 @@ from os import listdir, makedirs
 from os.path import exists, isfile, join
 from shutil import move
 
-from pyload.plugins.base.Addon import Addon
-from module.utils import fs_encode, save_join
+from pyload.plugins.internal.Addon import Addon
+from pyload.utils import fs_encode, safe_join
 
 
 class HotFolder(Addon):
@@ -43,7 +43,7 @@ class HotFolder(Addon):
                 if content:
                     name = "%s_%s.txt" % (self.getConfig("file"), time.strftime("%H-%M-%S_%d%b%Y"))
 
-                    with open(save_join(folder, "finished", name), "wb") as f:
+                    with open(safe_join(folder, "finished", name), "wb") as f:
                         f.write(content)
 
                     self.core.api.addPackage(f.name, [f.name], 1)
diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py
index 041c8b07b..d06dad07f 100644
--- a/pyload/plugins/addon/IRCInterface.py
+++ b/pyload/plugins/addon/IRCInterface.py
@@ -13,7 +13,7 @@ from traceback import print_exc
 
 from pyload.api import PackageDoesNotExists, FileDoesNotExists
 from pyload.network.RequestFactory import getURL
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 from pyload.utils import formatSize
 
 
diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py
index e67f87f56..2483135f4 100644
--- a/pyload/plugins/addon/MergeFiles.py
+++ b/pyload/plugins/addon/MergeFiles.py
@@ -5,7 +5,7 @@ import re
 
 from traceback import print_exc
 
-from pyload.plugins.base.Addon import Addon, threaded
+from pyload.plugins.internal.Addon import Addon, threaded
 from pyload.utils import safe_join, fs_encode
 
 
diff --git a/pyload/plugins/addon/MultiHome.py b/pyload/plugins/addon/MultiHome.py
index a808802ba..e7ae5168c 100644
--- a/pyload/plugins/addon/MultiHome.py
+++ b/pyload/plugins/addon/MultiHome.py
@@ -2,7 +2,7 @@
 
 from time import time
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 class MultiHome(Addon):
diff --git a/pyload/plugins/addon/RestartFailed.py b/pyload/plugins/addon/RestartFailed.py
index 879836bcf..7405e2f75 100644
--- a/pyload/plugins/addon/RestartFailed.py
+++ b/pyload/plugins/addon/RestartFailed.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 class RestartFailed(Addon):
diff --git a/pyload/plugins/addon/UnSkipOnFail.py b/pyload/plugins/addon/UnSkipOnFail.py
index 5122e21eb..1a064562f 100644
--- a/pyload/plugins/addon/UnSkipOnFail.py
+++ b/pyload/plugins/addon/UnSkipOnFail.py
@@ -3,7 +3,7 @@
 from os.path import basename
 
 from pyload.datatypes.PyFile import PyFile
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 from pyload.utils import fs_encode
 
 
diff --git a/pyload/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py
index e35f74e84..abcd6c55c 100644
--- a/pyload/plugins/addon/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py
@@ -3,7 +3,7 @@
 import httplib
 import time
 
-from pyload.plugins.base.Addon import Addon
+from pyload.plugins.internal.Addon import Addon
 
 
 class WindowsPhoneToastNotify(Addon):