diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 32bb481bbc..ad0db4003b 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -4,10 +4,12 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
+
 if(BUILD_FEM_NETGEN)
     add_definitions(-DFCWithNetgen ${NETGEN_DEFINITIONS})
 endif(BUILD_FEM_NETGEN)
 
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -23,8 +25,10 @@ include_directories(
     ${VTK_INCLUDE_DIRS}
 )
 
+
 link_directories(${OCC_LIBRARY_DIR})
 
+
 set(Fem_LIBS
     Part
     FreeCADApp
@@ -34,30 +38,55 @@ set(Fem_LIBS
     SMESHDS
 )
 
+
 if(BUILD_FEM_NETGEN)
     list(APPEND Fem_LIBS
         NETGENPlugin
     )
 endif(BUILD_FEM_NETGEN)
 
+
 generate_from_xml(FemMeshPy)
 generate_from_xml(FemPostPipelinePy)
 
+
 SET(Python_SRCS
     FemMeshPy.xml
     FemMeshPyImp.cpp
     HypothesisPy.cpp
     HypothesisPy.h
 )
+
+
 if(BUILD_FEM_VTK)
-SET(Python_SRCS
-    ${Python_SRCS}
-    FemPostPipelinePy.xml
-    FemPostPipelinePyImp.cpp
-)
+    SET(Python_SRCS
+        ${Python_SRCS}
+        FemPostPipelinePy.xml
+        FemPostPipelinePyImp.cpp
+    )
 endif(BUILD_FEM_VTK)
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
+
+if(BUILD_FEM_VTK)
+    SET(FemPost_SRCS
+        PropertyPostDataObject.h
+        PropertyPostDataObject.cpp
+        FemPostObject.h
+        FemPostObject.cpp
+        FemPostPipeline.h
+        FemPostPipeline.cpp
+        FemPostFilter.h
+        FemPostFilter.cpp
+        FemPostFunction.h
+        FemPostFunction.cpp
+        FemVTKTools.h
+        FemVTKTools.cpp
+    )
+    SOURCE_GROUP("PostObjects" FILES ${FemPost_SRCS})
+endif(BUILD_FEM_VTK)
+
+
 SET(Mod_SRCS
     AppFem.cpp
     AppFemPy.cpp
@@ -68,45 +97,49 @@ SET(Mod_SRCS
 )
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})
 
