diff --git a/python/damask/__init__.py b/python/damask/__init__.py
index 7933651da..a6901ca7d 100644
--- a/python/damask/__init__.py
+++ b/python/damask/__init__.py
@@ -16,7 +16,7 @@ from ._lattice     import Symmetry, Lattice# noqa
 from ._orientation import Orientation      # noqa
 from ._result      import Result           # noqa
 from ._geom        import Geom             # noqa
-from ._solver      import Solver           # noqa
+from .             import solver           # noqa
 
 # deprecated
 from ._asciitable import ASCIItable       # noqa
diff --git a/python/damask/_solver/__init__.py b/python/damask/_solver/__init__.py
deleted file mode 100644
index a1939eb55..000000000
--- a/python/damask/_solver/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""Tools to control the various solvers."""
-
-from .solver   import Solver     # noqa
-from .marc     import Marc       # noqa
diff --git a/python/damask/solver/__init__.py b/python/damask/solver/__init__.py
new file mode 100644
index 000000000..298adb1f7
--- /dev/null
+++ b/python/damask/solver/__init__.py
@@ -0,0 +1,3 @@
+"""Tools to control the various solvers."""
+
+from ._marc     import Marc       # noqa
diff --git a/python/damask/_solver/marc.py b/python/damask/solver/_marc.py
similarity index 99%
rename from python/damask/_solver/marc.py
rename to python/damask/solver/_marc.py
index f7dda9c37..d90dd9fd0 100644
--- a/python/damask/_solver/marc.py
+++ b/python/damask/solver/_marc.py
@@ -3,7 +3,7 @@ import subprocess
 import shlex
 import string
 
-from .solver import Solver
+from ._solver import Solver
 import damask
 
 class Marc(Solver):
diff --git a/python/damask/_solver/solver.py b/python/damask/solver/_solver.py
similarity index 100%
rename from python/damask/_solver/solver.py
rename to python/damask/solver/_solver.py