diff --git a/ldap3_mapper_new/__init__.py b/ldap3_mapper_new/__init__.py
index a071ffe47094b3c26db11189ff20446a33f25ddb..4eb8c8f4636fb2e23a2eb1def906878577b9d2db 100644
--- a/ldap3_mapper_new/__init__.py
+++ b/ldap3_mapper_new/__init__.py
@@ -1,21 +1,20 @@
 import ldap3
 
-from . import model
+from . import model, attribute, relationship
 
-__all__ = ['LDAP3Mapper']
+__all__ = ['LDAPMapper']
 
-class LDAP3Mapper:
+class LDAPMapper:
 	def __init__(self, server=None, bind_dn=None, bind_password=None):
 
-		class Session(model.Session):
-			ldap_mapper = self
-
 		class Model(model.Model):
 			ldap_mapper = self
 
-		self.Session = Session # pylint: disable=invalid-name
 		self.Model = Model # pylint: disable=invalid-name
-		self.Attribute = model.Attribute # pylint: disable=invalid-name
+		self.Session = model.Session # pylint: disable=invalid-name
+		self.Attribute = attribute.Attribute # pylint: disable=invalid-name
+		self.Relationship = relationship.Relationship # pylint: disable=invalid-name
+		self.Backreference = relationship.Backreference # pylint: disable=invalid-name
 
 		if not hasattr(type(self), 'server'):
 			self.server = server
diff --git a/ldap3_mapper_new/base.py b/ldap3_mapper_new/core.py
similarity index 100%
rename from ldap3_mapper_new/base.py
rename to ldap3_mapper_new/core.py