+
 SET(FemScripts_SRCS
     Init.py
     InitGui.py
+    FemConstraint.py
     FemInputWriter.py
     FemToolsCcx.py
-    ObjectsFem.py
     FemUtils.py
-    FemConstraint.py
+    ObjectsFem.py
     TestFem.py
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 
+
 SET(FemObjectsScripts_SRCS
     PyObjects/__init__.py
-    PyObjects/_FemConstraintSelfWeight.py
     PyObjects/_FemConstraintBodyHeatSource.py
+    PyObjects/_FemConstraintElectrostaticPotential.py
     PyObjects/_FemConstraintFlowVelocity.py
     PyObjects/_FemConstraintInitialFlowVelocity.py
-    PyObjects/_FemConstraintElectrostaticPotential.py
+    PyObjects/_FemConstraintSelfWeight.py
     PyObjects/_FemElementFluid1D.py
     PyObjects/_FemElementGeometry1D.py
     PyObjects/_FemElementGeometry2D.py
+    PyObjects/_FemMaterial.py
     PyObjects/_FemMaterialMechanicalNonlinear.py
     PyObjects/_FemMeshBoundaryLayer.py
     PyObjects/_FemMeshGmsh.py
     PyObjects/_FemMeshGroup.py
-    PyObjects/_FemMeshResult.py
     PyObjects/_FemMeshRegion.py
+    PyObjects/_FemMeshResult.py
     PyObjects/_FemResultMechanical.py
     PyObjects/_FemSolverCalculix.py
-    PyObjects/_FemMaterial.py
 )
 
+
 SET(FemCommand_SRCS
     femcommand/__init__.py
     femcommand/commands.py
     femcommand/manager.py
 )
 
+
 SET(FemInterfaces_SRCS
     feminterface/__init__.py
     feminterface/convert2TetGen.py
@@ -124,6 +157,7 @@ SET(FemInterfaces_SRCS
     feminterface/writeFenicsXML.py
 )
 
+
 SET(FemMesh_SRCS
     femmesh/__init__.py
     femmesh/femmesh2mesh.py
@@ -131,24 +165,27 @@ SET(FemMesh_SRCS
     femmesh/meshtools.py
 )
 
+
 SET(FemResult_SRCS
     femresult/__init__.py
     femresult/resulttools.py
 )
 
+
 SET(FemSolver_SRCS
     femsolver/__init__.py
-    femsolver/solverbase.py
     femsolver/equationbase.py
     femsolver/report.py
     femsolver/reportdialog.py
-    femsolver/settings.py
-    femsolver/task.py
     femsolver/run.py
+    femsolver/settings.py
     femsolver/signal.py
+    femsolver/solverbase.py
+    femsolver/task.py
 )
 
-SET(FemElmer_SRCS
+
+SET(FemSolverElmer_SRCS
     femsolver/elmer/__init__.py
     femsolver/elmer/sifio.py
     femsolver/elmer/solver.py
@@ -156,35 +193,37 @@ SET(FemElmer_SRCS
     femsolver/elmer/writer.py
 )
 
-SET(FemEquationsElmer_SRCS
+
+SET(FemSolverElmerEquations_SRCS
     femsolver/elmer/equations/__init__.py
-    femsolver/elmer/equations/equation.py
-    femsolver/elmer/equations/linear.py
-    femsolver/elmer/equations/nonlinear.py
-    femsolver/elmer/equations/elasticity.py
     femsolver/elmer/equations/electrostatic.py
+    femsolver/elmer/equations/elasticity.py
+    femsolver/elmer/equations/equation.py
+    femsolver/elmer/equations/flow.py
     femsolver/elmer/equations/fluxsolver.py
     femsolver/elmer/equations/heat.py
-    femsolver/elmer/equations/flow.py
+    femsolver/elmer/equations/linear.py
+    femsolver/elmer/equations/nonlinear.py
 )
 
-SET(FemCalculix_SRCS
+
+SET(FemSolverCalculix_SRCS
     femsolver/calculix/__init__.py
     femsolver/calculix/solver.py
     femsolver/calculix/tasks.py
     femsolver/calculix/writer.py
 )
 
-SET(FemZ88_SRCS
+
+SET(FemSolverZ88_SRCS
     femsolver/z88/__init__.py
     femsolver/z88/solver.py
     femsolver/z88/tasks.py
     femsolver/z88/writer.py
 )
 
+
 SET(FemGuiScripts_SRCS
-    PyGui/FemSelectionObserver.py
-    PyGui/FemSelectionWidgets.py
     PyGui/__init__.py
     PyGui/_TaskPanelFemElementFluid1D.py
     PyGui/_TaskPanelFemElementGeometry1D.py
@@ -197,11 +236,11 @@ SET(FemGuiScripts_SRCS
     PyGui/_TaskPanelFemResultShow.py
     PyGui/_TaskPanelFemSolverCalculix.py
     PyGui/_TaskPanelFemSolverControl.py
-    PyGui/_ViewProviderFemConstraintSelfWeight.py
     PyGui/_ViewProviderFemConstraintBodyHeatSource.py
+    PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
     PyGui/_ViewProviderFemConstraintFlowVelocity.py
     PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
-    PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
+    PyGui/_ViewProviderFemConstraintSelfWeight.py
     PyGui/_ViewProviderFemElementFluid1D.py
     PyGui/_ViewProviderFemElementGeometry1D.py
     PyGui/_ViewProviderFemElementGeometry2D.py
@@ -214,9 +253,14 @@ SET(FemGuiScripts_SRCS
     PyGui/_ViewProviderFemMeshResult.py
     PyGui/_ViewProviderFemResultMechanical.py
     PyGui/_ViewProviderFemSolverCalculix.py
+    PyGui/FemSelectionObserver.py
+    PyGui/FemSelectionWidgets.py
+    PyGui/TaskPanelFemElectrostaticPotential.ui
     PyGui/TaskPanelFemElementFluid1D.ui
     PyGui/TaskPanelFemElementGeometry1D.ui
     PyGui/TaskPanelFemElementGeometry2D.ui
+    PyGui/TaskPanelFemFlowVelocity.ui
+    PyGui/TaskPanelFemInitialFlowVelocity.ui
     PyGui/TaskPanelFemMaterial.ui
     PyGui/TaskPanelFemMeshBoundaryLayer.ui
     PyGui/TaskPanelFemMeshGmsh.ui
@@ -225,17 +269,16 @@ SET(FemGuiScripts_SRCS
     PyGui/TaskPanelFemMeshRegion.ui
     PyGui/TaskPanelFemResultShow.ui
     PyGui/TaskPanelFemSolverCalculix.ui
-    PyGui/TaskPanelFemFlowVelocity.ui
-    PyGui/TaskPanelFemInitialFlowVelocity.ui
-    PyGui/TaskPanelFemElectrostaticPotential.ui
 )
 
+
 SET(FemTests_SRCS
     femtest/__init__.py
     femtest/testfemcommon.py
 )
 
-SET(FemTestsCCx_SRCS
+
+SET(FemTestsCcx_SRCS
     femtest/testfiles/__init__.py
     femtest/testfiles/ccx/__init__.py
     femtest/testfiles/ccx/cube_mesh.py
@@ -263,6 +306,7 @@ SET(FemTestsCCx_SRCS
     femtest/testfiles/ccx/Flow1D_thermomech.fcstd
 )
 
+
 SET(FemTestsElmer_SRCS
     femtest/testfiles/elmer/__init__.py
     femtest/testfiles/elmer/case.sif
@@ -270,6 +314,7 @@ SET(FemTestsElmer_SRCS
     femtest/testfiles/elmer/ELMERSOLVER_STARTINFO
 )
 
+
 SET(FemBase_SRCS
     FemMeshObject.cpp
     FemMeshObject.h
@@ -307,6 +352,7 @@ SET(FemSet_SRCS
     )
 SOURCE_GROUP("Set objects" FILES ${FemSet_SRCS})
 
+
 SET(FemConstraints_SRCS
     FemConstraintBearing.h
     FemConstraintBearing.cpp
@@ -339,34 +385,19 @@ SET(FemConstraints_SRCS
     )
 SOURCE_GROUP("Constraints" FILES ${FemConstraints_SRCS})
 
-if(BUILD_FEM_VTK)
-    SET(FemPost_SRCS
-        PropertyPostDataObject.h
-        PropertyPostDataObject.cpp
-        FemPostObject.h
-        FemPostObject.cpp
-        FemPostPipeline.h
-        FemPostPipeline.cpp
-        FemPostFilter.h
-        FemPostFilter.cpp
-        FemPostFunction.h
-        FemPostFunction.cpp
-        FemVTKTools.h
-        FemVTKTools.cpp
-    )
-    SOURCE_GROUP("PostObjects" FILES ${FemPost_SRCS})
-endif(BUILD_FEM_VTK)
+
 
 
 SET(Fem_SRCS
     ${FemBase_SRCS}
-    ${FemSet_SRCS}
     ${FemConstraints_SRCS}
     ${FemPost_SRCS}
+    ${FemSet_SRCS}
     ${Mod_SRCS}
     ${Python_SRCS}
 )
 
+
 add_library(Fem SHARED ${Fem_SRCS})
 target_link_libraries(Fem ${Fem_LIBS} ${VTK_LIBRARIES})
 
@@ -376,23 +407,25 @@ fc_target_copy_resource(Fem
     ${CMAKE_BINARY_DIR}/Mod/Fem
     Init.py
     ${FemCommand_SRCS}
-    ${FemScripts_SRCS}
-    ${FemObjectsScripts_SRCS}
+    ${FemGuiScripts_SRCS}
     ${FemInterfaces_SRCS}
     ${FemMesh_SRCS}
+    ${FemObjectsScripts_SRCS}
+    ${FemScripts_SRCS}
     ${FemResult_SRCS}
-    ${FemGuiScripts_SRCS}
-    ${FemTests_SRCS}
-    ${FemTestsCCx_SRCS}
-    ${FemTestsElmer_SRCS}
     ${FemSolver_SRCS}
-    ${FemElmer_SRCS}
-    ${FemCalculix_SRCS}
-    ${FemZ88_SRCS}
-    ${FemEquationsElmer_SRCS}
+    ${FemSolverCalculix_SRCS}
+    ${FemSolverElmer_SRCS}
+    ${FemSolverElmerEquations_SRCS}
+    ${FemSolverZ88_SRCS}
+    ${FemTests_SRCS}
+    ${FemTestsCcx_SRCS}
+    ${FemTestsElmer_SRCS}
 )
 
+
 SET_BIN_DIR(Fem Fem /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(Fem)
 
+
 INSTALL(TARGETS Fem DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index c441825286..c23b26ffcb 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -29,30 +29,6 @@ INSTALL(
         Mod/Fem
 )
 
-INSTALL(
-    FILES
-        PyObjects/__init__.py
-        PyObjects/_FemConstraintSelfWeight.py
-        PyObjects/_FemConstraintBodyHeatSource.py
-        PyObjects/_FemConstraintFlowVelocity.py
-        PyObjects/_FemConstraintInitialFlowVelocity.py
-        PyObjects/_FemConstraintElectrostaticPotential.py
-        PyObjects/_FemElementFluid1D.py
-        PyObjects/_FemElementGeometry1D.py
-        PyObjects/_FemElementGeometry2D.py
-        PyObjects/_FemMaterialMechanicalNonlinear.py
-        PyObjects/_FemMeshBoundaryLayer.py
-        PyObjects/_FemMeshGmsh.py
-        PyObjects/_FemMeshGroup.py
-        PyObjects/_FemMeshRegion.py
-        PyObjects/_FemMeshResult.py
-        PyObjects/_FemResultMechanical.py
-        PyObjects/_FemSolverCalculix.py
-        PyObjects/_FemMaterial.py
-    DESTINATION
-        Mod/Fem/PyObjects
-)
-
 INSTALL(
     FILES
         femcommand/__init__.py
@@ -115,6 +91,16 @@ INSTALL(
         Mod/Fem/femsolver
 )
 
+INSTALL(
+    FILES
+        femsolver/calculix/__init__.py
+        femsolver/calculix/solver.py
+        femsolver/calculix/tasks.py
+        femsolver/calculix/writer.py
+    DESTINATION
+        Mod/Fem/femsolver/calculix
+)
+
 INSTALL(
     FILES
         femsolver/elmer/__init__.py
@@ -141,16 +127,6 @@ INSTALL(
         Mod/Fem/femsolver/elmer/equations
 )
 
-INSTALL(
-    FILES
-        femsolver/calculix/__init__.py
-        femsolver/calculix/solver.py
-        femsolver/calculix/tasks.py
-        femsolver/calculix/writer.py
-    DESTINATION
-        Mod/Fem/femsolver/calculix
-)
-
 INSTALL(
     FILES
         femsolver/z88/__init__.py
@@ -161,57 +137,6 @@ INSTALL(
         Mod/Fem/femsolver/z88
 )
 
-INSTALL(
-    FILES
-        PyGui/FemSelectionObserver.py
-        PyGui/FemSelectionWidgets.py
-        PyGui/__init__.py
-        PyGui/_TaskPanelFemElementFluid1D.py
-        PyGui/_TaskPanelFemElementGeometry1D.py
-        PyGui/_TaskPanelFemElementGeometry2D.py
-        PyGui/_TaskPanelFemMaterial.py
-        PyGui/_TaskPanelFemMeshBoundaryLayer.py
-        PyGui/_TaskPanelFemMeshGmsh.py
-        PyGui/_TaskPanelFemMeshGroup.py
-        PyGui/_TaskPanelFemMeshRegion.py
-        PyGui/_TaskPanelFemResultShow.py
-        PyGui/_TaskPanelFemSolverCalculix.py
-        PyGui/_TaskPanelFemSolverControl.py
-        PyGui/_ViewProviderFemConstraintSelfWeight.py
-        PyGui/_ViewProviderFemConstraintBodyHeatSource.py
-        PyGui/_ViewProviderFemConstraintFlowVelocity.py
-        PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
-        PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
-        PyGui/_ViewProviderFemElementFluid1D.py
-        PyGui/_ViewProviderFemElementGeometry1D.py
-        PyGui/_ViewProviderFemElementGeometry2D.py
-        PyGui/_ViewProviderFemMaterial.py
-        PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
-        PyGui/_ViewProviderFemMeshBoundaryLayer.py
-        PyGui/_ViewProviderFemMeshGmsh.py
-        PyGui/_ViewProviderFemMeshGroup.py
-        PyGui/_ViewProviderFemMeshRegion.py
-        PyGui/_ViewProviderFemMeshResult.py
-        PyGui/_ViewProviderFemResultMechanical.py
-        PyGui/_ViewProviderFemSolverCalculix.py
-        PyGui/TaskPanelFemElementFluid1D.ui
-        PyGui/TaskPanelFemElementGeometry1D.ui
-        PyGui/TaskPanelFemElementGeometry2D.ui
-        PyGui/TaskPanelFemMaterial.ui
-        PyGui/TaskPanelFemMeshBoundaryLayer.ui
-        PyGui/TaskPanelFemMeshGmsh.ui
-        PyGui/TaskPanelFemMeshGroup.ui
-        PyGui/TaskPanelFemMeshGroupXDMFExport.ui
-        PyGui/TaskPanelFemMeshRegion.ui
-        PyGui/TaskPanelFemResultShow.ui
-        PyGui/TaskPanelFemSolverCalculix.ui
-        PyGui/TaskPanelFemFlowVelocity.ui
-        PyGui/TaskPanelFemInitialFlowVelocity.ui
-        PyGui/TaskPanelFemElectrostaticPotential.ui
-    DESTINATION
-        Mod/Fem/PyGui
-)
-
 INSTALL(
     FILES
         femtest/__init__.py
@@ -266,3 +191,78 @@ INSTALL(
     DESTINATION
         Mod/Fem/femtest/testfiles/elmer
 )
+
+INSTALL(
+    FILES
+        PyObjects/__init__.py
+        PyObjects/_FemConstraintSelfWeight.py
+        PyObjects/_FemConstraintBodyHeatSource.py
+        PyObjects/_FemConstraintFlowVelocity.py
+        PyObjects/_FemConstraintInitialFlowVelocity.py
+        PyObjects/_FemConstraintElectrostaticPotential.py
+        PyObjects/_FemElementFluid1D.py
+        PyObjects/_FemElementGeometry1D.py
+        PyObjects/_FemElementGeometry2D.py
+        PyObjects/_FemMaterialMechanicalNonlinear.py
+        PyObjects/_FemMeshBoundaryLayer.py
+        PyObjects/_FemMeshGmsh.py
+        PyObjects/_FemMeshGroup.py
+        PyObjects/_FemMeshRegion.py
+        PyObjects/_FemMeshResult.py
+        PyObjects/_FemResultMechanical.py
+        PyObjects/_FemSolverCalculix.py
+        PyObjects/_FemMaterial.py
+    DESTINATION
+        Mod/Fem/PyObjects
+)
+
+INSTALL(
+    FILES
+        PyGui/FemSelectionObserver.py
+        PyGui/FemSelectionWidgets.py
+        PyGui/__init__.py
+        PyGui/_TaskPanelFemElementFluid1D.py
+        PyGui/_TaskPanelFemElementGeometry1D.py
+        PyGui/_TaskPanelFemElementGeometry2D.py
+        PyGui/_TaskPanelFemMaterial.py
+        PyGui/_TaskPanelFemMeshBoundaryLayer.py
+        PyGui/_TaskPanelFemMeshGmsh.py
+        PyGui/_TaskPanelFemMeshGroup.py
+        PyGui/_TaskPanelFemMeshRegion.py
+        PyGui/_TaskPanelFemResultShow.py
+        PyGui/_TaskPanelFemSolverCalculix.py
+        PyGui/_TaskPanelFemSolverControl.py
+        PyGui/_ViewProviderFemConstraintSelfWeight.py
+        PyGui/_ViewProviderFemConstraintBodyHeatSource.py
+        PyGui/_ViewProviderFemConstraintFlowVelocity.py
+        PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
+        PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
+        PyGui/_ViewProviderFemElementFluid1D.py
+        PyGui/_ViewProviderFemElementGeometry1D.py
+        PyGui/_ViewProviderFemElementGeometry2D.py
+        PyGui/_ViewProviderFemMaterial.py
+        PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
+        PyGui/_ViewProviderFemMeshBoundaryLayer.py
+        PyGui/_ViewProviderFemMeshGmsh.py
+        PyGui/_ViewProviderFemMeshGroup.py
+        PyGui/_ViewProviderFemMeshRegion.py
+        PyGui/_ViewProviderFemMeshResult.py
+        PyGui/_ViewProviderFemResultMechanical.py
+        PyGui/_ViewProviderFemSolverCalculix.py
+        PyGui/TaskPanelFemElementFluid1D.ui
+        PyGui/TaskPanelFemElementGeometry1D.ui
+        PyGui/TaskPanelFemElementGeometry2D.ui
+        PyGui/TaskPanelFemMaterial.ui
+        PyGui/TaskPanelFemMeshBoundaryLayer.ui
+        PyGui/TaskPanelFemMeshGmsh.ui
+        PyGui/TaskPanelFemMeshGroup.ui
+        PyGui/TaskPanelFemMeshGroupXDMFExport.ui
+        PyGui/TaskPanelFemMeshRegion.ui
+        PyGui/TaskPanelFemResultShow.ui
+        PyGui/TaskPanelFemSolverCalculix.ui
+        PyGui/TaskPanelFemFlowVelocity.ui
+        PyGui/TaskPanelFemInitialFlowVelocity.ui
+        PyGui/TaskPanelFemElectrostaticPotential.ui
+    DESTINATION
+        Mod/Fem/PyGui
+)
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 5643818f6c..22e1fa4977 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -4,10 +4,12 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
+
 if(BUILD_FEM_NETGEN)
     add_definitions(-DFCWithNetgen)
 endif(BUILD_FEM_NETGEN)
 
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -25,14 +27,15 @@ include_directories(
 link_directories(${OCC_LIBRARY_DIR})
 
 
-
 set(FemGui_LIBS
     Fem
     FreeCADGui
 )
 
+
 generate_from_xml(ViewProviderFemMeshPy)
 
+
 SET(Python_SRCS
     ViewProviderFemMeshPy.xml
     ViewProviderFemMeshPyImp.cpp
@@ -82,6 +85,7 @@ endif(BUILD_FEM_VTK)
 fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
 
+
 set(FemGui_UIC_SRCS
     DlgSettingsFemCcx.ui
     DlgSettingsFemExportAbaqus.ui
@@ -122,12 +126,14 @@ if(BUILD_FEM_VTK)
     )
 endif(BUILD_FEM_VTK)
 
+
 if(BUILD_QT5)
     qt5_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
 else()
     qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
 endif()
 
+
 SET(FemGui_DLG_SRCS
     ${FemGui_UIC_HDRS}
     DlgSettingsFemCcx.ui
@@ -194,14 +200,15 @@ SET(FemGui_DLG_SRCS
 )
 SOURCE_GROUP("Constraint-Dialogs" FILES ${FemGui_DLG_SRCS})
 
+
 if(BUILD_QT5)
     qt5_add_resources(FemResource_SRCS Resources/Fem.qrc)
 else()
     qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)
 endif()
-
 SOURCE_GROUP("Resources" FILES ${FemResource_SRCS})
 
+
 SET(FemGui_SRCS_ViewProvider
     ViewProviderFemMesh.cpp
     ViewProviderFemMesh.h
@@ -258,6 +265,7 @@ SET(FemGui_SRCS_ViewProvider
 )
 SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider})
 
+
 SET(FemGui_SRCS_TaskBoxes
     TaskObjectName.ui
     TaskObjectName.cpp
@@ -292,6 +300,7 @@ if(BUILD_FEM_VTK)
 endif(BUILD_FEM_VTK)
 SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes})
 
+
 SET(FemGui_SRCS_TaskDlg
     TaskDlgCreateNodeSet.h
     TaskDlgCreateNodeSet.cpp
@@ -302,6 +311,7 @@ SET(FemGui_SRCS_TaskDlg
 )
 SOURCE_GROUP("Task_Dialogs" FILES ${FemGui_SRCS_TaskDlg})
 
+
 SET(FemGui_SRCS_Module
     AppFemGui.cpp
     AppFemGuiPy.cpp
@@ -320,6 +330,7 @@ SET(FemGui_SRCS_Module
 )
 SOURCE_GROUP("Module" FILES ${FemGui_SRCS_Module})
 
+
 if(BUILD_FEM_VTK)
     SET(FemGui_SRCS_Post
         ViewProviderFemPostObject.h
@@ -334,6 +345,7 @@ if(BUILD_FEM_VTK)
     SOURCE_GROUP("PostObjects" FILES ${FemGui_SRCS_Post})
 endif(BUILD_FEM_VTK)
 
+
 SET(FemGui_SRCS
     ${Python_SRCS}
     ${FemGui_DLG_SRCS}
@@ -356,15 +368,20 @@ fc_target_copy_resource(FemGui
     InitGui.py
     )
 
+
 SET(FemGuiIcon_SVG
     Resources/icons/FemWorkbench.svg
 )
 
+
 fc_copy_sources(FemGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Fem" ${FemGuiIcon_SVG})
 
+
 INSTALL(FILES ${FemGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Fem/Resources/icons")
 
+
 SET_BIN_DIR(FemGui FemGui /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(FemGui)
 
+
 INSTALL(TARGETS FemGui DESTINATION ${CMAKE_INSTALL_LIBDIR})