diff --git a/src/sh_edraft/mailing/__init__.py b/src/sh_edraft/mailing/__init__.py
index 00cf499a..db3f827b 100644
--- a/src/sh_edraft/mailing/__init__.py
+++ b/src/sh_edraft/mailing/__init__.py
@@ -19,7 +19,8 @@ __version__ = '2020.12.10'
 
 from collections import namedtuple
 
-
+# imports:
+from .email_client import EMailClient
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2020, minor=12, micro=10)
diff --git a/src/sh_edraft/mailing/base/__init__.py b/src/sh_edraft/mailing/base/__init__.py
index 2a47b22b..587aab2c 100644
--- a/src/sh_edraft/mailing/base/__init__.py
+++ b/src/sh_edraft/mailing/base/__init__.py
@@ -20,6 +20,7 @@ __version__ = '2020.12.10'
 from collections import namedtuple
 
 # imports:
+from .email_client_base import EMailClientBase
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2020, minor=12, micro=10)
diff --git a/src/sh_edraft/mailing/model/__init__.py b/src/sh_edraft/mailing/model/__init__.py
index d82af892..ee1b8eb3 100644
--- a/src/sh_edraft/mailing/model/__init__.py
+++ b/src/sh_edraft/mailing/model/__init__.py
@@ -20,6 +20,9 @@ __version__ = '2020.12.10'
 from collections import namedtuple
 
 # imports:
+from .email import EMail
+from .email_client_settings_name import EMailClientSettingsName
+from .email_client_settings import EMailClientSettings
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2020, minor=12, micro=10)
diff --git a/src/tests_dev/program.py b/src/tests_dev/program.py
index d957bc49..4ecaa466 100644
--- a/src/tests_dev/program.py
+++ b/src/tests_dev/program.py
@@ -7,9 +7,9 @@ from sh_edraft.hosting import ApplicationHost
 from sh_edraft.hosting.base import ApplicationBase
 from sh_edraft.logging import Logger
 from sh_edraft.logging.base import LoggerBase
-from sh_edraft.mailing.base.email_client_base import EMailClientBase
-from sh_edraft.mailing.email_client import EMailClient
-from sh_edraft.mailing.model.email import EMail
+from sh_edraft.mailing.base import EMailClientBase
+from sh_edraft.mailing import EMailClient
+from sh_edraft.mailing.model import EMail
 from sh_edraft.service.providing.base import ServiceProviderBase
 from sh_edraft.utils import CredentialManager