diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 19e271b874..672c0e6db1 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -321,6 +321,7 @@ INSTALL(FILES ${FemObjectsScripts_SRCS} DESTINATION Mod/Fem/femobjects)
 # Python Gui packages and modules
 SET(FemGuiViewObjects_SRCS
     femviewprovider/__init__.py
+    femviewprovider/view_base_femconstraint.py
     femviewprovider/view_base_femobject.py
     femviewprovider/view_constraint_bodyheatsource.py
     femviewprovider/view_constraint_electrostaticpotential.py
@@ -346,7 +347,6 @@ SET(FemGuiViewObjects_SRCS
 
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
-    femguiobjects/ViewProviderFemConstraint.py
 )
 
 SET(FemGuiUtils_SRCS
diff --git a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py b/src/Mod/Fem/femviewprovider/view_base_femconstraint.py
similarity index 94%
rename from src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
rename to src/Mod/Fem/femviewprovider/view_base_femconstraint.py
index 9afa4f1039..153fd037ab 100644
--- a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
+++ b/src/Mod/Fem/femviewprovider/view_base_femconstraint.py
@@ -26,16 +26,16 @@ __title__ = "FreeCAD FEM base constraint ViewProvider"
 __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package _ConstraintViewProvider
+## @package view_base_femconstraint
 #  \ingroup FEM
-#  \brief FreeCAD _Base Constraint ViewProvider for FEM workbench
+#  \brief view provider for Python base constraint object
 
 from pivy import coin
 
 from femviewprovider import view_base_femobject
 
 
-class ViewProxy(view_base_femobject.VPBaseFemObject):
+class VPBaseFemConstraint(view_base_femobject.VPBaseFemObject):
     """Proxy View Provider for Pythons base constraint."""
 
     def attach(self, vobj):
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_bodyheatsource.py b/src/Mod/Fem/femviewprovider/view_constraint_bodyheatsource.py
index 419f85123b..643d5ba03b 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_bodyheatsource.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_bodyheatsource.py
@@ -30,10 +30,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief view provider for the constraint body heat source object
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPConstraintBodyHeatSource(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintBodyHeatSource(view_base_femconstraint.VPBaseFemConstraint):
 
     def getIcon(self):
         return ":/icons/FEM_ConstraintHeatflux.svg"  # the heatflux icon is used
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py b/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py
index e539269835..549cd68ee4 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_electrostaticpotential.py
@@ -34,15 +34,15 @@ import FreeCADGui
 from FreeCAD import Units
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 from femtools import femutils
 from femtools import membertools
 
 
-class VPConstraintElectroStaticPotential(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintElectroStaticPotential(view_base_femconstraint.VPBaseFemConstraint):
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_flowvelocity.py b/src/Mod/Fem/femviewprovider/view_constraint_flowvelocity.py
index 854d0daa45..5ba81a53eb 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_flowvelocity.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_flowvelocity.py
@@ -34,15 +34,15 @@ import FreeCADGui
 from FreeCAD import Units
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 from femtools import femutils
 from femtools import membertools
 
 
-class VPConstraintFlowVelocity(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintFlowVelocity(view_base_femconstraint.VPBaseFemConstraint):
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py b/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py
index 644bbbedf3..0772750e7d 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_initialflowvelocity.py
@@ -34,15 +34,15 @@ import FreeCAD
 import FreeCADGui
 from FreeCAD import Units
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 from femtools import femutils
 from femtools import membertools
 
 
-class VPConstraintInitialFlowVelocity(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintInitialFlowVelocity(view_base_femconstraint.VPBaseFemConstraint):
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py b/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py
index 36a821e071..0dbeca5e51 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_selfweight.py
@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief view provider for constraint self weight object
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPConstraintSelfWeight(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintSelfWeight(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the FemConstraintSelfWeight object
     """
diff --git a/src/Mod/Fem/femviewprovider/view_constraint_tie.py b/src/Mod/Fem/femviewprovider/view_constraint_tie.py
index 92c33492c9..38fcd97874 100644
--- a/src/Mod/Fem/femviewprovider/view_constraint_tie.py
+++ b/src/Mod/Fem/femviewprovider/view_constraint_tie.py
@@ -36,16 +36,16 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPConstraintTie(ViewProviderFemConstraint.ViewProxy):
+class VPConstraintTie(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ConstraintTie object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_element_fluid1D.py b/src/Mod/Fem/femviewprovider/view_element_fluid1D.py
index 44d7194c13..d2c185a80a 100644
--- a/src/Mod/Fem/femviewprovider/view_element_fluid1D.py
+++ b/src/Mod/Fem/femviewprovider/view_element_fluid1D.py
@@ -38,17 +38,17 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 from femobjects import element_fluid1D
 
 
-class VPElementFluid1D(ViewProviderFemConstraint.ViewProxy):
+class VPElementFluid1D(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ElementFluid1D object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_element_geometry1D.py b/src/Mod/Fem/femviewprovider/view_element_geometry1D.py
index a857569295..4c9dc12016 100644
--- a/src/Mod/Fem/femviewprovider/view_element_geometry1D.py
+++ b/src/Mod/Fem/femviewprovider/view_element_geometry1D.py
@@ -35,17 +35,17 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 from femobjects import element_geometry1D
 
 
-class VPElementGeometry1D(ViewProviderFemConstraint.ViewProxy):
+class VPElementGeometry1D(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ElementGeometry1D object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_element_geometry2D.py b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py
index dca3a5750d..ad2f366761 100644
--- a/src/Mod/Fem/femviewprovider/view_element_geometry2D.py
+++ b/src/Mod/Fem/femviewprovider/view_element_geometry2D.py
@@ -35,16 +35,16 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPElementGeometry2D(ViewProviderFemConstraint.ViewProxy):
+class VPElementGeometry2D(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ElementGeometry2D object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_element_rotation1D.py b/src/Mod/Fem/femviewprovider/view_element_rotation1D.py
index d484173a68..b685d2279d 100644
--- a/src/Mod/Fem/femviewprovider/view_element_rotation1D.py
+++ b/src/Mod/Fem/femviewprovider/view_element_rotation1D.py
@@ -35,10 +35,10 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPElementRotation1D(ViewProviderFemConstraint.ViewProxy):
+class VPElementRotation1D(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ElementRotation1D object
     """
@@ -46,7 +46,7 @@ class VPElementRotation1D(ViewProviderFemConstraint.ViewProxy):
     """
     # do not activate the task panel, since rotation with reference shapes is not yet supported
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_material_common.py b/src/Mod/Fem/femviewprovider/view_material_common.py
index 5b5049f0f5..bcb623a6cc 100644
--- a/src/Mod/Fem/femviewprovider/view_material_common.py
+++ b/src/Mod/Fem/femviewprovider/view_material_common.py
@@ -40,14 +40,14 @@ import FreeCADGui
 from FreeCAD import Units
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
 if sys.version_info.major >= 3:
     unicode = str
 
 
-class VPMaterialCommon(ViewProviderFemConstraint.ViewProxy):
+class VPMaterialCommon(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the MaterialCommon object
     """
@@ -65,7 +65,7 @@ class VPMaterialCommon(ViewProviderFemConstraint.ViewProxy):
             return ""
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_material_mechanicalnonlinear.py b/src/Mod/Fem/femviewprovider/view_material_mechanicalnonlinear.py
index ea8656e55a..c012055f2e 100644
--- a/src/Mod/Fem/femviewprovider/view_material_mechanicalnonlinear.py
+++ b/src/Mod/Fem/femviewprovider/view_material_mechanicalnonlinear.py
@@ -29,10 +29,10 @@ __url__ = "http://www.freecadweb.org"
 #  \ingroup FEM
 #  \brief view provider for material mechanical nonlinear object
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPMaterialMechanicalNonlinear(ViewProviderFemConstraint.ViewProxy):
+class VPMaterialMechanicalNonlinear(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the MaterialMechanicalNonlinear object
     """
diff --git a/src/Mod/Fem/femviewprovider/view_material_reinforced.py b/src/Mod/Fem/femviewprovider/view_material_reinforced.py
index 8cefc171a7..3589efa843 100644
--- a/src/Mod/Fem/femviewprovider/view_material_reinforced.py
+++ b/src/Mod/Fem/femviewprovider/view_material_reinforced.py
@@ -36,20 +36,20 @@ from PySide import QtGui
 import FreeCAD
 import FreeCADGui
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
 if sys.version_info.major >= 3:
     unicode = str
 
 
-class VPMaterialReinforced(ViewProviderFemConstraint.ViewProxy):
+class VPMaterialReinforced(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the MaterialReinforced object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_boundarylayer.py b/src/Mod/Fem/femviewprovider/view_mesh_boundarylayer.py
index cf7b42995c..8126490e99 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_boundarylayer.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_boundarylayer.py
@@ -35,16 +35,16 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPMeshBoundaryLayer(ViewProviderFemConstraint.ViewProxy):
+class VPMeshBoundaryLayer(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the MeshBoundaryLayer object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py b/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
index 5ddc2c52f0..4ea1e43117 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
@@ -96,7 +96,7 @@ class VPMeshGmsh:
 
     """
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_group.py b/src/Mod/Fem/femviewprovider/view_mesh_group.py
index ab5914c2f6..650d4ea5ef 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_group.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_group.py
@@ -35,16 +35,16 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPMeshGroup(ViewProviderFemConstraint.ViewProxy):
+class VPMeshGroup(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the MeshGroup object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_region.py b/src/Mod/Fem/femviewprovider/view_mesh_region.py
index b76a8122aa..8345aa220a 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_region.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_region.py
@@ -35,16 +35,16 @@ import FreeCAD
 import FreeCADGui
 
 from femguiutils import selection_widgets
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 
-class VPMeshRegion(ViewProviderFemConstraint.ViewProxy):
+class VPMeshRegion(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the FemMeshRegion object
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_result_mechanical.py b/src/Mod/Fem/femviewprovider/view_result_mechanical.py
index d8a5e66e27..aa4fdf22ca 100644
--- a/src/Mod/Fem/femviewprovider/view_result_mechanical.py
+++ b/src/Mod/Fem/femviewprovider/view_result_mechanical.py
@@ -41,17 +41,17 @@ from PySide.QtGui import QApplication
 import FreeCAD
 import FreeCADGui
 
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 import femresult.resulttools as resulttools
 
 
-class VPResultMechanical(ViewProviderFemConstraint.ViewProxy):
+class VPResultMechanical(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the ResultObject Python derived FemResult class
     """
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,
diff --git a/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py b/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py
index 515e76f143..7b6bfc943d 100644
--- a/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py
+++ b/src/Mod/Fem/femviewprovider/view_solver_ccxtools.py
@@ -41,14 +41,14 @@ import FreeCAD
 import FreeCADGui
 
 import FemGui
-from femguiobjects import ViewProviderFemConstraint
+from . import view_base_femconstraint
 
 if sys.version_info.major >= 3:
     def unicode(text, *args):
         return str(text)
 
 
-class VPSolverCcxTools(ViewProviderFemConstraint.ViewProxy):
+class VPSolverCcxTools(view_base_femconstraint.VPBaseFemConstraint):
     """
     A View Provider for the SolverCalculix object
     """
@@ -57,7 +57,7 @@ class VPSolverCcxTools(ViewProviderFemConstraint.ViewProxy):
         return ":/icons/FEM_SolverStandard.svg"
 
     def setEdit(self, vobj, mode=0):
-        ViewProviderFemConstraint.ViewProxy.setEdit(
+        view_base_femconstraint.VPBaseFemConstraint.setEdit(
             self,
             vobj,
             mode,