diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 01dddac8..40074c4c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,31 +22,30 @@
-
-
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -484,13 +483,6 @@
1605881914521
-
- 1608139239527
-
-
-
- 1608139239527
-
1608139414722
@@ -827,7 +819,14 @@
1615232966232
-
+
+ 1615236731026
+
+
+
+ 1615236731026
+
+
@@ -843,7 +842,6 @@
-
@@ -868,7 +866,8 @@
-
+
+
diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py
index b19c73a9..8a3cec67 100644
--- a/src/cpl/application/__init__.py
+++ b/src/cpl/application/__init__.py
@@ -20,6 +20,12 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .application_abc import ApplicationABC
+from .application_host import ApplicationHost
+from .application_host_abc import ApplicationHostABC
+from .application_runtime import ApplicationRuntime
+from .application_runtime_abc import ApplicationRuntimeABC
+from .startup_abc import StartupABC
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/application/application_abc.py b/src/cpl/application/application_abc.py
index 28929da3..912517c5 100644
--- a/src/cpl/application/application_abc.py
+++ b/src/cpl/application/application_abc.py
@@ -6,7 +6,7 @@ from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.application.startup_abc import StartupABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.console.console import Console
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
class ApplicationABC(ABC):
diff --git a/src/cpl/application/application_host.py b/src/cpl/application/application_host.py
index 2df94442..35bb3e1e 100644
--- a/src/cpl/application/application_host.py
+++ b/src/cpl/application/application_host.py
@@ -8,7 +8,7 @@ from cpl.configuration.configuration import Configuration
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.console.console import Console
from cpl.dependency_injection.service_provider import ServiceProvider
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
class ApplicationHost(ApplicationHostABC):
diff --git a/src/cpl/application/application_host_abc.py b/src/cpl/application/application_host_abc.py
index a9430915..c7ef097b 100644
--- a/src/cpl/application/application_host_abc.py
+++ b/src/cpl/application/application_host_abc.py
@@ -3,7 +3,7 @@ from collections import Callable
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
class ApplicationHostABC(ABC):
diff --git a/src/cpl/application/startup_abc.py b/src/cpl/application/startup_abc.py
index 72425209..923d680a 100644
--- a/src/cpl/application/startup_abc.py
+++ b/src/cpl/application/startup_abc.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
from cpl.application.application_host_abc import ApplicationHostABC
from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
class StartupABC(ABC):
diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py
index a0739f36..e16126d8 100644
--- a/src/cpl/configuration/__init__.py
+++ b/src/cpl/configuration/__init__.py
@@ -20,6 +20,11 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .configuration import Configuration
+from .configuration_abc import ConfigurationABC
+from .configuration_model_abc import ConfigurationModelABC
+from .configuration_variable_name import ConfigurationVariableName
+from .console_argument import ConsoleArgument
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py
index 992fbf4d..00be5915 100644
--- a/src/cpl/console/__init__.py
+++ b/src/cpl/console/__init__.py
@@ -20,6 +20,11 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .background_color import BackgroundColor
+from .console import Console
+from .console_call import ConsoleCall
+from .foreground_color import ForegroundColor
+from .spinner_thread import SpinnerThread
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py
index 11c17dbc..da0ebbc3 100644
--- a/src/cpl/database/__init__.py
+++ b/src/cpl/database/__init__.py
@@ -20,6 +20,9 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .database_model import DatabaseModel
+from .database_settings import DatabaseSettings
+from .database_settings_name import DatabaseSettingsName
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py
index 07999fef..0bba989e 100644
--- a/src/cpl/database/connection/__init__.py
+++ b/src/cpl/database/connection/__init__.py
@@ -20,6 +20,8 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .database_connection import DatabaseConnection
+from .database_connection_abc import DatabaseConnectionABC
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py
index e435a513..fecfe45d 100644
--- a/src/cpl/database/context/__init__.py
+++ b/src/cpl/database/context/__init__.py
@@ -20,6 +20,8 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .database_context import DatabaseContext
+from .database_context_abc import DatabaseContextABC
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py
index 92b4a66f..636df4c4 100644
--- a/src/cpl/dependency_injection/__init__.py
+++ b/src/cpl/dependency_injection/__init__.py
@@ -20,6 +20,9 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .service_abc import ServiceABC
+from .service_provider import ServiceProvider
+from .service_provider_abc import ServiceProviderABC
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/dependency_injection/provide_state.py b/src/cpl/dependency_injection/provide_state.py
deleted file mode 100644
index 52d0af05..00000000
--- a/src/cpl/dependency_injection/provide_state.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from typing import Type
-
-from sh_edraft.service.base.service_base import ServiceBase
-
-
-class ProvideState:
-
- def __init__(self, service: Type[ServiceBase] = None, args: tuple = None):
- self._service: Type[ServiceBase] = service
- self._args: tuple = args
-
- @property
- def service(self):
- return self._service
-
- @property
- def args(self) -> tuple:
- return self._args
diff --git a/src/cpl/dependency_injection/service_provider.py b/src/cpl/dependency_injection/service_provider.py
index 6e7928a6..031ada5b 100644
--- a/src/cpl/dependency_injection/service_provider.py
+++ b/src/cpl/dependency_injection/service_provider.py
@@ -6,7 +6,7 @@ from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration_model_abc import ConfigurationModelABC
from cpl.database.context.database_context_abc import DatabaseContextABC
from cpl.dependency_injection.service_abc import ServiceABC
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl.environment.environment_abc import EnvironmentABC
diff --git a/src/cpl/dependency_injection/service_provider_base.py b/src/cpl/dependency_injection/service_provider_abc.py
similarity index 100%
rename from src/cpl/dependency_injection/service_provider_base.py
rename to src/cpl/dependency_injection/service_provider_abc.py
diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py
index 74cceb70..0cc01d06 100644
--- a/src/cpl/environment/__init__.py
+++ b/src/cpl/environment/__init__.py
@@ -20,6 +20,9 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .environment_abc import EnvironmentABC
+from .environment_name import EnvironmentName
+from .hosting_environment import HostingEnvironment
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py
index 4c74839d..7ed0b091 100644
--- a/src/cpl/logging/__init__.py
+++ b/src/cpl/logging/__init__.py
@@ -20,6 +20,11 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .logger import Logger
+from .logger_abc import LoggerABC
+from .logging_level import LoggingLevel
+from .logging_settings import LoggingSettings
+from .logging_settings_name import LoggingSettingsName
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py
index 3915b5d7..36c88dff 100644
--- a/src/cpl/mailing/__init__.py
+++ b/src/cpl/mailing/__init__.py
@@ -20,6 +20,11 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .email import EMail
+from .email_client import EMailClient
+from .email_client_abc import EMailClientABC
+from .email_client_settings import EMailClientSettings
+from .email_client_settings_name import EMailClientSettingsName
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py
index c51eaa00..6d43e54b 100644
--- a/src/cpl/time/__init__.py
+++ b/src/cpl/time/__init__.py
@@ -20,6 +20,8 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .time_format_settings import TimeFormatSettings
+from .time_format_settings_names import TimeFormatSettingsNames
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py
index b67bcc22..607c4864 100644
--- a/src/cpl/utils/__init__.py
+++ b/src/cpl/utils/__init__.py
@@ -20,6 +20,7 @@ __version__ = '2021.4.1'
from collections import namedtuple
# imports:
+from .credential_manager import CredentialManager
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl_cli/command_handler.py b/src/cpl_cli/command_handler.py
index 850807eb..a163eace 100644
--- a/src/cpl_cli/command_handler.py
+++ b/src/cpl_cli/command_handler.py
@@ -1,6 +1,6 @@
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.dependency_injection.service_abc import ServiceABC
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl_cli.command_model import CommandModel
diff --git a/src/cpl_cli/startup.py b/src/cpl_cli/startup.py
index 265f6362..924bf28a 100644
--- a/src/cpl_cli/startup.py
+++ b/src/cpl_cli/startup.py
@@ -4,7 +4,7 @@ from cpl.application.application_host import ApplicationHost
from cpl.application.application_host_abc import ApplicationHostABC
from cpl.application.startup_abc import StartupABC
from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl_cli.command.build import Build
from cpl_cli.command.publish import Publish
from cpl_cli.command_handler import CommandHandler
diff --git a/src/tests/startup.py b/src/tests/startup.py
index c2881e77..3e0b0a5e 100644
--- a/src/tests/startup.py
+++ b/src/tests/startup.py
@@ -6,7 +6,7 @@ from cpl.application.startup_abc import StartupABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.database.context.database_context import DatabaseContext
from cpl.database.database_settings import DatabaseSettings
-from cpl.dependency_injection.service_provider_base import ServiceProviderABC
+from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl.logging.logger import Logger
from cpl.logging.logger_abc import LoggerABC
from cpl.mailing.email_client import EMailClient