diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 322c3c0be..1968b9c53 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -68,47 +68,48 @@ SET(Mod_SRCS
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})
 
 SET(FemScripts_SRCS
-    convert2TetGen.py
+    _CommandFemBeamSection.py
+    _CommandFemFromShape.py
+    _CommandFemShellThickness.py
+    _CommandMechanicalJobControl.py
+    _CommandMechanicalMaterial.py
+    _CommandMechanicalShowResult.py
+    _CommandNewMechanicalAnalysis.py
+    _CommandPurgeFemResults.py
+    _CommandQuickAnalysis.py
+    _FemAnalysis.py
+    _FemBeamSection.py
+    _FemShellThickness.py
+    _MechanicalMaterial.py
+    _TaskPanelFemBeamSection.py
+    _TaskPanelFemShellThickness.py
+    _TaskPanelJobControl.py
+    _TaskPanelMechanicalMaterial.py
+    _TaskPanelResultControl.py
+    _ViewProviderFemAnalysis.py
+    _ViewProviderFemBeamSection.py
+    _ViewProviderFemShellThickness.py
+    _ViewProviderMechanicalMaterial.py
     ccxDatReader.py
     ccxFrdReader.py
     ccxInpWriter.py
-    TestFem.py
-    FemTools.py
-    MechanicalAnalysis.ui
-    MechanicalAnalysis.py
-    ShowDisplacement.ui
+    convert2TetGen.py
+    Init.py
+    InitGui.py
     FemCommands.py
-    _TaskPanelResultControl.py
-    _TaskPanelJobControl.py
-    _ViewProviderFemAnalysis.py
-    _FemAnalysis.py
-    _CommandMechanicalShowResult.py
-    _CommandQuickAnalysis.py
-    _CommandPurgeFemResults.py
-    _CommandMechanicalJobControl.py
-    _CommandFemFromShape.py
-    _CommandNewMechanicalAnalysis.py
-
-    _FemBeamSection.py
-    _ViewProviderFemBeamSection.py
     FemBeamSection.py
-    _CommandFemBeamSection.py
-    _TaskPanelFemBeamSection.py
-    FemBeamSection.ui
-
-    _FemShellThickness.py
-    _ViewProviderFemShellThickness.py
+    FemExample.py
     FemShellThickness.py
-    _CommandFemShellThickness.py
-    _TaskPanelFemShellThickness.py
-    FemShellThickness.ui
-
-    _MechanicalMaterial.py
-    _ViewProviderMechanicalMaterial.py
+    FemTools.py
+    MechanicalAnalysis.py
     MechanicalMaterial.py
-    _CommandMechanicalMaterial.py
-    _TaskPanelMechanicalMaterial.py
+    TestFem.py
+
+    FemBeamSection.ui
+    FemShellThickness.ui
+    MechanicalAnalysis.ui
     MechanicalMaterial.ui
+    ShowDisplacement.ui
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 9000fe7f7..74acffce9 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -10,45 +10,53 @@ INSTALL(
         # changes on the file list here needs to be made in App/CMakeLists.txt as well
         Init.py
         InitGui.py
+
         convert2TetGen.py
+        FemExample.py
+
+        TestFem.py
+
         ccxDatReader.py
         ccxFrdReader.py
         ccxInpWriter.py
         FemTools.py
-        TestFem.py
-        FemExample.py
-        MechanicalAnalysis.py
-        MechanicalAnalysis.ui
-        ShowDisplacement.ui
+
         FemCommands.py
-        _TaskPanelResultControl.py
-        _TaskPanelJobControl.py
-        _ViewProviderFemAnalysis.py
-        _FemAnalysis.py
-        _CommandMechanicalShowResult.py
-        _CommandQuickAnalysis.py
-        _CommandPurgeFemResults.py
-        _CommandMechanicalJobControl.py
         _CommandFemFromShape.py
+        _CommandPurgeFemResults.py
+        _CommandQuickAnalysis.py
+
+        _CommandMechanicalShowResult.py
+        _TaskPanelResultControl.py
+        ShowDisplacement.ui
+
+        _FemAnalysis.py
+        _ViewProviderFemAnalysis.py
+
+        MechanicalAnalysis.py
         _CommandNewMechanicalAnalysis.py
 
+        _CommandMechanicalJobControl.py
+        _TaskPanelJobControl.py
+        MechanicalAnalysis.ui
+
+        FemBeamSection.py
         _FemBeamSection.py
         _ViewProviderFemBeamSection.py
-        FemBeamSection.py
         _CommandFemBeamSection.py
         _TaskPanelFemBeamSection.py
         FemBeamSection.ui
 
+        FemShellThickness.py
         _FemShellThickness.py
         _ViewProviderFemShellThickness.py
-        FemShellThickness.py
         _CommandFemShellThickness.py
         _TaskPanelFemShellThickness.py
         FemShellThickness.ui
 
+        MechanicalMaterial.py
         _MechanicalMaterial.py
         _ViewProviderMechanicalMaterial.py
-        MechanicalMaterial.py
         _CommandMechanicalMaterial.py
         _TaskPanelMechanicalMaterial.py
         MechanicalMaterial.ui