4 files changed, 10 insertions, 12 deletions
diff --git a/pyload/database/File.py b/pyload/database/File.py
index db4b13a52..f28535ffa 100644
--- a/pyload/database/File.py
+++ b/pyload/database/File.py
@@ -3,11 +3,10 @@
 
 import threading
 
-from pyload.utils import formatSize, lock
+from pyload.Datatype import PyFile, PyPackage
+from pyload.Database import DatabaseBackend, style
 from pyload.manager.Event import InsertEvent, ReloadAllEvent, RemoveEvent, UpdateEvent
-from pyload.datatype.Package import PyPackage
-from pyload.datatype.File import PyFile
-from pyload.database import DatabaseBackend, style
+from pyload.utils import formatSize, lock
 
 try:
     from pysqlite2 import dbapi2 as sqlite3
diff --git a/pyload/database/Storage.py b/pyload/database/Storage.py
index 70932b55c..a19f67606 100644
--- a/pyload/database/Storage.py
+++ b/pyload/database/Storage.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 # @author: mkaay
 
-from pyload.database import style
-from pyload.database import DatabaseBackend
+from pyload.Database import style
+from pyload.Database import DatabaseBackend
 
 
 class StorageMethods(object):
 
-
     @style.queue
     def setStorage(db, identifier, key, value):
         db.c.execute("SELECT id FROM storage WHERE identifier=? AND key=?", (identifier, key))
diff --git a/pyload/database/User.py b/pyload/database/User.py
index b5b44c50a..dc60ce23a 100644
--- a/pyload/database/User.py
+++ b/pyload/database/User.py
@@ -4,7 +4,7 @@
 from hashlib import sha1
 import random
 
-from pyload.database import DatabaseBackend, style
+from pyload.Database import DatabaseBackend, style
 
 
 class UserMethods(object):
diff --git a/pyload/database/__init__.py b/pyload/database/__init__.py
index 4e0edc5d1..b4200a698 100644
--- a/pyload/database/__init__.py
+++ b/pyload/database/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from pyload.database.Backend import DatabaseBackend, style
-from pyload.database.File import FileHandler
-from pyload.database.Storage import StorageMethods
-from pyload.database.User import UserMethods
+from pyload.Database.Backend import DatabaseBackend, style
+from pyload.Database.File import FileHandler
+from pyload.Database.Storage import StorageMethods
+from pyload.Database.User import UserMethods