diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 3092bd89dc..e1a3525e3e 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -23,7 +23,6 @@ SET(FemScripts_SRCS
     Init.py
     InitGui.py
     FemConstraint.py
-    FemInputWriter.py
     FemToolsCcx.py
     FemUtils.py
     ObjectsFem.py
@@ -75,6 +74,7 @@ SET(FemSolver_SRCS
     femsolver/signal.py
     femsolver/solverbase.py
     femsolver/task.py
+    femsolver/writerbase.py
 )
 
 SET(FemSolverElmer_SRCS
diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
index b582f81764..150c2424db 100644
--- a/src/Mod/Fem/femsolver/calculix/writer.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -33,7 +33,7 @@ import os
 import sys
 import time
 import femmesh.meshtools as FemMeshTools
-import FemInputWriter
+from .. import writerbase as FemInputWriter
 import six
 
 
diff --git a/src/Mod/Fem/FemInputWriter.py b/src/Mod/Fem/femsolver/writerbase.py
similarity index 100%
rename from src/Mod/Fem/FemInputWriter.py
rename to src/Mod/Fem/femsolver/writerbase.py
diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py
index ce7f6c867c..89c98ae9b8 100644
--- a/src/Mod/Fem/femsolver/z88/writer.py
+++ b/src/Mod/Fem/femsolver/z88/writer.py
@@ -31,7 +31,7 @@ import FreeCAD
 import time
 import femmesh.meshtools as FemMeshTools
 import feminout.importZ88Mesh as importZ88Mesh
-import FemInputWriter
+from .. import writerbase as FemInputWriter
 
 
 class FemInputWriterZ88(FemInputWriter.FemInputWriter):