Restructuring

unittests/unittests/application.py

@@ -1,8 +1,8 @@
 import unittest
 
-from cpl.core.application import ApplicationABC
+from cpl.application import ApplicationABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.dependency import ServiceProviderABC
 from unittests_cli.cli_test_suite import CLITestSuite
 from unittests_core.core_test_suite import CoreTestSuite
 from unittests_query.query_test_suite import QueryTestSuite

unittests/unittests/main.py

@@ -1,4 +1,4 @@
-from cpl.core.application import ApplicationBuilder
+from cpl.application import ApplicationBuilder
 from unittests.application import Application
 
 

unittests/unittests_core/configuration/configuration_test_case.py

@@ -4,8 +4,8 @@ import unittest
 from unittest.mock import Mock, MagicMock
 
 from cpl.core.configuration import Configuration, ArgumentTypeEnum
-from cpl.core.database import DatabaseSettings
-from cpl.core.dependency_injection import ServiceProvider, ServiceCollection
+from cpl.database import DatabaseSettings
+from cpl.dependency import ServiceProvider, ServiceCollection
 from cpl.mail import EMailClientSettings
 
 

unittests/unittests_core/configuration/console_arguments_test_case.py

@@ -3,7 +3,7 @@ import unittest
 from unittest.mock import Mock, MagicMock
 
 from cpl.core.configuration import Configuration, ArgumentTypeEnum
-from cpl.core.dependency_injection import ServiceCollection
+from cpl.dependency import ServiceCollection
 
 
 class ConsoleArgumentsTestCase(unittest.TestCase):

unittests/unittests_core/di/service_collection_test_case.py

@@ -2,7 +2,7 @@ import unittest
 from unittest.mock import Mock
 
 from cpl.core.configuration import Configuration
-from cpl.core.dependency_injection import ServiceCollection, ServiceLifetimeEnum, ServiceProviderABC
+from cpl.dependency import ServiceCollection, ServiceLifetimeEnum, ServiceProviderABC
 
 
 class ServiceCollectionTestCase(unittest.TestCase):

unittests/unittests_core/di/service_provider_test_case.py

@@ -1,7 +1,7 @@
 import unittest
 
 from cpl.core.configuration import Configuration
-from cpl.core.dependency_injection import ServiceCollection, ServiceProviderABC
+from cpl.dependency import ServiceCollection, ServiceProviderABC
 
 
 class ServiceCount: