diff --git a/src/Mod/Fem/FemCommands.py b/src/Mod/Fem/PyGui/FemCommands.py
similarity index 100%
rename from src/Mod/Fem/FemCommands.py
rename to src/Mod/Fem/PyGui/FemCommands.py
diff --git a/src/Mod/Fem/TaskPanelFemBeamSection.ui b/src/Mod/Fem/PyGui/TaskPanelFemBeamSection.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemBeamSection.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemBeamSection.ui
diff --git a/src/Mod/Fem/TaskPanelFemMaterial.ui b/src/Mod/Fem/PyGui/TaskPanelFemMaterial.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemMaterial.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemMaterial.ui
diff --git a/src/Mod/Fem/TaskPanelFemMeshGmsh.ui b/src/Mod/Fem/PyGui/TaskPanelFemMeshGmsh.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemMeshGmsh.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemMeshGmsh.ui
diff --git a/src/Mod/Fem/TaskPanelFemMeshGroup.ui b/src/Mod/Fem/PyGui/TaskPanelFemMeshGroup.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemMeshGroup.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemMeshGroup.ui
diff --git a/src/Mod/Fem/TaskPanelFemMeshRegion.ui b/src/Mod/Fem/PyGui/TaskPanelFemMeshRegion.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemMeshRegion.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemMeshRegion.ui
diff --git a/src/Mod/Fem/TaskPanelFemShellThickness.ui b/src/Mod/Fem/PyGui/TaskPanelFemShellThickness.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemShellThickness.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemShellThickness.ui
diff --git a/src/Mod/Fem/TaskPanelFemSolverCalculix.ui b/src/Mod/Fem/PyGui/TaskPanelFemSolverCalculix.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelFemSolverCalculix.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemSolverCalculix.ui
diff --git a/src/Mod/Fem/TaskPanelShowResult.ui b/src/Mod/Fem/PyGui/TaskPanelShowResult.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelShowResult.ui
rename to src/Mod/Fem/PyGui/TaskPanelShowResult.ui
diff --git a/src/Mod/Fem/_CommandAnalysis.py b/src/Mod/Fem/PyGui/_CommandAnalysis.py
similarity index 100%
rename from src/Mod/Fem/_CommandAnalysis.py
rename to src/Mod/Fem/PyGui/_CommandAnalysis.py
diff --git a/src/Mod/Fem/_CommandBeamSection.py b/src/Mod/Fem/PyGui/_CommandBeamSection.py
similarity index 100%
rename from src/Mod/Fem/_CommandBeamSection.py
rename to src/Mod/Fem/PyGui/_CommandBeamSection.py
diff --git a/src/Mod/Fem/_CommandClearMesh.py b/src/Mod/Fem/PyGui/_CommandClearMesh.py
similarity index 100%
rename from src/Mod/Fem/_CommandClearMesh.py
rename to src/Mod/Fem/PyGui/_CommandClearMesh.py
diff --git a/src/Mod/Fem/_CommandConstraintSelfWeight.py b/src/Mod/Fem/PyGui/_CommandConstraintSelfWeight.py
similarity index 100%
rename from src/Mod/Fem/_CommandConstraintSelfWeight.py
rename to src/Mod/Fem/PyGui/_CommandConstraintSelfWeight.py
diff --git a/src/Mod/Fem/_CommandControlSolver.py b/src/Mod/Fem/PyGui/_CommandControlSolver.py
similarity index 100%
rename from src/Mod/Fem/_CommandControlSolver.py
rename to src/Mod/Fem/PyGui/_CommandControlSolver.py
diff --git a/src/Mod/Fem/_CommandFEMMesh2Mesh.py b/src/Mod/Fem/PyGui/_CommandFEMMesh2Mesh.py
similarity index 100%
rename from src/Mod/Fem/_CommandFEMMesh2Mesh.py
rename to src/Mod/Fem/PyGui/_CommandFEMMesh2Mesh.py
diff --git a/src/Mod/Fem/_CommandMaterialFluid.py b/src/Mod/Fem/PyGui/_CommandMaterialFluid.py
similarity index 100%
rename from src/Mod/Fem/_CommandMaterialFluid.py
rename to src/Mod/Fem/PyGui/_CommandMaterialFluid.py
diff --git a/src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyGui/_CommandMaterialMechanicalNonlinear.py
similarity index 100%
rename from src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py
rename to src/Mod/Fem/PyGui/_CommandMaterialMechanicalNonlinear.py
diff --git a/src/Mod/Fem/_CommandMaterialSolid.py b/src/Mod/Fem/PyGui/_CommandMaterialSolid.py
similarity index 100%
rename from src/Mod/Fem/_CommandMaterialSolid.py
rename to src/Mod/Fem/PyGui/_CommandMaterialSolid.py
diff --git a/src/Mod/Fem/_CommandMeshGmshFromShape.py b/src/Mod/Fem/PyGui/_CommandMeshGmshFromShape.py
similarity index 100%
rename from src/Mod/Fem/_CommandMeshGmshFromShape.py
rename to src/Mod/Fem/PyGui/_CommandMeshGmshFromShape.py
diff --git a/src/Mod/Fem/_CommandMeshGroup.py b/src/Mod/Fem/PyGui/_CommandMeshGroup.py
similarity index 100%
rename from src/Mod/Fem/_CommandMeshGroup.py
rename to src/Mod/Fem/PyGui/_CommandMeshGroup.py
diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/PyGui/_CommandMeshNetgenFromShape.py
similarity index 100%
rename from src/Mod/Fem/_CommandMeshNetgenFromShape.py
rename to src/Mod/Fem/PyGui/_CommandMeshNetgenFromShape.py
diff --git a/src/Mod/Fem/_CommandMeshRegion.py b/src/Mod/Fem/PyGui/_CommandMeshRegion.py
similarity index 100%
rename from src/Mod/Fem/_CommandMeshRegion.py
rename to src/Mod/Fem/PyGui/_CommandMeshRegion.py
diff --git a/src/Mod/Fem/_CommandPrintMeshInfo.py b/src/Mod/Fem/PyGui/_CommandPrintMeshInfo.py
similarity index 100%
rename from src/Mod/Fem/_CommandPrintMeshInfo.py
rename to src/Mod/Fem/PyGui/_CommandPrintMeshInfo.py
diff --git a/src/Mod/Fem/_CommandPurgeResults.py b/src/Mod/Fem/PyGui/_CommandPurgeResults.py
similarity index 100%
rename from src/Mod/Fem/_CommandPurgeResults.py
rename to src/Mod/Fem/PyGui/_CommandPurgeResults.py
diff --git a/src/Mod/Fem/_CommandRunSolver.py b/src/Mod/Fem/PyGui/_CommandRunSolver.py
similarity index 100%
rename from src/Mod/Fem/_CommandRunSolver.py
rename to src/Mod/Fem/PyGui/_CommandRunSolver.py
diff --git a/src/Mod/Fem/_CommandShellThickness.py b/src/Mod/Fem/PyGui/_CommandShellThickness.py
similarity index 100%
rename from src/Mod/Fem/_CommandShellThickness.py
rename to src/Mod/Fem/PyGui/_CommandShellThickness.py
diff --git a/src/Mod/Fem/_CommandShowResult.py b/src/Mod/Fem/PyGui/_CommandShowResult.py
similarity index 100%
rename from src/Mod/Fem/_CommandShowResult.py
rename to src/Mod/Fem/PyGui/_CommandShowResult.py
diff --git a/src/Mod/Fem/_CommandSolverCalculix.py b/src/Mod/Fem/PyGui/_CommandSolverCalculix.py
similarity index 100%
rename from src/Mod/Fem/_CommandSolverCalculix.py
rename to src/Mod/Fem/PyGui/_CommandSolverCalculix.py
diff --git a/src/Mod/Fem/_CommandSolverZ88.py b/src/Mod/Fem/PyGui/_CommandSolverZ88.py
similarity index 100%
rename from src/Mod/Fem/_CommandSolverZ88.py
rename to src/Mod/Fem/PyGui/_CommandSolverZ88.py
diff --git a/src/Mod/Fem/_TaskPanelFemBeamSection.py b/src/Mod/Fem/PyGui/_TaskPanelFemBeamSection.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemBeamSection.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemBeamSection.py
diff --git a/src/Mod/Fem/_TaskPanelFemMaterial.py b/src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemMaterial.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py
diff --git a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshGmsh.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemMeshGmsh.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemMeshGmsh.py
diff --git a/src/Mod/Fem/_TaskPanelFemMeshGroup.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemMeshGroup.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py
diff --git a/src/Mod/Fem/_TaskPanelFemMeshRegion.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemMeshRegion.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py
diff --git a/src/Mod/Fem/_TaskPanelFemShellThickness.py b/src/Mod/Fem/PyGui/_TaskPanelFemShellThickness.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemShellThickness.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemShellThickness.py
diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/PyGui/_TaskPanelFemSolverCalculix.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelFemSolverCalculix.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemSolverCalculix.py
diff --git a/src/Mod/Fem/_TaskPanelShowResult.py b/src/Mod/Fem/PyGui/_TaskPanelShowResult.py
similarity index 100%
rename from src/Mod/Fem/_TaskPanelShowResult.py
rename to src/Mod/Fem/PyGui/_TaskPanelShowResult.py
diff --git a/src/Mod/Fem/_ViewProviderFemBeamSection.py b/src/Mod/Fem/PyGui/_ViewProviderFemBeamSection.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemBeamSection.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemBeamSection.py
diff --git a/src/Mod/Fem/_ViewProviderFemConstraintSelfWeight.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintSelfWeight.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemConstraintSelfWeight.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemConstraintSelfWeight.py
diff --git a/src/Mod/Fem/_ViewProviderFemMaterial.py b/src/Mod/Fem/PyGui/_ViewProviderFemMaterial.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemMaterial.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemMaterial.py
diff --git a/src/Mod/Fem/_ViewProviderFemMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemMaterialMechanicalNonlinear.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
diff --git a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemMeshGmsh.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py
diff --git a/src/Mod/Fem/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/PyGui/_ViewProviderFemMeshGroup.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemMeshGroup.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemMeshGroup.py
diff --git a/src/Mod/Fem/_ViewProviderFemMeshRegion.py b/src/Mod/Fem/PyGui/_ViewProviderFemMeshRegion.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemMeshRegion.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemMeshRegion.py
diff --git a/src/Mod/Fem/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemResultMechanical.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
diff --git a/src/Mod/Fem/_ViewProviderFemShellThickness.py b/src/Mod/Fem/PyGui/_ViewProviderFemShellThickness.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemShellThickness.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemShellThickness.py
diff --git a/src/Mod/Fem/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemSolverCalculix.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py
diff --git a/src/Mod/Fem/_ViewProviderFemSolverZ88.py b/src/Mod/Fem/PyGui/_ViewProviderFemSolverZ88.py
similarity index 100%
rename from src/Mod/Fem/_ViewProviderFemSolverZ88.py
rename to src/Mod/Fem/PyGui/_ViewProviderFemSolverZ88.py
diff --git a/src/Mod/Fem/PyGui/__init__.py b/src/Mod/Fem/PyGui/__init__.py
new file mode 100644
index 000000000..3ef32302a
--- /dev/null
+++ b/src/Mod/Fem/PyGui/__init__.py
@@ -0,0 +1,29 @@
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2017 - Bernd Hahnebach <bernd@bimstatik.org>            *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+
+__title__ = "Fem Gui modules"
+__author__ = "Bernd Hahnebach"
+__url__ = "http://www.freecadweb.org"
+
+## @package PyGui
+#  \ingroup Fem
+#  \brief Fem Gui module
diff --git a/src/Mod/Fem/_FemBeamSection.py b/src/Mod/Fem/PyObjects/_FemBeamSection.py
similarity index 100%
rename from src/Mod/Fem/_FemBeamSection.py
rename to src/Mod/Fem/PyObjects/_FemBeamSection.py
diff --git a/src/Mod/Fem/_FemConstraintSelfWeight.py b/src/Mod/Fem/PyObjects/_FemConstraintSelfWeight.py
similarity index 100%
rename from src/Mod/Fem/_FemConstraintSelfWeight.py
rename to src/Mod/Fem/PyObjects/_FemConstraintSelfWeight.py
diff --git a/src/Mod/Fem/_FemMaterial.py b/src/Mod/Fem/PyObjects/_FemMaterial.py
similarity index 100%
rename from src/Mod/Fem/_FemMaterial.py
rename to src/Mod/Fem/PyObjects/_FemMaterial.py
diff --git a/src/Mod/Fem/_FemMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py
similarity index 100%
rename from src/Mod/Fem/_FemMaterialMechanicalNonlinear.py
rename to src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py
diff --git a/src/Mod/Fem/_FemMeshGmsh.py b/src/Mod/Fem/PyObjects/_FemMeshGmsh.py
similarity index 100%
rename from src/Mod/Fem/_FemMeshGmsh.py
rename to src/Mod/Fem/PyObjects/_FemMeshGmsh.py
diff --git a/src/Mod/Fem/_FemMeshGroup.py b/src/Mod/Fem/PyObjects/_FemMeshGroup.py
similarity index 100%
rename from src/Mod/Fem/_FemMeshGroup.py
rename to src/Mod/Fem/PyObjects/_FemMeshGroup.py
diff --git a/src/Mod/Fem/_FemMeshRegion.py b/src/Mod/Fem/PyObjects/_FemMeshRegion.py
similarity index 100%
rename from src/Mod/Fem/_FemMeshRegion.py
rename to src/Mod/Fem/PyObjects/_FemMeshRegion.py
diff --git a/src/Mod/Fem/_FemResultMechanical.py b/src/Mod/Fem/PyObjects/_FemResultMechanical.py
similarity index 100%
rename from src/Mod/Fem/_FemResultMechanical.py
rename to src/Mod/Fem/PyObjects/_FemResultMechanical.py
diff --git a/src/Mod/Fem/_FemShellThickness.py b/src/Mod/Fem/PyObjects/_FemShellThickness.py
similarity index 100%
rename from src/Mod/Fem/_FemShellThickness.py
rename to src/Mod/Fem/PyObjects/_FemShellThickness.py
diff --git a/src/Mod/Fem/_FemSolverCalculix.py b/src/Mod/Fem/PyObjects/_FemSolverCalculix.py
similarity index 100%
rename from src/Mod/Fem/_FemSolverCalculix.py
rename to src/Mod/Fem/PyObjects/_FemSolverCalculix.py
diff --git a/src/Mod/Fem/_FemSolverZ88.py b/src/Mod/Fem/PyObjects/_FemSolverZ88.py
similarity index 100%
rename from src/Mod/Fem/_FemSolverZ88.py
rename to src/Mod/Fem/PyObjects/_FemSolverZ88.py
diff --git a/src/Mod/Fem/PyObjects/__init__.py b/src/Mod/Fem/PyObjects/__init__.py
new file mode 100644
index 000000000..829c2b7dc
--- /dev/null
+++ b/src/Mod/Fem/PyObjects/__init__.py
@@ -0,0 +1,29 @@
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2017 - Bernd Hahnebach <bernd@bimstatik.org>            *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+
+__title__ = "Fem object modules"
+__author__ = "Bernd Hahnebach"
+__url__ = "http://www.freecadweb.org"
+
+## @package PyObjects
+#  \ingroup Fem
+#  \brief Fem objects module