diff --git a/mlair/__init__.py b/mlair/__init__.py
index 8ff82e6c3457922927fa637579935a172a64bb7b..bf1a5fdd7eecc357899fa1f175339337ae346150 100644
--- a/mlair/__init__.py
+++ b/mlair/__init__.py
@@ -4,9 +4,10 @@ __version_info__ = {
     'micro': 0,
 }
 
-from mlair.run_modules import *
+from mlair.run_modules import RunEnvironment, ExperimentSetup, PreProcessing, ModelSetup, Training, PostProcessing
 from mlair.workflows import DefaultWorkflow, Workflow
 from mlair.run_script import run
+from mlair.model_modules import AbstractModelClass
 
 
 def get_version():
diff --git a/mlair/model_modules/__init__.py b/mlair/model_modules/__init__.py
index 35f4060886036d3f51c24b4480738566ff80a445..ea2067bdfdaacb6290157be681786212b0422812 100644
--- a/mlair/model_modules/__init__.py
+++ b/mlair/model_modules/__init__.py
@@ -1 +1,3 @@
 """Collection of all modules that are related to a model."""
+
+from .model_class import AbstractModelClass