diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 84ab61850a..a52594c1f6 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -86,7 +86,6 @@ SET(FemScripts_SRCS
     InitGui.py
     FemGmshTools.py
     FemInputWriter.py
-    FemInputWriterCcx.py
     FemMesh2Mesh.py
     FemMeshTools.py
     FemResultTools.py
@@ -130,6 +129,7 @@ SET(FemCalculix_SRCS
     femsolver/calculix/__init__.py
     femsolver/calculix/solver.py
     femsolver/calculix/tasks.py
+    femsolver/calculix/writer.py
 )
 
 SET(FemZ88_SRCS
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 0f40d9245b..227fbd20a2 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -34,7 +34,6 @@ INSTALL(
         InitGui.py
         FemGmshTools.py
         FemInputWriter.py
-        FemInputWriterCcx.py
         FemMesh2Mesh.py
         FemMeshTools.py
         FemResultTools.py
@@ -86,6 +85,7 @@ INSTALL(
         femsolver/calculix/__init__.py
         femsolver/calculix/solver.py
         femsolver/calculix/tasks.py
+        femsolver/calculix/writer.py
     DESTINATION
         Mod/Fem/femsolver/calculix
 )
diff --git a/src/Mod/Fem/FemToolsCcx.py b/src/Mod/Fem/FemToolsCcx.py
index 7d3f003be4..8bc1865c98 100644
--- a/src/Mod/Fem/FemToolsCcx.py
+++ b/src/Mod/Fem/FemToolsCcx.py
@@ -86,7 +86,7 @@ class FemToolsCcx(FemTools.FemTools):
             raise Exception('FEM: No active analysis found!')
 
     def write_inp_file(self):
-        import FemInputWriterCcx as iw
+        import femsolver.calculix.writer as iw
         import sys
         self.inp_file_name = ""
         try:
diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py
index c9c718d3c0..5c12561517 100644
--- a/src/Mod/Fem/femsolver/calculix/tasks.py
+++ b/src/Mod/Fem/femsolver/calculix/tasks.py
@@ -38,7 +38,7 @@ import importCcxDatResults
 
 from .. import run
 from .. import settings
-from FemInputWriterCcx
+from . import writer
 
 
 _inputFileName = None
@@ -58,7 +58,7 @@ class Prepare(run.Prepare):
         global _inputFileName
         self.pushStatus("Preparing input files...\n")
         c = _Container(self.analysis)
-        w = FemInputWriterCcx.FemInputWriterCcx(
+        w = writer.FemInputWriterCcx(
             self.analysis, self.solver, c.mesh, c.materials_linear,
             c.materials_nonlinear, c.fixed_constraints,
             c.displacement_constraints, c.contact_constraints,
diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/femsolver/calculix/writer.py
similarity index 99%
rename from src/Mod/Fem/FemInputWriterCcx.py
rename to src/Mod/Fem/femsolver/calculix/writer.py
index 46561d66a6..f52c3291ec 100644
--- a/src/Mod/Fem/FemInputWriterCcx.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -21,7 +21,7 @@
 # *                                                                         *
 # ***************************************************************************
 
-__title__ = "FemInputWriterCcx"
+__title__ = "CalculiX Writer"
 __author__ = "Przemo Firszt, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"