diff --git a/src/test/python/release_mixin/__init__.py b/src/test/python/release_mixin/__init__.py
index e69de29..9b7968b 100644
--- a/src/test/python/release_mixin/__init__.py
+++ b/src/test/python/release_mixin/__init__.py
@@ -0,0 +1,2 @@
+from .mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
+from .mock_infrastructure_api import MockGitApi
\ No newline at end of file
diff --git a/src/test/python/release_mixin/helper.py b/src/test/python/release_mixin/helper.py
index 251703a..8009e18 100644
--- a/src/test/python/release_mixin/helper.py
+++ b/src/test/python/release_mixin/helper.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from src.main.python.ddadevops.release_mixin.infrastructure_api import SystemApi
+from src.main.python.ddadevops.infrastructure.release_mixin import SystemApi
 
 
 class Helper():
diff --git a/src/test/python/release_mixin/mock_domain.py b/src/test/python/release_mixin/mock_domain.py
index 14e625c..1a12ed2 100644
--- a/src/test/python/release_mixin/mock_domain.py
+++ b/src/test/python/release_mixin/mock_domain.py
@@ -1,4 +1,4 @@
-from src.main.python.ddadevops.release_mixin.domain import ReleaseType
+from src.main.python.ddadevops.domain import ReleaseType
 
 class MockVersion():
 
diff --git a/src/test/python/release_mixin/mock_infrastructure.py b/src/test/python/release_mixin/mock_infrastructure.py
index cb0fd5f..6d03180 100644
--- a/src/test/python/release_mixin/mock_infrastructure.py
+++ b/src/test/python/release_mixin/mock_infrastructure.py
@@ -1,4 +1,4 @@
-from src.main.python.ddadevops.release_mixin.domain import ReleaseType
+from src.main.python.ddadevops.domain import ReleaseType
 
 from .mock_domain import MockRelease, MockVersion
 from .mock_infrastructure_api import MockGitApi
diff --git a/src/test/python/release_mixin/test_domain.py b/src/test/python/release_mixin/test_domain.py
index a76ab9c..47cffb4 100644
--- a/src/test/python/release_mixin/test_domain.py
+++ b/src/test/python/release_mixin/test_domain.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from src.main.python.ddadevops.release_mixin.domain import Version, ReleaseType, Release
+from src.main.python.ddadevops.domain import Version, ReleaseType, Release
 
 def test_version(tmp_path: Path):
     version = Version(tmp_path, [1, 2, 3])
diff --git a/src/test/python/release_mixin/test_infrastructure.py b/src/test/python/release_mixin/test_infrastructure.py
index 534a56d..fefe233 100644
--- a/src/test/python/release_mixin/test_infrastructure.py
+++ b/src/test/python/release_mixin/test_infrastructure.py
@@ -1,5 +1,5 @@
-from src.main.python.ddadevops.release_mixin.domain import ReleaseType
-from src.main.python.ddadevops.release_mixin.infrastructure import ReleaseTypeRepository, VersionRepository, ReleaseRepository
+from src.main.python.ddadevops.domain import ReleaseType
+from src.main.python.ddadevops.infrastructure.release_mixin import ReleaseTypeRepository, VersionRepository, ReleaseRepository
 from .mock_infrastructure_api import MockGitApi, MockEnvironmentApi
 from .helper import Helper
 
diff --git a/src/test/python/release_mixin/test_infrastructure_api.py b/src/test/python/release_mixin/test_infrastructure_api.py
index 0379d89..e983fac 100644
--- a/src/test/python/release_mixin/test_infrastructure_api.py
+++ b/src/test/python/release_mixin/test_infrastructure_api.py
@@ -1,9 +1,9 @@
 from pathlib import Path
 import pytest as pt
 
-from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi, EnvironmentApi, JsonFileHandler
-from src.main.python.ddadevops.release_mixin.infrastructure import VersionRepository
-from src.main.python.ddadevops.release_mixin.domain import ReleaseType
+from src.main.python.ddadevops.infrastructure.release_mixin import GitApi, EnvironmentApi, JsonFileHandler
+from src.main.python.ddadevops.infrastructure.release_mixin import VersionRepository
+from src.main.python.ddadevops.domain.release import ReleaseType
 
 from .helper import Helper
 
diff --git a/src/test/python/release_mixin/test_release_mixin.py b/src/test/python/release_mixin/test_release_mixin.py
index ed4a52f..a32fc85 100644
--- a/src/test/python/release_mixin/test_release_mixin.py
+++ b/src/test/python/release_mixin/test_release_mixin.py
@@ -2,8 +2,8 @@ import pytest as pt
 from pathlib import Path
 from pybuilder.core import Project
 
-from src.main.python.ddadevops.release_mixin.release_mixin import ReleaseMixin, create_release_mixin_config
-from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi, EnvironmentApi
+from src.main.python.ddadevops.release_mixin import ReleaseMixin, create_release_mixin_config
+from src.main.python.ddadevops.infrastructure.release_mixin import GitApi, EnvironmentApi
 from src.main.python.ddadevops.domain import Devops, ReleaseConfig
 
 from .helper import Helper
diff --git a/src/test/python/release_mixin/test_services.py b/src/test/python/release_mixin/test_services.py
index ca8ca32..5eb6ffc 100644
--- a/src/test/python/release_mixin/test_services.py
+++ b/src/test/python/release_mixin/test_services.py
@@ -1,7 +1,6 @@
-from src.main.python.ddadevops.release_mixin.services import PrepareReleaseService, TagAndPushReleaseService
-
-from .mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
-from .mock_infrastructure_api import MockGitApi
+from src.main.python.ddadevops.application import PrepareReleaseService, TagAndPushReleaseService
+from src.test.python.release_mixin import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
+from src.test.python.release_mixin import MockGitApi
 
 def test_prepare_release_service(): # todo: maybe use mocks for service api tests
     # init