diff --git a/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py b/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
new file mode 100644
index 0000000..8d31c07
--- /dev/null
+++ b/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
@@ -0,0 +1,2 @@
+from .infrastructure_api import FileHandler, SystemApi, EnvironmentApi, GitApi, JsonFileHandler, GradleFileHandler, PythonFileHandler, ClojureFileHandler
+from .repo import VersionRepository, ReleaseRepository, ReleaseTypeRepository
\ No newline at end of file
diff --git a/src/main/python/ddadevops/release_mixin/infrastructure_api.py b/src/main/python/ddadevops/infrastructure/release_mixin/infrastructure_api.py
similarity index 99%
rename from src/main/python/ddadevops/release_mixin/infrastructure_api.py
rename to src/main/python/ddadevops/infrastructure/release_mixin/infrastructure_api.py
index 520b744..521e00a 100644
--- a/src/main/python/ddadevops/release_mixin/infrastructure_api.py
+++ b/src/main/python/ddadevops/infrastructure/release_mixin/infrastructure_api.py
@@ -1,4 +1,3 @@
-# TODO: jem, zam - 2023_04_18: Mv this to an infrastructure namespace?
 import json
 import re
 import subprocess as sub
diff --git a/src/main/python/ddadevops/release_mixin/infrastructure.py b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py
similarity index 93%
rename from src/main/python/ddadevops/release_mixin/infrastructure.py
rename to src/main/python/ddadevops/infrastructure/release_mixin/repo.py
index 7adae14..bf1a7f7 100644
--- a/src/main/python/ddadevops/release_mixin/infrastructure.py
+++ b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py
@@ -1,6 +1,5 @@
-# TODO: jem, zam - 2023_04_18: move content to src/main/python/ddadevops/infrastructure/repo.py (or subdir)
-from .domain import Release, Version, ReleaseType, EnvironmentKeys
-from .infrastructure_api import FileHandler, GitApi, EnvironmentApi
+from src.main.python.ddadevops.domain import Release, Version, ReleaseType, EnvironmentKeys
+from src.main.python.ddadevops.infrastructure.release_mixin import FileHandler, GitApi, EnvironmentApi
 
 
 class VersionRepository():