diff --git a/src/main/python/ddadevops/__init__.py b/src/main/python/ddadevops/__init__.py
index b00911c..5404bac 100644
--- a/src/main/python/ddadevops/__init__.py
+++ b/src/main/python/ddadevops/__init__.py
@@ -18,6 +18,7 @@ from .devops_image_build import DevopsImageBuild, create_devops_docker_build_con
 from .devops_terraform_build import DevopsTerraformBuild, create_devops_terraform_build_config
 from .devops_build import DevopsBuild, create_devops_build_config, get_devops_build, get_tag_from_latest_commit
 from .credential import gopass_password_from_path, gopass_field_from_path
+from .release_mixin import ReleaseMixin
 
 from .domain import Validateable, DnsRecord, Devops, Image
 
diff --git a/src/main/python/ddadevops/release_mixin/release_mixin.py b/src/main/python/ddadevops/release_mixin.py
similarity index 85%
rename from src/main/python/ddadevops/release_mixin/release_mixin.py
rename to src/main/python/ddadevops/release_mixin.py
index 7ed8f10..a744c45 100644
--- a/src/main/python/ddadevops/release_mixin/release_mixin.py
+++ b/src/main/python/ddadevops/release_mixin.py
@@ -1,12 +1,9 @@
-# TODO: jem, zam - 2023_04_14: mv file one dir up
 from typing import Optional
 from pybuilder.core import Project 
-from ..devops_build import DevopsBuild
-from .infrastructure import ReleaseRepository, ReleaseTypeRepository, VersionRepository
-from .infrastructure_api import GitApi, EnvironmentApi
-from .services import PrepareReleaseService, TagAndPushReleaseService
-from .domain import EnvironmentKeys
-from src.main.python.ddadevops.domain.release_config import ReleaseConfig
+from src.main.python.ddadevops.devops_build import DevopsBuild
+from src.main.python.ddadevops.infrastructure.release_mixin import ReleaseRepository, ReleaseTypeRepository, VersionRepository, GitApi, EnvironmentApi
+from src.main.python.ddadevops.application import PrepareReleaseService, TagAndPushReleaseService
+from src.main.python.ddadevops.domain import ReleaseConfig, EnvironmentKeys
 
 def create_release_mixin_config(config_file, main_branch) -> dict:
     config = {}