diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index a535a2f33d06..2e91629bff99 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -85,6 +85,8 @@ SET(FemScripts_SRCS
     _ResultControlTaskPanel.py
     _JobControlTaskPanel.py
     _ViewProviderFemAnalysis.py
+    _FemAnalysis.py
+
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 5a725e3a8487..15b0e1b36c7b 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -27,6 +27,7 @@ INSTALL(
         _ResultControlTaskPanel.py
         _JobControlTaskPanel.py
         _ViewProviderFemAnalysis.py
+        _FemAnalysis.py
     DESTINATION
         Mod/Fem
 )
diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py
index 74c9220b3d51..f29a0fbeb03b 100644
--- a/src/Mod/Fem/MechanicalAnalysis.py
+++ b/src/Mod/Fem/MechanicalAnalysis.py
@@ -36,7 +36,8 @@
 def makeMechanicalAnalysis(name):
     '''makeFemAnalysis(name): makes a Fem Analysis object'''
     obj = FreeCAD.ActiveDocument.addObject("Fem::FemAnalysisPython", name)
-    _FemAnalysis(obj)
+    import _FemAnalysis
+    _FemAnalysis._FemAnalysis(obj)
     import _ViewProviderFemAnalysis
     _ViewProviderFemAnalysis._ViewProviderFemAnalysis()
     #FreeCAD.ActiveDocument.recompute()
@@ -224,27 +225,6 @@ def IsActive(self):
         return FreeCADGui.ActiveDocument is not None and results_present()
 
 
-class _FemAnalysis:
-    "The FemAnalysis container object"
-    def __init__(self, obj):
-        self.Type = "FemAnalysis"
-        obj.Proxy = self
-        obj.addProperty("App::PropertyString", "OutputDir", "Base", "Directory where the jobs get generated")
-
-    def execute(self, obj):
-        return
-
-    def onChanged(self, obj, prop):
-        if prop in ["MaterialName"]:
-            return
-
-    def __getstate__(self):
-        return self.Type
-
-    def __setstate__(self, state):
-        if state:
-            self.Type = state
-
 # Helpers
 
 
diff --git a/src/Mod/Fem/_FemAnalysis.py b/src/Mod/Fem/_FemAnalysis.py
new file mode 100644
index 000000000000..fd42318bf0ad
--- /dev/null
+++ b/src/Mod/Fem/_FemAnalysis.py
@@ -0,0 +1,20 @@
+class _FemAnalysis:
+    "The FemAnalysis container object"
+    def __init__(self, obj):
+        self.Type = "FemAnalysis"
+        obj.Proxy = self
+        obj.addProperty("App::PropertyString", "OutputDir", "Base", "Directory where the jobs get generated")
+
+    def execute(self, obj):
+        return
+
+    def onChanged(self, obj, prop):
+        if prop in ["MaterialName"]:
+            return
+
+    def __getstate__(self):
+        return self.Type
+
+    def __setstate__(self, state):
+        if state:
+            self.Type = state