diff --git a/db.py b/db.py
index c1f3176529206805508b7c82cc27c3e75d325f6b..ddace7a9ad01dbaefef7237543a193c5177c65d3 100644
--- a/db.py
+++ b/db.py
@@ -1,5 +1,6 @@
 import socket
 import struct
+import socketserver
 from crypt import crypt
 from ssl import SSLContext, SSLSocket
 
@@ -7,11 +8,11 @@ from sqlalchemy import create_engine, or_, and_, Column, Integer, String, Table,
 from sqlalchemy.orm import sessionmaker, relationship, RelationshipProperty, aliased
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.hybrid import hybrid_property
-from ldap import SearchScope, FilterAnd, FilterOr, FilterNot, FilterEqual, FilterPresent
-from server import LDAPRequestHandler, LDAPInvalidCredentials, LDAPInsufficientAccessRights, LDAPConfidentialityRequired, LDAPNoSuchObject, encode_attribute, CaseInsensitiveDict
-import socketserver
-from dn import parse_dn, build_dn
-import sasl.digest_md5
+
+from ldapserver import *
+from ldapserver.ldap import SearchScope, FilterAnd, FilterOr, FilterNot, FilterEqual, FilterPresent
+from ldapserver.dn import parse_dn, build_dn
+from ldapserver.server import CaseInsensitiveDict, encode_attribute
 
 Base = declarative_base()
 
diff --git a/ldapserver/__init__.py b/ldapserver/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..81a829d58c92a7fc20dd9a76035b826d7f22faaa
--- /dev/null
+++ b/ldapserver/__init__.py
@@ -0,0 +1,6 @@
+from . import ldap
+from . import dn
+from . import sasl
+
+from .exceptions import *
+from .server import LDAPRequestHandler
diff --git a/dn.py b/ldapserver/dn.py
similarity index 100%
rename from dn.py
rename to ldapserver/dn.py
diff --git a/exceptions.py b/ldapserver/exceptions.py
similarity index 97%
rename from exceptions.py
rename to ldapserver/exceptions.py
index 7263a09dbefdc922c29a6a7c0299ed32ed0c2bed..e17382177da00116df2bbbc016a9dfb238bb1e72 100644
--- a/exceptions.py
+++ b/ldapserver/exceptions.py
@@ -1,4 +1,4 @@
-from ldap import LDAPResultCode
+from .ldap import LDAPResultCode
 
 class LDAPError(Exception):
 	def __init__(self, code=LDAPResultCode.other, message=''):
diff --git a/ldap.py b/ldapserver/ldap.py
similarity index 100%
rename from ldap.py
rename to ldapserver/ldap.py
diff --git a/ldapserver/sasl/__init__.py b/ldapserver/sasl/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e46e5552f1584f9129b620e8aac93b905fc0ccc2
--- /dev/null
+++ b/ldapserver/sasl/__init__.py
@@ -0,0 +1 @@
+from . import digest_md5
diff --git a/sasl/digest_md5.py b/ldapserver/sasl/digest_md5.py
similarity index 99%
rename from sasl/digest_md5.py
rename to ldapserver/sasl/digest_md5.py
index fd81af184bbf14b94f771b0604f668d3ddf388a9..9365839be5deaed0a217e2d766c785feb109e87d 100644
--- a/sasl/digest_md5.py
+++ b/ldapserver/sasl/digest_md5.py
@@ -1,7 +1,7 @@
 import hashlib
 import secrets
 
-from exceptions import *
+from ..exceptions import *
 
 def _parse_token(s):
 	SEP = [b'(', b')', b'<', b'>', b'@', b',', b';', b':', b'\\', b'\'', b'/',
diff --git a/server.py b/ldapserver/server.py
similarity index 99%
rename from server.py
rename to ldapserver/server.py
index 17a964ec789434e3daf8f77bb7be9a7462573b9c..d8fb7a3d66277b4fa89cace61a308c2f79cd030d 100644
--- a/server.py
+++ b/ldapserver/server.py
@@ -5,9 +5,9 @@ import socket
 import ssl
 from socketserver import BaseRequestHandler
 
-from ldap import *
-import sasl.digest_md5
-from exceptions import *
+from .ldap import *
+from .exceptions import *
+from . import sasl
 
 def decode_msg(shallowmsg):
 	try:
diff --git a/sasl/__init__.py b/sasl/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000