17 files changed, 10 insertions, 10 deletions
diff --git a/pyload/api/__init__.py b/pyload/Api/__init__.py
index 55c21572f..44bae48bc 100644
--- a/pyload/api/__init__.py
+++ b/pyload/Api/__init__.py
@@ -24,12 +24,12 @@ if activated:
         BaseObject = TBase
 
     except ImportError:
-        from pyload.api.types import *
+        from pyload.Api.types import *
 
         print "Thrift not imported"
 
 else:
-    from pyload.api.types import *
+    from pyload.Api.types import *
 
 # contains function names mapped to their permissions
 # unlisted functions are for admins only
diff --git a/pyload/api/types.py b/pyload/Api/types.py
index 9381df3c7..9381df3c7 100644
--- a/pyload/api/types.py
+++ b/pyload/Api/types.py
diff --git a/pyload/Core.py b/pyload/Core.py
index eb6a968b4..545c1d63d 100755
--- a/pyload/Core.py
+++ b/pyload/Core.py
@@ -360,11 +360,11 @@ class Core(object):
         self.lastClientConnected = 0
 
         # later imported because they would trigger api import, and remote value not set correctly
-        from pyload.api import Api
+        from pyload.Api import Api
         from pyload.manager.Addon import AddonManager
         from pyload.manager.Thread import ThreadManager
 
-        if pyload.api.activated != self.remote:
+        if pyload.Api.activated != self.remote:
             self.log.warning("Import error: API remote status not correct.")
 
         self.api = Api(self)
diff --git a/pyload/database/Backend.py b/pyload/Database/Backend.py
index 0fc961973..0fc961973 100644
--- a/pyload/database/Backend.py
+++ b/pyload/Database/Backend.py
diff --git a/pyload/database/File.py b/pyload/Database/File.py
index f28535ffa..f28535ffa 100644
--- a/pyload/database/File.py
+++ b/pyload/Database/File.py
diff --git a/pyload/database/Storage.py b/pyload/Database/Storage.py
index a19f67606..a19f67606 100644
--- a/pyload/database/Storage.py
+++ b/pyload/Database/Storage.py
diff --git a/pyload/database/User.py b/pyload/Database/User.py
index dc60ce23a..dc60ce23a 100644
--- a/pyload/database/User.py
+++ b/pyload/Database/User.py
diff --git a/pyload/database/__init__.py b/pyload/Database/__init__.py
index b4200a698..b4200a698 100644
--- a/pyload/database/__init__.py
+++ b/pyload/Database/__init__.py
diff --git a/pyload/datatype/File.py b/pyload/Datatype/File.py
index cb6989d98..cb6989d98 100644
--- a/pyload/datatype/File.py
+++ b/pyload/Datatype/File.py
diff --git a/pyload/datatype/Package.py b/pyload/Datatype/Package.py
index 5ba42f596..5ba42f596 100644
--- a/pyload/datatype/Package.py
+++ b/pyload/Datatype/Package.py
diff --git a/pyload/datatype/__init__.py b/pyload/Datatype/__init__.py
index 29f0d40aa..29f0d40aa 100644
--- a/pyload/datatype/__init__.py
+++ b/pyload/Datatype/__init__.py
diff --git a/pyload/Thread/Info.py b/pyload/Thread/Info.py
index 36779a962..c1960fa9a 100644
--- a/pyload/Thread/Info.py
+++ b/pyload/Thread/Info.py
@@ -11,7 +11,7 @@ from copy import copy
 from pprint import pformat
 from types import MethodType
 
-from pyload.api import OnlineStatus
+from pyload.Api import OnlineStatus
 from pyload.Datatype import PyFile
 from pyload.Thread.Plugin import PluginThread
 
diff --git a/pyload/Thread/Plugin.py b/pyload/Thread/Plugin.py
index c7350a735..0f1b14d26 100644
--- a/pyload/Thread/Plugin.py
+++ b/pyload/Thread/Plugin.py
@@ -14,7 +14,7 @@ from copy import copy
 from pprint import pformat
 from types import MethodType
 
-from pyload.api import OnlineStatus
+from pyload.Api import OnlineStatus
 from pyload.Datatype import PyFile
 from pyload.plugin.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload
 from pyload.utils.packagetools import parseNames
diff --git a/pyload/Thread/Server.py b/pyload/Thread/Server.py
index 6b6ef6989..a26ffe6a1 100644
--- a/pyload/Thread/Server.py
+++ b/pyload/Thread/Server.py
@@ -31,7 +31,7 @@ class WebServer(threading.Thread):
 
 
     def run(self):
-        import pyload.Webui as webinterface
+        import pyload.webui as webinterface
         global webinterface
 
         reset = False
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 1d7683bf4..eb015c362 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -11,7 +11,7 @@ import pycurl
 
 from select import select
 
-from pyload.api import PackageDoesNotExists, FileDoesNotExists
+from pyload.Api import PackageDoesNotExists, FileDoesNotExists
 from pyload.network.RequestFactory import getURL
 from pyload.plugin.Addon import Addon
 from pyload.utils import formatSize
diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py
index 591b97437..35dbe9009 100644
--- a/pyload/webui/app/api.py
+++ b/pyload/webui/app/api.py
@@ -8,7 +8,7 @@ from itertools import chain
 from SafeEval import const_eval as literal_eval
 from bottle import route, request, response, HTTPError
 
-from pyload.api import BaseObject
+from pyload.Api import BaseObject
 from pyload.utils import json
 from pyload.webui import PYLOAD
 from pyload.webui.app.utils import toDict, set_session
diff --git a/pyload/webui/app/utils.py b/pyload/webui/app/utils.py
index 69682fe67..695162f91 100644
--- a/pyload/webui/app/utils.py
+++ b/pyload/webui/app/utils.py
@@ -5,7 +5,7 @@ import os
 
 from bottle import request, HTTPError, redirect, ServerAdapter
 
-from pyload.api import has_permission, PERMS, ROLE
+from pyload.Api import has_permission, PERMS, ROLE
 from pyload.webui import env, THEME