13 files changed, 18 insertions, 18 deletions
diff --git a/pyload/manager/AccountManager.py b/pyload/manager/Account.py
index 22345de8d..2631e1c7d 100644
--- a/pyload/manager/AccountManager.py
+++ b/pyload/manager/Account.py
@@ -7,7 +7,7 @@ from shutil import copy
 
 from threading import Lock
 
-from pyload.manager.event.PullEvents import AccountUpdateEvent
+from pyload.manager.Event import AccountUpdateEvent
 from pyload.utils import chmod, lock
 
 ACC_VERSION = 1
diff --git a/pyload/manager/AddonManager.py b/pyload/manager/Addon.py
index 2fd744776..164068634 100644
--- a/pyload/manager/AddonManager.py
+++ b/pyload/manager/Addon.py
@@ -9,8 +9,8 @@ from threading import RLock, Thread
 
 from types import MethodType
 
-from pyload.manager.thread.AddonThread import AddonThread
-from pyload.manager.PluginManager import literal_eval
+from pyload.manager.thread.Addon import AddonThread
+from pyload.manager.Plugin import literal_eval
 from pyload.utils import lock
 
 
diff --git a/pyload/manager/CaptchaManager.py b/pyload/manager/Captcha.py
index e54eacf30..e54eacf30 100644
--- a/pyload/manager/CaptchaManager.py
+++ b/pyload/manager/Captcha.py
diff --git a/pyload/manager/event/PullEvents.py b/pyload/manager/Event.py
index 20897290e..20897290e 100644
--- a/pyload/manager/event/PullEvents.py
+++ b/pyload/manager/Event.py
diff --git a/pyload/manager/PluginManager.py b/pyload/manager/Plugin.py
index c327c991a..71a7131c4 100644
--- a/pyload/manager/PluginManager.py
+++ b/pyload/manager/Plugin.py
@@ -16,7 +16,7 @@ from SafeEval import const_eval as literal_eval
 
 
 class PluginManager(object):
-    ROOT     = "pyload.plugins."
+    ROOT     = "pyload.plugin."
     USERROOT = "userplugins."
     TYPES    = ["account", "addon", "container", "crypter", "hook", "hoster", "internal", "ocr"]
 
diff --git a/pyload/manager/RemoteManager.py b/pyload/manager/Remote.py
index 910881164..910881164 100644
--- a/pyload/manager/RemoteManager.py
+++ b/pyload/manager/Remote.py
diff --git a/pyload/manager/ThreadManager.py b/pyload/manager/Thread.py
index d6f3c0005..6c9304e87 100644
--- a/pyload/manager/ThreadManager.py
+++ b/pyload/manager/Thread.py
@@ -11,10 +11,10 @@ from random import choice
 
 import pycurl
 
-from pyload.manager.thread.DecrypterThread import DecrypterThread
-from pyload.manager.thread.DownloadThread import DownloadThread
-from pyload.manager.thread.InfoThread import InfoThread
-from pyload.datatype.PyFile import PyFile
+from pyload.manager.thread.Decrypter import DecrypterThread
+from pyload.manager.thread.Download import DownloadThread
+from pyload.manager.thread.Info import InfoThread
+from pyload.datatype.File import PyFile
 from pyload.network.RequestFactory import getURL
 from pyload.utils import freeSpace, lock
 
diff --git a/pyload/manager/thread/AddonThread.py b/pyload/manager/thread/Addon.py
index a84856b0a..7feec227e 100644
--- a/pyload/manager/thread/AddonThread.py
+++ b/pyload/manager/thread/Addon.py
@@ -14,7 +14,7 @@ from types import MethodType
 
 from pycurl import error
 
-from pyload.manager.thread.PluginThread import PluginThread
+from pyload.manager.thread.Plugin import PluginThread
 
 
 class AddonThread(PluginThread):
diff --git a/pyload/manager/thread/DecrypterThread.py b/pyload/manager/thread/Decrypter.py
index 003b5f082..51544d1b9 100644
--- a/pyload/manager/thread/DecrypterThread.py
+++ b/pyload/manager/thread/Decrypter.py
@@ -14,8 +14,8 @@ from types import MethodType
 
 from pycurl import error
 
-from pyload.manager.thread.PluginThread import PluginThread
-from pyload.plugins.Plugin import Abort, Fail, Retry
+from pyload.manager.thread.Plugin import PluginThread
+from pyload.plugin.Plugin import Abort, Fail, Retry
 
 
 class DecrypterThread(PluginThread):
diff --git a/pyload/manager/thread/DownloadThread.py b/pyload/manager/thread/Download.py
index d876000da..c7d21a4ba 100644
--- a/pyload/manager/thread/DownloadThread.py
+++ b/pyload/manager/thread/Download.py
@@ -14,8 +14,8 @@ from types import MethodType
 
 from pycurl import error
 
-from pyload.manager.thread.PluginThread import PluginThread
-from pyload.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
+from pyload.manager.thread.Plugin import PluginThread
+from pyload.plugin.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
 
 
 class DownloadThread(PluginThread):
diff --git a/pyload/manager/thread/InfoThread.py b/pyload/manager/thread/Info.py
index 99bf97fc8..4526a07ed 100644
--- a/pyload/manager/thread/InfoThread.py
+++ b/pyload/manager/thread/Info.py
@@ -14,8 +14,8 @@ from types import MethodType
 
 from pycurl import error
 
-from pyload.datatype.PyFile import PyFile
-from pyload.manager.thread.PluginThread import PluginThread
+from pyload.datatype.File import PyFile
+from pyload.manager.thread.Plugin import PluginThread
 from pyload.api import OnlineStatus
 
 
diff --git a/pyload/manager/thread/PluginThread.py b/pyload/manager/thread/Plugin.py
index 3cdae122f..70ee747a8 100644
--- a/pyload/manager/thread/PluginThread.py
+++ b/pyload/manager/thread/Plugin.py
@@ -14,8 +14,8 @@ from types import MethodType
 
 from pycurl import error
 
-from pyload.datatype.PyFile import PyFile
-from pyload.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
+from pyload.datatype.File import PyFile
+from pyload.plugin.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
 from pyload.utils.packagetools import parseNames
 from pyload.utils import safe_join
 from pyload.api import OnlineStatus
diff --git a/pyload/manager/thread/ServerThread.py b/pyload/manager/thread/Server.py
index a8b95cd56..f3f174e74 100644
--- a/pyload/manager/thread/ServerThread.py
+++ b/pyload/manager/thread/Server.py
@@ -59,7 +59,7 @@ class WebServer(threading.Thread):
                 except Exception, e:
                     log.error(_("Error importing lightweight server: %s") % e)
                     log.warning(_("You need to download and compile bjoern, https://github.com/jonashaag/bjoern"))
-                    log.warning(_("Copy the boern.so to pyload/lib folder or use setup.py install"))
+                    log.warning(_("Copy the boern.so to the lib folder or use setup.py install"))
                     log.warning(_("Of course you need to be familiar with linux and know how to compile software"))
                     self.server = "builtin"
             else: